Merge pull request #3737 from EmptyChaos/update-wx

Externals: Update wxWidgets to 3.1.0
This commit is contained in:
Mat M
2016-07-15 09:48:14 -04:00
committed by GitHub
1748 changed files with 58822 additions and 84433 deletions

View File

@ -846,7 +846,7 @@ if(NOT DISABLE_WX)
ERROR_QUIET ERROR_QUIET
) )
message("Found wxWidgets version ${wxWidgets_VERSION}") message("Found wxWidgets version ${wxWidgets_VERSION}")
set(wxMIN_VERSION "3.0.1") set(wxMIN_VERSION "3.1.0")
if(${wxWidgets_VERSION} VERSION_LESS ${wxMIN_VERSION}) if(${wxWidgets_VERSION} VERSION_LESS ${wxMIN_VERSION})
message("At least ${wxMIN_VERSION} is required; ignoring found version") message("At least ${wxMIN_VERSION} is required; ignoring found version")
unset(wxWidgets_FOUND) unset(wxWidgets_FOUND)
@ -887,12 +887,13 @@ if(NOT DISABLE_WX)
# not when building wx itself (see wxw3 CMakeLists.txt for that) # not when building wx itself (see wxw3 CMakeLists.txt for that)
if(APPLE) if(APPLE)
add_definitions(-D__WXOSX_COCOA__) add_definitions(-D__WXOSX_COCOA__)
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
add_definitions(-D__WXGTK__) add_definitions(-D__WXGTK__)
# Check for required libs # Check for required libs
check_lib(GTHREAD2 gthread-2.0 gthread-2.0 glib/gthread.h REQUIRED) check_lib(GTHREAD2 gthread-2.0 gthread-2.0 glib/gthread.h REQUIRED)
check_lib(PANGOCAIRO pangocairo pangocairo pango/pangocairo.h REQUIRED) check_lib(PANGOCAIRO pangocairo pangocairo pango/pangocairo.h REQUIRED)
find_package(Backtrace REQUIRED)
elseif(WIN32) elseif(WIN32)
add_definitions(-D__WXMSW__) add_definitions(-D__WXMSW__)
else() else()

View File

@ -1,4 +1,4 @@
# gtk, msw, osx and shared files as of r75363 # gtk, msw, osx and shared files as of 81570ae070b35c9d52de47b1f14897f3ff1a66c7
set(SRCS_AUI set(SRCS_AUI
"src/aui/auibar.cpp" "src/aui/auibar.cpp"
@ -12,6 +12,7 @@ set(SRCS_AUI
set(SRCS_COMMON set(SRCS_COMMON
"src/common/accelcmn.cpp" "src/common/accelcmn.cpp"
#"src/common/accesscmn.cpp" #"src/common/accesscmn.cpp"
"src/common/addremovectrl.cpp"
"src/common/affinematrix2d.cpp" "src/common/affinematrix2d.cpp"
"src/common/anidecod.cpp" "src/common/anidecod.cpp"
"src/common/animatecmn.cpp" "src/common/animatecmn.cpp"
@ -158,6 +159,7 @@ set(SRCS_COMMON
"src/common/msgout.cpp" "src/common/msgout.cpp"
"src/common/mstream.cpp" "src/common/mstream.cpp"
"src/common/nbkbase.cpp" "src/common/nbkbase.cpp"
"src/common/notifmsgcmn.cpp"
"src/common/numformatter.cpp" "src/common/numformatter.cpp"
"src/common/object.cpp" "src/common/object.cpp"
"src/common/odcombocmn.cpp" "src/common/odcombocmn.cpp"
@ -266,6 +268,7 @@ set(SRCS_GENERIC
"src/generic/caret.cpp" "src/generic/caret.cpp"
"src/generic/choicbkg.cpp" "src/generic/choicbkg.cpp"
"src/generic/choicdgg.cpp" "src/generic/choicdgg.cpp"
"src/generic/collheaderctrlg.cpp"
#"src/generic/colour.cpp" #"src/generic/colour.cpp"
"src/generic/combog.cpp" "src/generic/combog.cpp"
"src/generic/commandlinkbuttong.cpp" "src/generic/commandlinkbuttong.cpp"
@ -338,11 +341,15 @@ set(SRCS_GENERIC
set(SRCS_GENERICGTK set(SRCS_GENERICGTK
"src/generic/accel.cpp" "src/generic/accel.cpp"
"src/generic/activityindicator.cpp"
"src/generic/icon.cpp" "src/generic/icon.cpp"
"src/generic/imaglist.cpp" "src/generic/imaglist.cpp"
"src/generic/paletteg.cpp" "src/generic/paletteg.cpp"
"src/generic/preferencesg.cpp") "src/generic/preferencesg.cpp")
set(SRCS_GENERICMSW
"src/generic/activityindicator.cpp")
set(SRCS_GENERICOSX set(SRCS_GENERICOSX
"src/generic/animateg.cpp" "src/generic/animateg.cpp"
"src/generic/clrpickerg.cpp" "src/generic/clrpickerg.cpp"
@ -355,6 +362,7 @@ set(SRCS_GENERICOSX
set(SRCS_GTK set(SRCS_GTK
"src/aui/tabartgtk.cpp" "src/aui/tabartgtk.cpp"
"src/gtk/aboutdlg.cpp" "src/gtk/aboutdlg.cpp"
"src/gtk/activityindicator.cpp"
"src/gtk/animate.cpp" "src/gtk/animate.cpp"
"src/gtk/anybutton.cpp" "src/gtk/anybutton.cpp"
"src/gtk/app.cpp" "src/gtk/app.cpp"
@ -385,6 +393,7 @@ set(SRCS_GTK
"src/gtk/dcscreen.cpp" "src/gtk/dcscreen.cpp"
"src/gtk/dialog.cpp" "src/gtk/dialog.cpp"
"src/gtk/dirdlg.cpp" "src/gtk/dirdlg.cpp"
"src/gtk/display.cpp"
"src/gtk/dnd.cpp" "src/gtk/dnd.cpp"
"src/gtk/eggtrayicon.c" "src/gtk/eggtrayicon.c"
"src/gtk/evtloop.cpp" "src/gtk/evtloop.cpp"
@ -398,9 +407,7 @@ set(SRCS_GTK
"src/gtk/frame.cpp" "src/gtk/frame.cpp"
"src/gtk/gauge.cpp" "src/gtk/gauge.cpp"
"src/gtk/glcanvas.cpp" "src/gtk/glcanvas.cpp"
#"src/gtk/gnome/gprint.cpp"
#"src/gtk/gnome/gvfs.cpp" #"src/gtk/gnome/gvfs.cpp"
#"src/gtk/hildon/notifmsg.cpp"
"src/gtk/hyperlink.cpp" "src/gtk/hyperlink.cpp"
"src/gtk/infobar.cpp" "src/gtk/infobar.cpp"
"src/gtk/listbox.cpp" "src/gtk/listbox.cpp"
@ -448,10 +455,13 @@ set(SRCS_GTK
"src/gtk/window.cpp") "src/gtk/window.cpp")
set(SRCS_MSW set(SRCS_MSW
"src/aui/barartmsw.cpp"
"src/aui/tabartmsw.cpp"
"src/msw/aboutdlg.cpp" "src/msw/aboutdlg.cpp"
"src/msw/accel.cpp" "src/msw/accel.cpp"
"src/msw/anybutton.cpp" "src/msw/anybutton.cpp"
"src/msw/app.cpp" "src/msw/app.cpp"
"src/msw/appprogress.cpp"
"src/msw/artmsw.cpp" "src/msw/artmsw.cpp"
"src/msw/basemsw.cpp" "src/msw/basemsw.cpp"
"src/msw/bitmap.cpp" "src/msw/bitmap.cpp"
@ -471,28 +481,28 @@ set(SRCS_MSW
"src/msw/combobox.cpp" "src/msw/combobox.cpp"
"src/msw/commandlinkbutton.cpp" "src/msw/commandlinkbutton.cpp"
"src/msw/control.cpp" "src/msw/control.cpp"
"src/msw/crashrpt.cpp" #"src/msw/crashrpt.cpp"
"src/msw/cursor.cpp" "src/msw/cursor.cpp"
"src/msw/data.cpp" #"src/msw/data.cpp"
"src/msw/datecontrols.cpp" "src/msw/datecontrols.cpp"
"src/msw/datectrl.cpp" "src/msw/datectrl.cpp"
"src/msw/datetimectrl.cpp" "src/msw/datetimectrl.cpp"
"src/msw/dc.cpp" "src/msw/dc.cpp"
"src/msw/dcclient.cpp" "src/msw/dcclient.cpp"
"src/msw/dcmemory.cpp" "src/msw/dcmemory.cpp"
"src/msw/dcprint.cpp" #"src/msw/dcprint.cpp"
"src/msw/dcscreen.cpp" "src/msw/dcscreen.cpp"
"src/msw/dde.cpp" "src/msw/dde.cpp"
"src/msw/debughlp.cpp" "src/msw/debughlp.cpp"
"src/msw/dialog.cpp" "src/msw/dialog.cpp"
"src/msw/dialup.cpp" #"src/msw/dialup.cpp"
"src/msw/dib.cpp" "src/msw/dib.cpp"
"src/msw/dir.cpp" "src/msw/dir.cpp"
"src/msw/dirdlg.cpp" "src/msw/dirdlg.cpp"
"src/msw/display.cpp" "src/msw/display.cpp"
"src/msw/dlmsw.cpp" "src/msw/dlmsw.cpp"
"src/msw/dragimag.cpp" "src/msw/dragimag.cpp"
"src/msw/enhmeta.cpp" #"src/msw/enhmeta.cpp"
"src/msw/evtloop.cpp" "src/msw/evtloop.cpp"
#"src/msw/evtloopconsole.cpp" #"src/msw/evtloopconsole.cpp"
"src/msw/fdrepdlg.cpp" "src/msw/fdrepdlg.cpp"
@ -505,18 +515,19 @@ set(SRCS_MSW
#"src/msw/fswatcher.cpp" #"src/msw/fswatcher.cpp"
"src/msw/gauge.cpp" "src/msw/gauge.cpp"
"src/msw/gdiimage.cpp" "src/msw/gdiimage.cpp"
"src/msw/gdiobj.cpp" #"src/msw/gdiobj.cpp"
"src/msw/gdiplus.cpp" "src/msw/gdiplus.cpp"
"src/msw/glcanvas.cpp" #"src/msw/glcanvas.cpp"
"src/msw/graphics.cpp" "src/msw/graphics.cpp"
#"src/msw/graphicsd2d.cpp"
"src/msw/headerctrl.cpp" "src/msw/headerctrl.cpp"
"src/msw/helpbest.cpp" #"src/msw/helpbest.cpp"
"src/msw/helpchm.cpp" #"src/msw/helpchm.cpp"
"src/msw/helpwin.cpp" "src/msw/helpwin.cpp"
"src/msw/hyperlink.cpp" "src/msw/hyperlink.cpp"
"src/msw/icon.cpp" "src/msw/icon.cpp"
"src/msw/imaglist.cpp" "src/msw/imaglist.cpp"
"src/msw/iniconf.cpp" #"src/msw/iniconf.cpp"
#"src/msw/joystick.cpp" #"src/msw/joystick.cpp"
"src/msw/listbox.cpp" "src/msw/listbox.cpp"
"src/msw/listctrl.cpp" "src/msw/listctrl.cpp"
@ -527,12 +538,10 @@ set(SRCS_MSW
#"src/msw/mediactrl_wmp10.cpp" #"src/msw/mediactrl_wmp10.cpp"
"src/msw/menu.cpp" "src/msw/menu.cpp"
"src/msw/menuitem.cpp" "src/msw/menuitem.cpp"
"src/msw/metafile.cpp" #"src/msw/metafile.cpp"
"src/msw/microwin.c"
"src/msw/mimetype.cpp" "src/msw/mimetype.cpp"
"src/msw/minifram.cpp" "src/msw/minifram.cpp"
"src/msw/msgdlg.cpp" "src/msw/msgdlg.cpp"
"src/msw/mslu.cpp"
"src/msw/nativdlg.cpp" "src/msw/nativdlg.cpp"
"src/msw/nativewin.cpp" "src/msw/nativewin.cpp"
"src/msw/nonownedwnd.cpp" "src/msw/nonownedwnd.cpp"
@ -551,11 +560,10 @@ set(SRCS_MSW
"src/msw/palette.cpp" "src/msw/palette.cpp"
"src/msw/panel.cpp" "src/msw/panel.cpp"
"src/msw/pen.cpp" "src/msw/pen.cpp"
"src/msw/penwin.cpp"
"src/msw/popupwin.cpp" "src/msw/popupwin.cpp"
"src/msw/power.cpp" "src/msw/power.cpp"
"src/msw/printdlg.cpp" #"src/msw/printdlg.cpp"
"src/msw/printwin.cpp" #"src/msw/printwin.cpp"
"src/msw/progdlg.cpp" "src/msw/progdlg.cpp"
"src/msw/radiobox.cpp" "src/msw/radiobox.cpp"
"src/msw/radiobut.cpp" "src/msw/radiobut.cpp"
@ -579,7 +587,9 @@ set(SRCS_MSW
"src/msw/stattext.cpp" "src/msw/stattext.cpp"
"src/msw/statusbar.cpp" "src/msw/statusbar.cpp"
"src/msw/stdpaths.cpp" "src/msw/stdpaths.cpp"
"src/msw/systhemectrl.cpp"
"src/msw/taskbar.cpp" "src/msw/taskbar.cpp"
"src/msw/taskbarbutton.cpp"
"src/msw/textctrl.cpp" "src/msw/textctrl.cpp"
"src/msw/textentry.cpp" "src/msw/textentry.cpp"
"src/msw/textmeasure.cpp" "src/msw/textmeasure.cpp"
@ -592,7 +602,7 @@ set(SRCS_MSW
"src/msw/toplevel.cpp" "src/msw/toplevel.cpp"
"src/msw/treectrl.cpp" "src/msw/treectrl.cpp"
"src/msw/uiaction.cpp" "src/msw/uiaction.cpp"
"src/msw/urlmsw.cpp" #"src/msw/urlmsw.cpp"
"src/msw/utils.cpp" "src/msw/utils.cpp"
"src/msw/utilsexc.cpp" "src/msw/utilsexc.cpp"
"src/msw/utilsgui.cpp" "src/msw/utilsgui.cpp"
@ -601,19 +611,11 @@ set(SRCS_MSW
"src/msw/version.rc" "src/msw/version.rc"
"src/msw/volume.cpp" "src/msw/volume.cpp"
#"src/msw/webview_ie.cpp" #"src/msw/webview_ie.cpp"
"src/msw/wince/checklst.cpp"
"src/msw/wince/choicece.cpp"
"src/msw/wince/crt.cpp"
"src/msw/wince/filedlgwce.cpp"
"src/msw/wince/filefnwce.cpp"
"src/msw/wince/helpwce.cpp"
"src/msw/wince/menuce.cpp"
"src/msw/wince/net.cpp"
"src/msw/wince/tbarwce.cpp"
"src/msw/wince/textctrlce.cpp"
"src/msw/wince/time.cpp"
"src/msw/window.cpp" "src/msw/window.cpp"
"src/msw/winestub.c") "src/msw/winestub.c"
#"src/msw/rt/notifmsgrt.cpp"
#"src/msw/rt/utilsrt.cpp"
)
set(SRCS_OSX set(SRCS_OSX
"src/osx/accel.cpp" "src/osx/accel.cpp"
@ -632,8 +634,9 @@ set(SRCS_OSX
"src/osx/dialog_osx.cpp" "src/osx/dialog_osx.cpp"
"src/osx/dnd_osx.cpp" "src/osx/dnd_osx.cpp"
"src/osx/fontutil.cpp" "src/osx/fontutil.cpp"
#"src/osx/fswatcher_fsevents.cpp"
"src/osx/gauge_osx.cpp" "src/osx/gauge_osx.cpp"
"src/osx/glcanvas_osx.cpp" #"src/osx/glcanvas_osx.cpp"
"src/osx/imaglist.cpp" "src/osx/imaglist.cpp"
"src/osx/listbox_osx.cpp" "src/osx/listbox_osx.cpp"
"src/osx/menu_osx.cpp" "src/osx/menu_osx.cpp"
@ -664,86 +667,39 @@ set(SRCS_OSX
"src/osx/utils_osx.cpp" "src/osx/utils_osx.cpp"
#"src/osx/webview_webkit.mm" #"src/osx/webview_webkit.mm"
"src/osx/window_osx.cpp" "src/osx/window_osx.cpp"
#"src/osx/carbon/aboutdlg.cpp"
"src/osx/carbon/anybutton.cpp"
"src/osx/carbon/app.cpp" "src/osx/carbon/app.cpp"
#"src/osx/carbon/bmpbuttn.cpp"
#"src/osx/carbon/button.cpp"
#"src/osx/carbon/checkbox.cpp"
#"src/osx/carbon/choice.cpp"
"src/osx/carbon/clipbrd.cpp" "src/osx/carbon/clipbrd.cpp"
#"src/osx/carbon/colordlg.cpp" #"src/osx/carbon/colordlg.cpp"
"src/osx/carbon/colordlgosx.mm" "src/osx/carbon/colordlgosx.mm"
#"src/osx/carbon/combobox.cpp"
#"src/osx/carbon/combobxc.cpp"
"src/osx/carbon/control.cpp" "src/osx/carbon/control.cpp"
"src/osx/carbon/cursor.cpp" "src/osx/carbon/cursor.cpp"
"src/osx/carbon/dataobj.cpp" "src/osx/carbon/dataobj.cpp"
#"src/osx/carbon/dataview.cpp"
"src/osx/carbon/dcclient.cpp" "src/osx/carbon/dcclient.cpp"
"src/osx/carbon/dcprint.cpp" "src/osx/carbon/dcprint.cpp"
"src/osx/carbon/dcscreen.cpp" "src/osx/carbon/dcscreen.cpp"
#"src/osx/carbon/dialog.cpp"
#"src/osx/carbon/dirdlg.cpp"
#"src/osx/carbon/dirmac.cpp"
#"src/osx/carbon/dnd.cpp"
#"src/osx/carbon/drawer.cpp"
#"src/osx/carbon/evtloop.cpp"
#"src/osx/carbon/filedlg.cpp"
"src/osx/carbon/font.cpp" "src/osx/carbon/font.cpp"
"src/osx/carbon/fontdlg.cpp" "src/osx/carbon/fontdlg.cpp"
"src/osx/carbon/fontdlgosx.mm" "src/osx/carbon/fontdlgosx.mm"
"src/osx/carbon/frame.cpp" "src/osx/carbon/frame.cpp"
#"src/osx/carbon/gauge.cpp"
"src/osx/carbon/gdiobj.cpp" "src/osx/carbon/gdiobj.cpp"
#"src/osx/carbon/glcanvas.cpp"
"src/osx/carbon/graphics.cpp" "src/osx/carbon/graphics.cpp"
#"src/osx/carbon/helpxxxx.cpp"
"src/osx/carbon/icon.cpp" "src/osx/carbon/icon.cpp"
#"src/osx/carbon/joystick.cpp"
#"src/osx/carbon/listbox.cpp"
#"src/osx/carbon/listctrl_mac.cpp"
#"src/osx/carbon/main.cpp" #"src/osx/carbon/main.cpp"
"src/osx/carbon/mdi.cpp" "src/osx/carbon/mdi.cpp"
#"src/osx/carbon/mediactrl.cpp"
#"src/osx/carbon/menu.cpp"
#"src/osx/carbon/menuitem.cpp"
"src/osx/carbon/metafile.cpp" "src/osx/carbon/metafile.cpp"
#"src/osx/carbon/mimetmac.cpp"
#"src/osx/carbon/msgdlg.cpp"
#"src/osx/carbon/nonownedwnd.cpp"
#"src/osx/carbon/notebmac.cpp"
#"src/osx/carbon/overlay.cpp" #"src/osx/carbon/overlay.cpp"
"src/osx/carbon/popupwin.cpp" "src/osx/carbon/popupwin.cpp"
#"src/osx/carbon/printdlg.cpp"
#"src/osx/carbon/radiobut.cpp"
"src/osx/carbon/region.cpp" "src/osx/carbon/region.cpp"
"src/osx/carbon/renderer.cpp" "src/osx/carbon/renderer.cpp"
#"src/osx/carbon/scrolbar.cpp"
"src/osx/carbon/settings.cpp"
#"src/osx/carbon/slider.cpp"
#"src/osx/carbon/sound.cpp" #"src/osx/carbon/sound.cpp"
#"src/osx/carbon/spinbutt.cpp"
#"src/osx/carbon/srchctrl.cpp"
#"src/osx/carbon/statbmp.cpp"
#"src/osx/carbon/statbox.cpp"
"src/osx/carbon/statbrma.cpp" "src/osx/carbon/statbrma.cpp"
#"src/osx/carbon/statline.cpp"
#"src/osx/carbon/statlmac.cpp"
#"src/osx/carbon/stattext.cpp"
#"src/osx/carbon/taskbar.cpp"
#"src/osx/carbon/textctrl.cpp"
#"src/osx/carbon/tglbtn.cpp"
#"src/osx/carbon/thread.cpp" #"src/osx/carbon/thread.cpp"
#"src/osx/carbon/timer.cpp" #"src/osx/carbon/timer.cpp"
#"src/osx/carbon/toolbar.cpp"
#"src/osx/carbon/tooltip.cpp"
#"src/osx/carbon/uma.cpp"
#"src/osx/carbon/utils.cpp"
"src/osx/carbon/utilscocoa.mm" "src/osx/carbon/utilscocoa.mm"
#"src/osx/carbon/window.cpp"
"src/osx/cocoa/aboutdlg.mm" "src/osx/cocoa/aboutdlg.mm"
"src/osx/cocoa/activityindicator.mm"
"src/osx/cocoa/anybutton.mm" "src/osx/cocoa/anybutton.mm"
"src/osx/cocoa/appprogress.mm"
"src/osx/cocoa/button.mm" "src/osx/cocoa/button.mm"
"src/osx/cocoa/checkbox.mm" "src/osx/cocoa/checkbox.mm"
"src/osx/cocoa/choice.mm" "src/osx/cocoa/choice.mm"
@ -763,24 +719,30 @@ set(SRCS_OSX
"src/osx/cocoa/menu.mm" "src/osx/cocoa/menu.mm"
"src/osx/cocoa/menuitem.mm" "src/osx/cocoa/menuitem.mm"
"src/osx/cocoa/msgdlg.mm" "src/osx/cocoa/msgdlg.mm"
"src/osx/cocoa/nativewin.mm"
"src/osx/cocoa/nonownedwnd.mm" "src/osx/cocoa/nonownedwnd.mm"
"src/osx/cocoa/notebook.mm" "src/osx/cocoa/notebook.mm"
"src/osx/cocoa/notifmsg.mm"
"src/osx/cocoa/overlay.mm" "src/osx/cocoa/overlay.mm"
"src/osx/cocoa/power.mm"
"src/osx/cocoa/printdlg.mm" "src/osx/cocoa/printdlg.mm"
"src/osx/cocoa/radiobut.mm" "src/osx/cocoa/radiobut.mm"
"src/osx/cocoa/scrolbar.mm" "src/osx/cocoa/scrolbar.mm"
"src/osx/cocoa/settings.mm"
"src/osx/cocoa/slider.mm" "src/osx/cocoa/slider.mm"
"src/osx/cocoa/spinbutt.mm" "src/osx/cocoa/spinbutt.mm"
"src/osx/cocoa/srchctrl.mm" "src/osx/cocoa/srchctrl.mm"
"src/osx/cocoa/statbox.mm" "src/osx/cocoa/statbox.mm"
"src/osx/cocoa/statline.mm" "src/osx/cocoa/statline.mm"
"src/osx/cocoa/stattext.mm" "src/osx/cocoa/stattext.mm"
"src/osx/cocoa/stdpaths.mm"
"src/osx/cocoa/taskbar.mm" "src/osx/cocoa/taskbar.mm"
"src/osx/cocoa/textctrl.mm" "src/osx/cocoa/textctrl.mm"
"src/osx/cocoa/tglbtn.mm" "src/osx/cocoa/tglbtn.mm"
"src/osx/cocoa/toolbar.mm" "src/osx/cocoa/toolbar.mm"
"src/osx/cocoa/tooltip.mm" "src/osx/cocoa/tooltip.mm"
"src/osx/cocoa/utils.mm" "src/osx/cocoa/utils.mm"
"src/osx/cocoa/utils_base.mm"
"src/osx/cocoa/window.mm" "src/osx/cocoa/window.mm"
"src/osx/core/bitmap.cpp" "src/osx/core/bitmap.cpp"
"src/osx/core/cfstring.cpp" "src/osx/core/cfstring.cpp"
@ -789,14 +751,12 @@ set(SRCS_OSX
"src/osx/core/display.cpp" "src/osx/core/display.cpp"
"src/osx/core/evtloop_cf.cpp" "src/osx/core/evtloop_cf.cpp"
"src/osx/core/fontenum.cpp" "src/osx/core/fontenum.cpp"
"src/osx/core/glgrab.cpp"
"src/osx/core/hid.cpp" "src/osx/core/hid.cpp"
#"src/osx/core/hidjoystick.cpp" #"src/osx/core/hidjoystick.cpp"
"src/osx/core/mimetype.cpp" "src/osx/core/mimetype.cpp"
"src/osx/core/printmac.cpp" "src/osx/core/printmac.cpp"
"src/osx/core/sockosx.cpp" "src/osx/core/sockosx.cpp"
"src/osx/core/sound.cpp" "src/osx/core/sound.cpp"
"src/osx/core/stdpaths_cf.cpp"
"src/osx/core/strconv_cf.cpp" "src/osx/core/strconv_cf.cpp"
"src/osx/core/timer.cpp" "src/osx/core/timer.cpp"
"src/osx/core/utilsexc_base.cpp" "src/osx/core/utilsexc_base.cpp"
@ -810,6 +770,7 @@ set(SRCS_OSX
#"src/osx/iphone/msgdlg.mm" #"src/osx/iphone/msgdlg.mm"
#"src/osx/iphone/nonownedwnd.mm" #"src/osx/iphone/nonownedwnd.mm"
#"src/osx/iphone/scrolbar.mm" #"src/osx/iphone/scrolbar.mm"
#"src/osx/iphone/settings.mm"
#"src/osx/iphone/slider.mm" #"src/osx/iphone/slider.mm"
#"src/osx/iphone/stattext.mm" #"src/osx/iphone/stattext.mm"
#"src/osx/iphone/textctrl.mm" #"src/osx/iphone/textctrl.mm"
@ -831,7 +792,6 @@ set(SRCS_UNIX
"src/unix/snglinst.cpp" "src/unix/snglinst.cpp"
"src/unix/sockunix.cpp" "src/unix/sockunix.cpp"
"src/unix/stackwalk.cpp" "src/unix/stackwalk.cpp"
"src/unix/stdpaths.cpp"
"src/unix/threadpsx.cpp" "src/unix/threadpsx.cpp"
"src/unix/timerunx.cpp" "src/unix/timerunx.cpp"
"src/unix/utilsunx.cpp" "src/unix/utilsunx.cpp"
@ -843,12 +803,14 @@ set(SRCS_UNIXGTK
"src/unix/fontenum.cpp" "src/unix/fontenum.cpp"
"src/unix/fontutil.cpp" "src/unix/fontutil.cpp"
#"src/unix/fswatcher_inotify.cpp" #"src/unix/fswatcher_inotify.cpp"
"src/unix/glx11.cpp" #"src/unix/glx11.cpp"
#"src/unix/joystick.cpp" #"src/unix/joystick.cpp"
#"src/unix/mediactrl.cpp" #"src/unix/mediactrl.cpp"
#"src/unix/mediactrl_gstplayer.cpp"
"src/unix/mimetype.cpp" "src/unix/mimetype.cpp"
"src/unix/sound.cpp" "src/unix/sound.cpp"
#"src/unix/sound_sdl.cpp" #"src/unix/sound_sdl.cpp"
"src/unix/stdpaths.cpp"
#"src/unix/taskbarx11.cpp" #"src/unix/taskbarx11.cpp"
"src/unix/uiactionx11.cpp" "src/unix/uiactionx11.cpp"
"src/unix/utilsx11.cpp") "src/unix/utilsx11.cpp")
@ -882,8 +844,13 @@ if(APPLE)
${IOK_LIBRARY} ${IOK_LIBRARY}
${OPENGL_LIBRARY} ${OPENGL_LIBRARY}
${QUICKTIME_LIBRARY}) ${QUICKTIME_LIBRARY})
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
add_definitions(-D__LINUX__=1)
else()
add_definitions(-D__BSD__=1)
endif()
add_definitions(-D__WXGTK__) add_definitions(-D__WXGTK__)
set(SRCS set(SRCS
${SRCS} ${SRCS}
@ -891,15 +858,23 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
${SRCS_GTK} ${SRCS_GTK}
${SRCS_UNIX} ${SRCS_UNIX}
${SRCS_UNIXGTK}) ${SRCS_UNIXGTK})
if (NOT X11_xf86vmode_FOUND OR NOT X11_Xinerama_FOUND)
message(FATAL_ERROR "wxGTK2 needs Xinerama and Xxf86vm")
endif()
set(LIBS set(LIBS
png png
${GTHREAD2_LIBRARIES} ${GTHREAD2_LIBRARIES}
${PANGOCAIRO_LIBRARIES} ${PANGOCAIRO_LIBRARIES}
${GTK2_LIBRARIES}) ${GTK2_LIBRARIES}
${Backtrace_LIBRARY}
${X11_X11_LIB}
${X11_Xxf86vm_LIB}
${X11_Xinerama_LIB})
else() else()
add_definitions(-D__WXMSW__) add_definitions(-D__WXMSW__)
set(SRCS set(SRCS
${SRCS} ${SRCS}
${SRCS_GENERICMSW}
${SRCS_MSW}) ${SRCS_MSW})
endif() endif()

View File

@ -1,24 +1,24 @@
/* XPM */ /* XPM */
static const char *const addbookm_xpm[] = { static const char *const addbookm_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 3 1", "16 15 3 1",
". c Black", ". c Black",
"X c #00C000", "X c #00C000",
" c None", " c None",
/* pixels */ /* pixels */
" ....... ", " ....... ",
" .XXXXX. ", " .XXXXX. ",
" .. .XXXXX. ", " .. .XXXXX. ",
" .. .XXXXX. ", " .. .XXXXX. ",
" ...... .XXXXX. ", " ...... .XXXXX. ",
" ...... .XXXXX. ", " ...... .XXXXX. ",
" .. .XXXXX. ", " .. .XXXXX. ",
" .. .XXXXX. ", " .. .XXXXX. ",
" .XXXXX. ", " .XXXXX. ",
" .XXXXX. ", " .XXXXX. ",
" .XXXXX. ", " .XXXXX. ",
" .XXXXX. ", " .XXXXX. ",
" .XX.XX. ", " .XX.XX. ",
" .X. .X. ", " .X. .X. ",
" .. .. " " .. .. "
}; };

View File

@ -1,21 +1,21 @@
/* XPM */ /* XPM */
static const char *const back_xpm[] = { static const char *const back_xpm[] = {
"16 15 3 1", "16 15 3 1",
" c None", " c None",
". c Black", ". c Black",
"X c Gray100", "X c Gray100",
" ", " ",
" ", " ",
" . ", " . ",
" .. ", " .. ",
" .X. ", " .X. ",
" .XX........ ", " .XX........ ",
" .XXXXXXXXXX. ", " .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ", " .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ", " .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ", " .XXXXXXXXXX. ",
" .XX........ ", " .XX........ ",
" .X. ", " .X. ",
" .. ", " .. ",
" . ", " . ",
" "}; " "};

View File

@ -1,57 +1,57 @@
/* XPM */ /* XPM */
static const char *const cdrom_xpm[] = { static const char *const cdrom_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 36 1", "16 15 36 1",
"= c #9BACC2", "= c #9BACC2",
"y c #547B99", "y c #547B99",
"$ c #FFFFFF", "$ c #FFFFFF",
"@ c #839CB5", "@ c #839CB5",
"o c #547897", "o c #547897",
"4 c #4D7492", "4 c #4D7492",
"% c #F1F4F7", "% c #F1F4F7",
"X c #5A809C", "X c #5A809C",
"< c #8497A5", "< c #8497A5",
"0 c #7898AD", "0 c #7898AD",
"+ c #CAD2DC", "+ c #CAD2DC",
"r c #ACAEB2", "r c #ACAEB2",
"2 c #BECAD9", "2 c #BECAD9",
"* c #65839D", "* c #65839D",
"e c #DCE2EA", "e c #DCE2EA",
"- c #ADBED2", "- c #ADBED2",
"t c #597B9A", "t c #597B9A",
" c None", " c None",
"1 c #467291", "1 c #467291",
"9 c #D6DFE7", "9 c #D6DFE7",
"O c #7393AB", "O c #7393AB",
"u c #49708B", "u c #49708B",
"5 c #A0BACB", "5 c #A0BACB",
"& c #AABFCD", "& c #AABFCD",
"8 c #B9CBD5", "8 c #B9CBD5",
"; c #B4C4D3", "; c #B4C4D3",
": c #6F90A6", ": c #6F90A6",
"3 c #A8B6CA", "3 c #A8B6CA",
"# c #ADBACE", "# c #ADBACE",
"w c #E4E9ED", "w c #E4E9ED",
". c #8EA9BC", ". c #8EA9BC",
"> c #B3BFD1", "> c #B3BFD1",
", c #C2CBDB", ", c #C2CBDB",
"6 c #C0D1DC", "6 c #C0D1DC",
"7 c #A2B3C5", "7 c #A2B3C5",
"q c #5D7C93", "q c #5D7C93",
/* pixels */ /* pixels */
" .XooOo+ ", " .XooOo+ ",
" X@#$$$%o& ", " X@#$$$%o& ",
" *=-;$$$$$o+ ", " *=-;$$$$$o+ ",
" +O#;-$$$$$$: ", " +O#;-$$$$$$: ",
" o=>,-<1<$2-o ", " o=>,-<1<$2-o ",
" o3>--1$122-* ", " o3>--1$122-* ",
" o=--$<4<22-X ", " o=--$<4<22-X ",
" o5$$$$$26;7* ", " o5$$$$$26;7* ",
" X%$$$$2;-X8 ", " X%$$$$2;-X8 ",
" 90*9$$$-7Xqo ", " 90*9$$$-7Xqo ",
" wXwe@O44X4<r<o ", " wXwe@O44X4<r<o ",
" X8628>22222<<*4", " X8628>22222<<*4",
" ttyyyoo4441uuuo", " ttyyyoo4441uuuo",
" t>$$$$$$$$$$$>o", " t>$$$$$$$$$$$>o",
" XXXtyyyoo44411u" " XXXtyyyoo44411u"
}; };

View File

@ -1,44 +1,44 @@
/* XPM */ /* XPM */
static const char *const copy_xpm[] = { static const char *const copy_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 23 1", "16 15 23 1",
"o c #97C4E7", "o c #97C4E7",
"* c #FFFFFF", "* c #FFFFFF",
"@ c #60A9DA", "@ c #60A9DA",
"= c #D1E5F5", "= c #D1E5F5",
"& c #C3DDF1", "& c #C3DDF1",
". c #7EA6C0", ". c #7EA6C0",
" c None", " c None",
"X c #2F93CD", "X c #2F93CD",
"O c #85BBE2", "O c #85BBE2",
", c #EFF6FC", ", c #EFF6FC",
"; c #DEEDF8", "; c #DEEDF8",
"+ c #72B2DD", "+ c #72B2DD",
"3 c #F7FBFD", "3 c #F7FBFD",
"4 c #FAFCFE", "4 c #FAFCFE",
": c #DAEAF7", ": c #DAEAF7",
"< c #E9F3FA", "< c #E9F3FA",
"1 c #E2EFF8", "1 c #E2EFF8",
"- c #FDFDFE", "- c #FDFDFE",
"% c #B6D5EE", "% c #B6D5EE",
"$ c #A5CCEA", "$ c #A5CCEA",
"> c #E5F0F9", "> c #E5F0F9",
"# c #AFD1EC", "# c #AFD1EC",
"2 c #F4F9FD", "2 c #F4F9FD",
/* pixels */ /* pixels */
" .....XX ", " .....XX ",
" .oO+@X#X ", " .oO+@X#X ",
" .$oO+X##X ", " .$oO+X##X ",
" .%$o........ ", " .%$o........ ",
" .&%$.*=&#o.-. ", " .&%$.*=&#o.-. ",
" .=&%.*;=&#.--. ", " .=&%.*;=&#.--. ",
" .:=&.*>;=&.... ", " .:=&.*>;=&.... ",
" .>:=.*,>;=&#o. ", " .>:=.*,>;=&#o. ",
" .<1:.*2,>:=&#. ", " .<1:.*2,>:=&#. ",
" .2<1.*32,>:=&. ", " .2<1.*32,>:=&. ",
" .32<.*432,>:=. ", " .32<.*432,>:=. ",
" .32<.*-432,>:. ", " .32<.*-432,>:. ",
" .....**-432,>. ", " .....**-432,>. ",
" .***-432,. ", " .***-432,. ",
" .......... " " .......... "
}; };

View File

@ -1,17 +1,17 @@
/* XPM */ /* XPM */
static const char *const cross_xpm[] = { static const char *const cross_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"10 10 2 1", "10 10 2 1",
" c Gray0", " c Gray0",
"# c None", "# c None",
/* pixels */ /* pixels */
" ######## ", " ######## ",
" #### ", " #### ",
"# ## #", "# ## #",
"## ##", "## ##",
"### ###", "### ###",
"### ###", "### ###",
"## ##", "## ##",
"# ## #", "# ## #",
" #### ", " #### ",
" ###### "}; " ###### "};

View File

@ -1,46 +1,46 @@
/* XPM */ /* XPM */
static const char *const cut_xpm[] = { static const char *const cut_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 25 1", "16 15 25 1",
"6 c #D8BDC0", "6 c #D8BDC0",
": c #C3C3C4", ": c #C3C3C4",
"- c #FFFFFF", "- c #FFFFFF",
". c #6C6D70", ". c #6C6D70",
"2 c #AD3A45", "2 c #AD3A45",
"o c #DBDBDB", "o c #DBDBDB",
"# c #939495", "# c #939495",
"< c #E42234", "< c #E42234",
"& c #C3C5C8", "& c #C3C5C8",
"; c #C6CCD3", "; c #C6CCD3",
"% c #B7B7B8", "% c #B7B7B8",
" c None", " c None",
"* c #DFE0E2", "* c #DFE0E2",
"5 c #B69596", "5 c #B69596",
"3 c #9C2A35", "3 c #9C2A35",
"1 c #CFCFD0", "1 c #CFCFD0",
", c #AB5C64", ", c #AB5C64",
"+ c #D2D3D4", "+ c #D2D3D4",
"$ c #BCBDBE", "$ c #BCBDBE",
"@ c #C6C8CA", "@ c #C6C8CA",
"> c #CDC0C1", "> c #CDC0C1",
"O c #826F72", "O c #826F72",
"X c #979BA0", "X c #979BA0",
"4 c #9B8687", "4 c #9B8687",
"= c #9FA0A0", "= c #9FA0A0",
/* pixels */ /* pixels */
" .X .o ", " .X .o ",
" O.+ @. ", " O.+ @. ",
" O. .. ", " O. .. ",
" O#$ %.& ", " O#$ %.& ",
" O.*.. ", " O.*.. ",
" #%#.. ", " #%#.. ",
" O=-.. ", " O=-.. ",
" #%#;. ", " #%#;. ",
" OO:=O ", " OO:=O ",
" >,,<, ,<,,1 ", " >,,<, ,<,,1 ",
" ><23<1 1<32<1 ", " ><23<1 1<32<1 ",
" ,2 4< <5 2, ", " ,2 4< <5 2, ",
" <, ,2 2, ,< ", " <, ,2 2, ,< ",
" 23,<5 5<,32 ", " 23,<5 5<,32 ",
" 6225 522> " " 6225 522> "
}; };

View File

@ -1,54 +1,54 @@
/* XPM */ /* XPM */
static const char *const deffile_xpm[] = { static const char *const deffile_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 32 1", "16 16 32 1",
"= c #97C4E7", "= c #97C4E7",
": c #72A8D2", ": c #72A8D2",
"1 c #FFFFFF", "1 c #FFFFFF",
"w c #839CB5", "w c #839CB5",
"X c #6B98B8", "X c #6B98B8",
". c #5A89A6", ". c #5A89A6",
"@ c #3A749C", "@ c #3A749C",
", c #D1E5F5", ", c #D1E5F5",
"< c #67A1CF", "< c #67A1CF",
"> c #F1F4F7", "> c #F1F4F7",
"e c #85A7BC", "e c #85A7BC",
"% c #C3DDF1", "% c #C3DDF1",
"0 c #749BB4", "0 c #749BB4",
"2 c #7EA6C0", "2 c #7EA6C0",
"; c #5F9BC8", "; c #5F9BC8",
" c None", " c None",
"O c #538DB3", "O c #538DB3",
"- c #85BBE2", "- c #85BBE2",
"$ c #D6DFE7", "$ c #D6DFE7",
"9 c #EFF6FC", "9 c #EFF6FC",
"o c #6591AE", "o c #6591AE",
"4 c #F7FBFD", "4 c #F7FBFD",
"8 c #FAFCFE", "8 c #FAFCFE",
"6 c #DAEAF7", "6 c #DAEAF7",
"7 c #E9F3FA", "7 c #E9F3FA",
"q c #FDFDFE", "q c #FDFDFE",
"3 c #E2EFF8", "3 c #E2EFF8",
"# c #8EA9BC", "# c #8EA9BC",
"& c #B6D5EE", "& c #B6D5EE",
"* c #A5CCEA", "* c #A5CCEA",
"5 c #F4F9FD", "5 c #F4F9FD",
"+ c #4581AA", "+ c #4581AA",
/* pixels */ /* pixels */
" ..XooO+@#$ ", " ..XooO+@#$ ",
" .%%&*=-;:;> ", " .%%&*=-;:;> ",
" .,,%&*=<1=X> ", " .,,%&*=<1=X> ",
" #%%%%&*211=X ", " #%%%%&*211=X ",
" #3-----<oXoO ", " #3-----<oXoO ",
" #3456,%&*=-O ", " #3456,%&*=-O ",
" #3--------=O ", " #3--------=O ",
" #355736,%&*o ", " #355736,%&*o ",
" #3--------&o ", " #3--------&o ",
" #38459736,%X ", " #38459736,%X ",
" #3--------,0 ", " #3--------,0 ",
" #31q84597360 ", " #31q84597360 ",
" #3--------3w ", " #3--------3w ",
" #3111q84597e ", " #3111q84597e ",
" ##########e# ", " ##########e# ",
" " " "
}; };

View File

@ -1,24 +1,24 @@
/* XPM */ /* XPM */
static const char *const delbookm_xpm[] = { static const char *const delbookm_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 3 1", "16 15 3 1",
". c Black", ". c Black",
" c None", " c None",
"X c #FF4040", "X c #FF4040",
/* pixels */ /* pixels */
" ....... ", " ....... ",
" .XXXXX. ", " .XXXXX. ",
" . . .XXXXX. ", " . . .XXXXX. ",
" .. .. .XXXXX. ", " .. .. .XXXXX. ",
" ... .XXXXX. ", " ... .XXXXX. ",
" . .XXXXX. ", " . .XXXXX. ",
" ... .XXXXX. ", " ... .XXXXX. ",
" .. .. .XXXXX. ", " .. .. .XXXXX. ",
" . . .XXXXX. ", " . . .XXXXX. ",
" .XXXXX. ", " .XXXXX. ",
" .XXXXX. ", " .XXXXX. ",
" .XXXXX. ", " .XXXXX. ",
" .XX.XX. ", " .XX.XX. ",
" .X. .X. ", " .X. .X. ",
" .. .. " " .. .. "
}; };

View File

@ -1,42 +1,42 @@
/* XPM */ /* XPM */
static const char *const delete_xpm[] = { static const char *const delete_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 21 1", "16 15 21 1",
"2 c #A5AEBD", "2 c #A5AEBD",
"* c #5478B4", "* c #5478B4",
"< c #95A3BB", "< c #95A3BB",
"O c #9AA7BC", "O c #9AA7BC",
"; c #758EB7", "; c #758EB7",
"$ c #6986B6", "$ c #6986B6",
"# c #4971B2", "# c #4971B2",
"& c #8A9CBA", "& c #8A9CBA",
"X c #8598B9", "X c #8598B9",
" c None", " c None",
"o c #ABB2BE", "o c #ABB2BE",
"- c #7F95B9", "- c #7F95B9",
"= c #4E74B3", "= c #4E74B3",
"1 c #A0ABBC", "1 c #A0ABBC",
"+ c #6F8AB7", "+ c #6F8AB7",
". c #B5B9BF", ". c #B5B9BF",
"@ c #3E69B1", "@ c #3E69B1",
", c #90A0BA", ", c #90A0BA",
": c #6483B5", ": c #6483B5",
"> c #5A7BB4", "> c #5A7BB4",
"% c #5F7FB5", "% c #5F7FB5",
/* pixels */ /* pixels */
" ", " ",
" .Xo OO ", " .Xo OO ",
" +@#. $@% ", " +@#. $@% ",
" &@@X .*@*o ", " &@@X .*@*o ",
" =@= .*@*. ", " =@= .*@*. ",
" -@@X*@*. ", " -@@X*@*. ",
" .#@@@$. ", " .#@@@$. ",
" ;@@: ", " ;@@: ",
" ;@@@+ ", " ;@@@+ ",
" .>@#%@@. ", " .>@#%@@. ",
" o*@*oO@@, ", " o*@*oO@@, ",
" <#@*. .@@= ", " <#@*. .@@= ",
"&@@$ :@@1 ", "&@@$ :@@1 ",
";#& 2#>. ", ";#& 2#>. ",
" " " "
}; };

View File

@ -1,52 +1,52 @@
/* XPM */ /* XPM */
static const char *const dir_up_xpm[] = { static const char *const dir_up_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 31 1", "16 15 31 1",
"6 c #9BACC2", "6 c #9BACC2",
"o c #9AEA53", "o c #9AEA53",
"7 c #94A5BD", "7 c #94A5BD",
"8 c #547897", "8 c #547897",
"5 c #839CB5", "5 c #839CB5",
"@ c #376485", "@ c #376485",
"$ c #5A809C", "$ c #5A809C",
"# c #7F99B4", "# c #7F99B4",
": c #D1D9E5", ": c #D1D9E5",
"< c #EAEDF3", "< c #EAEDF3",
"& c #446A8C", "& c #446A8C",
"q c #65839D", "q c #65839D",
"> c #DCE2EA", "> c #DCE2EA",
", c #E1E6EE", ", c #E1E6EE",
"2 c #F5F6F7", "2 c #F5F6F7",
"O c #8DA0B9", "O c #8DA0B9",
" c None", " c None",
"% c #467291", "% c #467291",
". c #305F81", ". c #305F81",
"X c #7393AB", "X c #7393AB",
"+ c #6A89A2", "+ c #6A89A2",
"4 c #A8B6CA", "4 c #A8B6CA",
"1 c #EEF1F3", "1 c #EEF1F3",
"3 c #F8F9FA", "3 c #F8F9FA",
"0 c #215579", "0 c #215579",
"9 c #7F97B0", "9 c #7F97B0",
"* c #B3BFD1", "* c #B3BFD1",
"w c #7A90AC", "w c #7A90AC",
"- c #C2CBDB", "- c #C2CBDB",
"; c #CAD6E1", "; c #CAD6E1",
"= c #BBC4D6", "= c #BBC4D6",
/* pixels */ /* pixels */
" .. ", " .. ",
" X.o. ", " X.o. ",
".... X.ooo. ", ".... X.ooo. ",
".OO+....ooooo. ", ".OO+....ooooo. ",
".OOOOOO@@ooo.. ", ".OOOOOO@@ooo.. ",
".OOOO#OO@ooo.$ ", ".OOOO#OO@ooo.$ ",
".OOOOOOO@ooo.$ ", ".OOOOOOO@ooo.$ ",
".O%............&", ".O%............&",
".O&*=-;:>,<1231.", ".O&*=-;:>,<1231.",
".+.4*=-;:>,<12$.", ".+.4*=-;:>,<12$.",
"..564*=-;:>,<1. ", "..564*=-;:>,<1. ",
".@O764*=-;:>,<. ", ".@O764*=-;:>,<. ",
".89O764*=-;:>$$ ", ".89O764*=-;:>$$ ",
"0qw9O764*=-;:. ", "0qw9O764*=-;:. ",
"0............. " "0............. "
}; };

View File

@ -1,21 +1,21 @@
/* XPM */ /* XPM */
static const char *const down_xpm[] = { static const char *const down_xpm[] = {
"16 15 3 1", "16 15 3 1",
" c None", " c None",
". c Black", ". c Black",
"X c Gray100", "X c Gray100",
" ", " ",
" ...... ", " ...... ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" ....XXXX.... ", " ....XXXX.... ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" .XXXXXX. ", " .XXXXXX. ",
" .XXXX. ", " .XXXX. ",
" .XX. ", " .XX. ",
" .. ", " .. ",
" "}; " "};

22
Externals/wxWidgets3/art/edit.xpm vendored Normal file
View File

@ -0,0 +1,22 @@
/* XPM */
static const char* const edit_xpm[] = {
"16 16 3 1",
" c None",
". c #000000",
"+ c #00007F",
" ",
" ",
" .. .. ",
" . ",
" . ",
" ++++ . ++++ ",
" ++ . ++ ++",
" +++++ . ++++++",
" ++ ++ . ++ ",
" ++ ++ . ++ ++",
" +++++ . ++++ ",
" . ",
" . ",
" .. .. ",
" ",
" "};

View File

@ -1,73 +1,73 @@
/* XPM */ /* XPM */
static const char *const exefile_xpm[] = { static const char *const exefile_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 51 1", "16 16 51 1",
"% c #E8E8EC", "% c #E8E8EC",
"= c #E8E8ED", "= c #E8E8ED",
"z c #CACAD4", "z c #CACAD4",
"8 c #D9D9E1", "8 c #D9D9E1",
"p c #D2D2DA", "p c #D2D2DA",
"u c #E1E1E7", "u c #E1E1E7",
"a c #D2D2DB", "a c #D2D2DB",
"< c #E9E9ED", "< c #E9E9ED",
"q c #DADAE1", "q c #DADAE1",
"+ c #F1F1F4", "+ c #F1F1F4",
"g c #D3D3DB", "g c #D3D3DB",
"1 c #E2E2E8", "1 c #E2E2E8",
"x c #D3D3DC", "x c #D3D3DC",
"5 c #00A5FF", "5 c #00A5FF",
"$ c #EAEAEE", "$ c #EAEAEE",
"4 c #DBDBE2", "4 c #DBDBE2",
"h c #CCCCD6", "h c #CCCCD6",
"y c #D4D4DC", "y c #D4D4DC",
"r c #E3E3E9", "r c #E3E3E9",
"d c #D4D4DD", "d c #D4D4DD",
"7 c #DCDCE2", "7 c #DCDCE2",
": c #EBEBEF", ": c #EBEBEF",
"0 c #DCDCE3", "0 c #DCDCE3",
" c None", " c None",
"O c #F3F3F5", "O c #F3F3F5",
"> c #E4E4E9", "> c #E4E4E9",
"& c #F3F3F6", "& c #F3F3F6",
"j c #D5D5DD", "j c #D5D5DD",
"6 c #E4E4EA", "6 c #E4E4EA",
". c #C6C6D5", ". c #C6C6D5",
"# c #ECECF0", "# c #ECECF0",
"f c #CECED7", "f c #CECED7",
"l c #CECED8", "l c #CECED8",
"e c #D6D6DE", "e c #D6D6DE",
"; c #EDEDF0", "; c #EDEDF0",
"3 c #DEDEE4", "3 c #DEDEE4",
", c #EDEDF1", ", c #EDEDF1",
"c c #CFCFD8", "c c #CFCFD8",
"o c #F5F5F7", "o c #F5F5F7",
"- c #E6E6EB", "- c #E6E6EB",
"w c #D7D7DF", "w c #D7D7DF",
"v c #C8C8D3", "v c #C8C8D3",
"i c #DFDFE5", "i c #DFDFE5",
"@ c #EEEEF2", "@ c #EEEEF2",
"s c #D0D0D9", "s c #D0D0D9",
"X c #9494AD", "X c #9494AD",
"9 c #D8D8DF", "9 c #D8D8DF",
"t c #D8D8E0", "t c #D8D8E0",
"* c #EFEFF2", "* c #EFEFF2",
"2 c #E0E0E6", "2 c #E0E0E6",
"k c #D1D1DA", "k c #D1D1DA",
/* pixels */ /* pixels */
" ........X ", " ........X ",
" .oO+@#$%XX ", " .oO+@#$%XX ",
" .&+*#$=-XXX ", " .&+*#$=-XXX ",
" .+*;:=->XXXX ", " .+*;:=->XXXX ",
" .*,:<->1234X ", " .*,:<->1234X ",
" .,5:5612378X ", " .,5:5612378X ",
" 5,5559530qwX ", " 5,5559530qwX ",
" 55555550q9eX ", " 55555550q9eX ",
" 5555r5555teyX ", " 5555r5555teyX ",
" 55rui559eypX ", " 55rui559eypX ",
" 5555i5555yasX ", " 5555i5555yasX ",
" 5555555dasfX ", " 5555555dasfX ",
" 5355595gsfhX ", " 5355595gsfhX ",
" .3595jgklhzX ", " .3595jgklhzX ",
" .0qwjxkchzvX ", " .0qwjxkchzvX ",
" XXXXXXXXXXXX " " XXXXXXXXXXXX "
}; };

View File

@ -1,57 +1,57 @@
/* XPM */ /* XPM */
static const char *const fileopen_xpm[] = { static const char *const fileopen_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 36 1", "16 15 36 1",
"6 c #9BACC2", "6 c #9BACC2",
"< c #9AEA53", "< c #9AEA53",
"9 c #94A5BD", "9 c #94A5BD",
"5 c #839CB5", "5 c #839CB5",
"; c #4D7492", "; c #4D7492",
". c #376485", ". c #376485",
"$ c #7F99B4", "$ c #7F99B4",
"r c #D1D9E5", "r c #D1D9E5",
"7 c #EAEDF3", "7 c #EAEDF3",
"@ c #CAD2DC", "@ c #CAD2DC",
"% c #718BA7", "% c #718BA7",
"t c #BECAD9", "t c #BECAD9",
"& c #65839D", "& c #65839D",
"0 c #DCE2EA", "0 c #DCE2EA",
"4 c #F5F6F7", "4 c #F5F6F7",
"w c #597B9A", "w c #597B9A",
"O c #8DA0B9", "O c #8DA0B9",
" c None", " c None",
"+ c #467291", "+ c #467291",
"u c #305F81", "u c #305F81",
"= c #B4C4D3", "= c #B4C4D3",
"# c #CAE2AA", "# c #CAE2AA",
"1 c #FAFCFE", "1 c #FAFCFE",
"3 c #A8B6CA", "3 c #A8B6CA",
"q c #E4E9ED", "q c #E4E9ED",
"8 c #EEF1F3", "8 c #EEF1F3",
"X c #215579", "X c #215579",
"2 c #7F97B0", "2 c #7F97B0",
": c #B3BFD1", ": c #B3BFD1",
"y c #7A90AC", "y c #7A90AC",
", c #C2CBDB", ", c #C2CBDB",
"- c #ADD668", "- c #ADD668",
"* c #B6D791", "* c #B6D791",
"e c #CAD6E1", "e c #CAD6E1",
"o c #DFF0D0", "o c #DFF0D0",
"> c #BBC4D6", "> c #BBC4D6",
/* pixels */ /* pixels */
" ", " ",
" .... ", " .... ",
"XXXXX .oo. ", "XXXXX .oo. ",
"XOOOO+@.#o. ", "XOOOO+@.#o. ",
"XOOOO$%&.*oXXX ", "XOOOO$%&.*oXXX ",
"XOOOOOOO.*oX=X ", "XOOOOOOO.*oX=X ",
"XOXXXX...-oXXXX;", "XOXXXX...-oXXXX;",
"XOX:>,.<<<<<oX1;", "XOX:>,.<<<<<oX1;",
"X2X3:>,.<<<oX4=;", "X2X3:>,.<<<oX4=;",
"XX563:>>.<oX78; ", "XX563:>>.<oX78; ",
"XXO963:>>.X0q7; ", "XXO963:>>.X0q7; ",
"Xw2O963:>>er0t; ", "Xw2O963:>>er0t; ",
"X&y2O963:>,er; ", "X&y2O963:>,er; ",
"uXXXXXXXXXXXX; ", "uXXXXXXXXXXXX; ",
" " " "
}; };

View File

@ -1,42 +1,42 @@
/* XPM */ /* XPM */
static const char *const filesave_xpm[] = { static const char *const filesave_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 21 1", "16 15 21 1",
"O c #FFFFFF", "O c #FFFFFF",
"> c #D5D6D8", "> c #D5D6D8",
"; c #446A8C", "; c #446A8C",
"1 c #CAD2DC", "1 c #CAD2DC",
": c #C0C7D1", ": c #C0C7D1",
" c #5F666D", " c #5F666D",
"% c #A5B0BA", "% c #A5B0BA",
"o c #65839D", "o c #65839D",
", c #DCE2EA", ", c #DCE2EA",
"< c #C3C5C8", "< c #C3C5C8",
"- c #E1E6EE", "- c #E1E6EE",
"* c #C6CCD3", "* c #C6CCD3",
". c None", ". c None",
"$ c #305F81", "$ c #305F81",
"2 c #D6DFE7", "2 c #D6DFE7",
"= c #D2D9E0", "= c #D2D9E0",
"& c #B7BFC7", "& c #B7BFC7",
"X c #1B4467", "X c #1B4467",
"# c #BCBDBE", "# c #BCBDBE",
"@ c #7A90AC", "@ c #7A90AC",
"+ c #5D7C93", "+ c #5D7C93",
/* pixels */ /* pixels */
" .", " .",
" XoOOOOOOOOO+X .", " XoOOOOOOOOO+X .",
" @oO#######O+@ .", " @oO#######O+@ .",
" @oOOOOOOOOO+@ .", " @oOOOOOOOOO+@ .",
" @oO#######O+@ .", " @oO#######O+@ .",
" @oOOOOOOOOO+@ .", " @oOOOOOOOOO+@ .",
" @@+++++++++@@ .", " @@+++++++++@@ .",
" @@@@@@@@@@@@@ .", " @@@@@@@@@@@@@ .",
" @@@$$$$$$$$@@ .", " @@@$$$$$$$$@@ .",
" @@$%%%&*=-O$@ .", " @@$%%%&*=-O$@ .",
" @@$%X;;*=-O$@ .", " @@$%X;;*=-O$@ .",
" @@$%X;;:>,O$@ .", " @@$%X;;:>,O$@ .",
" @@$%X;;<12O$@ .", " @@$%X;;<12O$@ .",
" @@$<<2OOOOO$@ .", " @@$<<2OOOOO$@ .",
". .." ". .."
}; };

View File

@ -1,44 +1,44 @@
/* XPM */ /* XPM */
static const char *const filesaveas_xpm[] = { static const char *const filesaveas_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 23 1", "16 15 23 1",
"X c Black", "X c Black",
"+ c #FFFFFF", "+ c #FFFFFF",
"< c #D5D6D8", "< c #D5D6D8",
"> c #446A8C", "> c #446A8C",
"3 c #CAD2DC", "3 c #CAD2DC",
", c #C0C7D1", ", c #C0C7D1",
" c #5F666D", " c #5F666D",
"* c #A5B0BA", "* c #A5B0BA",
"O c #65839D", "O c #65839D",
"1 c #DCE2EA", "1 c #DCE2EA",
"2 c #C3C5C8", "2 c #C3C5C8",
": c #E1E6EE", ": c #E1E6EE",
". c #FFFF00", ". c #FFFF00",
"- c #C6CCD3", "- c #C6CCD3",
"@ c None", "@ c None",
"& c #305F81", "& c #305F81",
"4 c #D6DFE7", "4 c #D6DFE7",
"; c #D2D9E0", "; c #D2D9E0",
"= c #B7BFC7", "= c #B7BFC7",
"o c #1B4467", "o c #1B4467",
"$ c #BCBDBE", "$ c #BCBDBE",
"# c #7A90AC", "# c #7A90AC",
"% c #5D7C93", "% c #5D7C93",
/* pixels */ /* pixels */
" .X .XX.", " .X .XX.",
" oO+++++++.X.X.@", " oO+++++++.X.X.@",
" #O+$$$$$XX...XX", " #O+$$$$$XX...XX",
" #O++++++.......", " #O++++++.......",
" #O+$$$$$XX...XX", " #O+$$$$$XX...XX",
" #O+++++++.X.X.@", " #O+++++++.X.X.@",
" ##%%%%%%.X%.X .", " ##%%%%%%.X%.X .",
" ############# @", " ############# @",
" ###&&&&&&&&## @", " ###&&&&&&&&## @",
" ##&***=-;:+&# @", " ##&***=-;:+&# @",
" ##&*o>>-;:+&# @", " ##&*o>>-;:+&# @",
" ##&*o>>,<1+&# @", " ##&*o>>,<1+&# @",
" ##&*o>>234+&# @", " ##&*o>>234+&# @",
" ##&224+++++&# @", " ##&224+++++&# @",
"@ @@" "@ @@"
}; };

View File

@ -1,62 +1,62 @@
/* XPM */ /* XPM */
static const char *const find_xpm[] = { static const char *const find_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 41 1", "16 15 41 1",
"y c #A06959", "y c #A06959",
"9 c #A7DAF2", "9 c #A7DAF2",
"$ c #B5CAD7", "$ c #B5CAD7",
"> c #35B4E1", "> c #35B4E1",
"t c #6B98B8", "t c #6B98B8",
"w c #B6E0F4", "w c #B6E0F4",
"q c #AEC9D7", "q c #AEC9D7",
"1 c #5A89A6", "1 c #5A89A6",
"+ c #98B3C6", "+ c #98B3C6",
"4 c #EAF6FC", "4 c #EAF6FC",
"3 c #DEF1FA", "3 c #DEF1FA",
"= c #4CBCE3", "= c #4CBCE3",
"d c #DB916B", "d c #DB916B",
"X c #85A7BC", "X c #85A7BC",
"s c #D8BCA4", "s c #D8BCA4",
"o c #749BB4", "o c #749BB4",
"e c #BCD9EF", "e c #BCD9EF",
"* c #62B4DD", "* c #62B4DD",
"< c #91D2EF", "< c #91D2EF",
"a c #E6DED2", "a c #E6DED2",
"0 c #E9F4FB", "0 c #E9F4FB",
" c None", " c None",
"@ c #A0BACB", "@ c #A0BACB",
"O c #AABFCD", "O c #AABFCD",
"i c #6591AE", "i c #6591AE",
": c #B9CBD5", ": c #B9CBD5",
"- c #71C5E7", "- c #71C5E7",
"5 c #D3ECF8", "5 c #D3ECF8",
"% c #81A3B9", "% c #81A3B9",
"6 c #8AD0EE", "6 c #8AD0EE",
"8 c #FDFDFE", "8 c #FDFDFE",
"p c #8EA9BC", "p c #8EA9BC",
"r c #B6D5EE", "r c #B6D5EE",
", c #81CCEB", ", c #81CCEB",
". c #ACC4D3", ". c #ACC4D3",
"; c #AFD1DE", "; c #AFD1DE",
"7 c #EFF8FC", "7 c #EFF8FC",
"u c #C2CBDB", "u c #C2CBDB",
"# c #C0D1DC", "# c #C0D1DC",
"2 c #CAD6E1", "2 c #CAD6E1",
"& c #8FB0C3", "& c #8FB0C3",
/* pixels */ /* pixels */
" .XooXO ", " .XooXO ",
" +@###$+% ", " +@###$+% ",
" .&#*==-;@@ ", " .&#*==-;@@ ",
" o:*>,<--:X ", " o:*>,<--:X ",
" 12>-345-#% ", " 12>-345-#% ",
" 12>678392% ", " 12>678392% ",
" %$*,3059q& ", " %$*,3059q& ",
" @Oq,wwer@@ ", " @Oq,wwer@@ ",
" t@q22q&+ ", " t@q22q&+ ",
" yyui+%o%p ", " yyui+%o%p ",
" yasy ", " yasy ",
" yasdy ", " yasdy ",
" yasdy ", " yasdy ",
" ysdy ", " ysdy ",
" yy " " yy "
}; };

View File

@ -1,63 +1,63 @@
/* XPM */ /* XPM */
static const char *const findrepl_xpm[] = { static const char *const findrepl_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 42 1", "16 15 42 1",
"y c #A06959", "y c #A06959",
"9 c #A7DAF2", "9 c #A7DAF2",
"$ c #B5CAD7", "$ c #B5CAD7",
"> c #35B4E1", "> c #35B4E1",
"t c #6B98B8", "t c #6B98B8",
"w c #B6E0F4", "w c #B6E0F4",
"q c #AEC9D7", "q c #AEC9D7",
"1 c #5A89A6", "1 c #5A89A6",
"+ c #98B3C6", "+ c #98B3C6",
"4 c #EAF6FC", "4 c #EAF6FC",
"d c #008000", "d c #008000",
"3 c #DEF1FA", "3 c #DEF1FA",
"= c #4CBCE3", "= c #4CBCE3",
"f c #DB916B", "f c #DB916B",
"X c #85A7BC", "X c #85A7BC",
"s c #D8BCA4", "s c #D8BCA4",
"o c #749BB4", "o c #749BB4",
"e c #BCD9EF", "e c #BCD9EF",
"* c #62B4DD", "* c #62B4DD",
"< c #91D2EF", "< c #91D2EF",
"a c #E6DED2", "a c #E6DED2",
"0 c #E9F4FB", "0 c #E9F4FB",
" c None", " c None",
"@ c #A0BACB", "@ c #A0BACB",
"O c #AABFCD", "O c #AABFCD",
"i c #6591AE", "i c #6591AE",
": c #B9CBD5", ": c #B9CBD5",
"- c #71C5E7", "- c #71C5E7",
"5 c #D3ECF8", "5 c #D3ECF8",
"% c #81A3B9", "% c #81A3B9",
"6 c #8AD0EE", "6 c #8AD0EE",
"8 c #FDFDFE", "8 c #FDFDFE",
"p c #8EA9BC", "p c #8EA9BC",
"r c #B6D5EE", "r c #B6D5EE",
", c #81CCEB", ", c #81CCEB",
". c #ACC4D3", ". c #ACC4D3",
"; c #AFD1DE", "; c #AFD1DE",
"7 c #EFF8FC", "7 c #EFF8FC",
"u c #C2CBDB", "u c #C2CBDB",
"# c #C0D1DC", "# c #C0D1DC",
"2 c #CAD6E1", "2 c #CAD6E1",
"& c #8FB0C3", "& c #8FB0C3",
/* pixels */ /* pixels */
" .XooXO ", " .XooXO ",
" +@###$+% ", " +@###$+% ",
" .&#*==-;@@ ", " .&#*==-;@@ ",
" o:*>,<--:X ", " o:*>,<--:X ",
" 12>-345-#% ", " 12>-345-#% ",
" 12>678392% ", " 12>678392% ",
" %$*,3059q& ", " %$*,3059q& ",
" @Oq,wwer@@ ", " @Oq,wwer@@ ",
" t@q22q&+ ", " t@q22q&+ ",
" yyui+%o%p ", " yyui+%o%p ",
" yasy d d ", " yasy d d ",
" yasfy dd dd ", " yasfy dd dd ",
"yasfy ddddddddd", "yasfy ddddddddd",
"ysfy dd dd ", "ysfy dd dd ",
" yy d d " " yy d d "
}; };

View File

@ -1,39 +1,39 @@
/* XPM */ /* XPM */
static const char *const floppy_xpm[] = { static const char *const floppy_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 18 1", "16 15 18 1",
"& c #E3E4E6", "& c #E3E4E6",
"+ c #FFFFFF", "+ c #FFFFFF",
". c #446A8C", ". c #446A8C",
"o c #697787", "o c #697787",
"> c #5F666D", "> c #5F666D",
"* c #B2B3B3", "* c #B2B3B3",
" c None", " c None",
", c #4B4C4D", ", c #4B4C4D",
"= c #DCDBDA", "= c #DCDBDA",
"$ c #1B4467", "$ c #1B4467",
": c #E4E9ED", ": c #E4E9ED",
"@ c #979BA0", "@ c #979BA0",
"X c #203646", "X c #203646",
"O c #215579", "O c #215579",
"- c #545B63", "- c #545B63",
"; c #636465", "; c #636465",
"# c #CAD6E1", "# c #CAD6E1",
"% c #7F8286", "% c #7F8286",
/* pixels */ /* pixels */
" .XoooooooXO ", " .XoooooooXO ",
" .o+++++++.O ", " .o+++++++.O ",
" .o+OOOOO+.O ", " .o+OOOOO+.O ",
" .o+++++++.O ", " .o+++++++.O ",
" .o@@@@@@@.O ", " .o@@@@@@@.O ",
" ..........O ", " ..........O ",
" ..#+++++#.O ", " ..#+++++#.O ",
" ..+$O+++#.O ", " ..+$O+++#.O ",
" ..+$O+++#.O ", " ..+$O+++#.O ",
" %&.........*% ", " %&.........*% ",
"%=+++++++++++&% ", "%=+++++++++++&% ",
"--------------; ", "--------------; ",
"-:::::::::::::- ", "-:::::::::::::- ",
"-:X:XXXXXXXXX:> ", "-:X:XXXXXXXXX:> ",
"-*************, " "-*************, "
}; };

View File

@ -1,43 +1,43 @@
/* XPM */ /* XPM */
static const char *const folder_xpm[] = { static const char *const folder_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 22 1", "16 15 22 1",
"> c #9BACC2", "> c #9BACC2",
". c #547897", ". c #547897",
"1 c #7F99B4", "1 c #7F99B4",
"X c #D1D9E5", "X c #D1D9E5",
"< c #EAEDF3", "< c #EAEDF3",
"+ c #CAD2DC", "+ c #CAD2DC",
"3 c #718BA7", "3 c #718BA7",
"O c #BECAD9", "O c #BECAD9",
"$ c #E1E6EE", "$ c #E1E6EE",
"* c #F5F6F7", "* c #F5F6F7",
", c #8DA0B9", ", c #8DA0B9",
" c None", " c None",
"# c #D6DFE7", "# c #D6DFE7",
"@ c #D2D9E0", "@ c #D2D9E0",
"- c #FAFCFE", "- c #FAFCFE",
"; c #ADBACE", "; c #ADBACE",
"& c #EEF1F3", "& c #EEF1F3",
"= c #F8F9FA", "= c #F8F9FA",
"o c #B3BFD1", "o c #B3BFD1",
"2 c #7A90AC", "2 c #7A90AC",
": c #A2B3C5", ": c #A2B3C5",
"% c #E5EAF1", "% c #E5EAF1",
/* pixels */ /* pixels */
" ", " ",
" ..... ", " ..... ",
" .XXXX. ", " .XXXX. ",
" ............. ", " ............. ",
" .oO+@#$%&*=-. ", " .oO+@#$%&*=-. ",
" .oO+@#$%&*=-. ", " .oO+@#$%&*=-. ",
" .;oO+X#$%&*=. ", " .;oO+X#$%&*=. ",
" .:;oO+X#$%&*. ", " .:;oO+X#$%&*. ",
" .>:;oO+X#$%&. ", " .>:;oO+X#$%&. ",
" .,>:;oO+X#$<. ", " .,>:;oO+X#$<. ",
" .1,>:;oO+X#$. ", " .1,>:;oO+X#$. ",
" .21,>:;oO+X#. ", " .21,>:;oO+X#. ",
" .321,>:;oO+X. ", " .321,>:;oO+X. ",
" ............. ", " ............. ",
" " " "
}; };

View File

@ -1,52 +1,52 @@
/* XPM */ /* XPM */
static const char *const folder_open_xpm[] = { static const char *const folder_open_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 31 1", "16 15 31 1",
"6 c #9BACC2", "6 c #9BACC2",
"w c #547B99", "w c #547B99",
"5 c #94A5BD", "5 c #94A5BD",
". c #376485", ". c #376485",
"; c #F1F4F7", "; c #F1F4F7",
"o c #7F99B4", "o c #7F99B4",
"2 c #D1D9E5", "2 c #D1D9E5",
"- c #EAEDF3", "- c #EAEDF3",
"O c #718BA7", "O c #718BA7",
"0 c #65839D", "0 c #65839D",
"* c #DCE2EA", "* c #DCE2EA",
": c #F5F6F7", ": c #F5F6F7",
"7 c #597B9A", "7 c #597B9A",
"X c #8DA0B9", "X c #8DA0B9",
" c None", " c None",
"+ c #467291", "+ c #467291",
"q c #305F81", "q c #305F81",
"& c #D6DFE7", "& c #D6DFE7",
"3 c #6A89A2", "3 c #6A89A2",
"1 c #A8B6CA", "1 c #A8B6CA",
"= c #E4E9ED", "= c #E4E9ED",
"> c #F8F9FA", "> c #F8F9FA",
", c #FDFDFE", ", c #FDFDFE",
"9 c #215579", "9 c #215579",
"8 c #7F97B0", "8 c #7F97B0",
"@ c #B3BFD1", "@ c #B3BFD1",
"< c #7A90AC", "< c #7A90AC",
"$ c #C2CBDB", "$ c #C2CBDB",
"4 c #A2B3C5", "4 c #A2B3C5",
"% c #CAD6E1", "% c #CAD6E1",
"# c #BBC4D6", "# c #BBC4D6",
/* pixels */ /* pixels */
" ", " ",
"..... ", "..... ",
".XXXo. ", ".XXXo. ",
".XXXXO........ ", ".XXXXO........ ",
".XXXXXXXXXXXX. ", ".XXXXXXXXXXXX. ",
".XXXXXXXXXXXX. ", ".XXXXXXXXXXXX. ",
".X++++++++++++++", ".X++++++++++++++",
".X+@#$%&*=-;:>,+", ".X+@#$%&*=-;:>,+",
".<.1@#$%2*=-;:23", ".<.1@#$%2*=-;:23",
"..X41@#$%2*=-;3 ", "..X41@#$%2*=-;3 ",
"..X561@#$%2*=-3 ", "..X561@#$%2*=-3 ",
".78X561@#$%2*%3 ", ".78X561@#$%2*%3 ",
"90<8X561@#$%23 ", "90<8X561@#$%23 ",
"q++++++++++++w ", "q++++++++++++w ",
" " " "
}; };

View File

@ -1,21 +1,21 @@
/* XPM */ /* XPM */
static const char *const forward_xpm[] = { static const char *const forward_xpm[] = {
"16 15 3 1", "16 15 3 1",
" c None", " c None",
". c Black", ". c Black",
"X c Gray100", "X c Gray100",
" ", " ",
" ", " ",
" . ", " . ",
" .. ", " .. ",
" .X. ", " .X. ",
" ........XX. ", " ........XX. ",
" .XXXXXXXXXX. ", " .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ", " .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ", " .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ", " .XXXXXXXXXX. ",
" ........XX. ", " ........XX. ",
" .X. ", " .X. ",
" .. ", " .. ",
" . ", " . ",
" "}; " "};

70
Externals/wxWidgets3/art/fullscreen.xpm vendored Normal file
View File

@ -0,0 +1,70 @@
/* 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>",
":>>>>>>>>>>>>>> "
};

View File

@ -1,58 +1,58 @@
/* XPM */ /* XPM */
static const char *const error_xpm[] = { static const char *const error_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 4 1", "48 48 4 1",
" c None", " c None",
"X c #242424", "X c #242424",
"o c #DCDF00", "o c #DCDF00",
". c #C00000", ". c #C00000",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ..... ", " ..... ",
" ............. ", " ............. ",
" ................. ", " ................. ",
" ................... ", " ................... ",
" ....................... ", " ....................... ",
" ......................... ", " ......................... ",
" ........................... ", " ........................... ",
" ...........................X ", " ...........................X ",
" .............................X ", " .............................X ",
" ............................... ", " ............................... ",
" ...............................X ", " ...............................X ",
" .................................X ", " .................................X ",
" .................................X ", " .................................X ",
" .................................XX ", " .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ", " ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ", " ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ", " ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ", " ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ", " ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ", " ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ", " ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ", " ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ", " .................................XX ",
" .................................XX ", " .................................XX ",
" ...............................XXX ", " ...............................XXX ",
" ...............................XXX ", " ...............................XXX ",
" .............................XXX ", " .............................XXX ",
" ...........................XXXX ", " ...........................XXXX ",
" ...........................XXX ", " ...........................XXX ",
" .........................XXX ", " .........................XXX ",
" .......................XXXX ", " .......................XXXX ",
" X...................XXXXX ", " X...................XXXXX ",
" X.................XXXXX ", " X.................XXXXX ",
" X.............XXXXX ", " X.............XXXXX ",
" XXXX.....XXXXXXXX ", " XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ", " XXXXXXXXXXXXX ",
" XXXXX ", " XXXXX ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,63 +1,63 @@
/* XPM */ /* XPM */
static const char *const info_xpm[] = { static const char *const info_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 9 1", "48 48 9 1",
"$ c Black", "$ c Black",
"O c #FFFFFF", "O c #FFFFFF",
"@ c #808080", "@ c #808080",
"+ c #000080", "+ c #000080",
"o c #E8EB01", "o c #E8EB01",
" c None", " c None",
"X c #FFFF40", "X c #FFFF40",
"# c #C0C0C0", "# c #C0C0C0",
". c #ABAD01", ". c #ABAD01",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ..... ", " ..... ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ..XXXXXXXXo.. ", " ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ", " .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ", " .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ", " .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ", " .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ", " .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ", " .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ", " .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ", " .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ", " .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ", " .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ", " .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ", " .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ", " .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ", " .XXXX+++XXoo. ",
" .XXXXXXXXo. ", " .XXXXXXXXo. ",
" ..XXXXXXo.. ", " ..XXXXXXo.. ",
" .XXXXXo.. ", " .XXXXXo.. ",
" @#######@ ", " @#######@ ",
" @@@@@@@@@ ", " @@@@@@@@@ ",
" @#######@ ", " @#######@ ",
" @@@@@@@@@ ", " @@@@@@@@@ ",
" @#######@ ", " @#######@ ",
" @@@@@@@ ", " @@@@@@@ ",
" ### ", " ### ",
" $$$ ", " $$$ ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,75 +1,75 @@
/* XPM */ /* XPM */
static const char *const question_xpm[] = { static const char *const question_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 21 1", "48 48 21 1",
". c Black", ". c Black",
"> c #696969", "> c #696969",
"O c #1F1F00", "O c #1F1F00",
"+ c #181818", "+ c #181818",
"o c #F6F900", "o c #F6F900",
"; c #3F3F00", "; c #3F3F00",
"$ c #111111", "$ c #111111",
" c None", " c None",
"& c #202020", "& c #202020",
"X c #AAAA00", "X c #AAAA00",
"@ c #949400", "@ c #949400",
": c #303030", ": c #303030",
"1 c #383838", "1 c #383838",
"% c #2A2A00", "% c #2A2A00",
", c #404040", ", c #404040",
"= c #B4B400", "= c #B4B400",
"- c #484848", "- c #484848",
"# c #151500", "# c #151500",
"< c #9F9F00", "< c #9F9F00",
"2 c #6A6A00", "2 c #6A6A00",
"* c #353500", "* c #353500",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ......... ", " ......... ",
" ...XXXXXXX.. ", " ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ", " ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ", " ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ", " ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ", " $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ", " &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ", " .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ", " $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ", " .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ", " .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ", " ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ", " ........ >.XoooooX;. ",
" +.XoooooX.. ", " +.XoooooX.. ",
" ,.Xoooooo<.. ", " ,.Xoooooo<.. ",
" 1#XooooooXO.. ", " 1#XooooooXO.. ",
" &#XooooooX2.. ", " &#XooooooX2.. ",
" $%XooooooXX.. ", " $%XooooooXX.. ",
" $%XooooooXX.. ", " $%XooooooXX.. ",
" $%XooooooXX.. ", " $%XooooooXX.. ",
" &.XooooooXX.. ", " &.XooooooXX.. ",
" .XooooooXX.. ", " .XooooooXX.. ",
" &.XoooooXX.. ", " &.XoooooXX.. ",
" ..XooooXX.. ", " ..XooooXX.. ",
" ..XooooX... ", " ..XooooX... ",
" ..XXooXX..& ", " ..XXooXX..& ",
" ...XXXXX.. ", " ...XXXXX.. ",
" ........ ", " ........ ",
" ", " ",
" ", " ",
" ....... ", " ....... ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ..XXoooXX.. ", " ..XXoooXX.. ",
" ..XoooooX.. ", " ..XoooooX.. ",
" ..XoooooX.. ", " ..XoooooX.. ",
" ..XXoooXX.. ", " ..XXoooXX.. ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ....... ", " ....... ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,63 +1,63 @@
/* XPM */ /* XPM */
static const char *const warning_xpm[] = { static const char *const warning_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 9 1", "48 48 9 1",
"@ c Black", "@ c Black",
"o c #A6A800", "o c #A6A800",
"+ c #8A8C00", "+ c #8A8C00",
"$ c #B8BA00", "$ c #B8BA00",
" c None", " c None",
"O c #6E7000", "O c #6E7000",
"X c #DCDF00", "X c #DCDF00",
". c #C00000", ". c #C00000",
"# c #373800", "# c #373800",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" . ", " . ",
" ... ", " ... ",
" ... ", " ... ",
" ..... ", " ..... ",
" ...X.. ", " ...X.. ",
" ..XXX.. ", " ..XXX.. ",
" ...XXX... ", " ...XXX... ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ..XXXXXX... ", " ..XXXXXX... ",
" ...XXoO+XX.. ", " ...XXoO+XX.. ",
" ..XXXO@#XXX.. ", " ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ", " ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ", " ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ", " ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ", " ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ", " ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ", " ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ", " ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ", " ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ", " ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ", " ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ", " ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ", " ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ", " ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ", " .............................. ",
" .............................. ", " .............................. ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,60 +1,60 @@
/* XPM */ /* XPM */
static const char *const harddisk_xpm[] = { static const char *const harddisk_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 39 1", "16 15 39 1",
"7 c #E3E4E6", "7 c #E3E4E6",
"4 c #FFFFFF", "4 c #FFFFFF",
"5 c #839CB5", "5 c #839CB5",
". c #547897", ". c #547897",
"1 c #4D7492", "1 c #4D7492",
"@ c #376485", "@ c #376485",
"o c #7A92A3", "o c #7A92A3",
"u c #D1D9E5", "u c #D1D9E5",
"y c #446A8C", "y c #446A8C",
"i c #51B03D", "i c #51B03D",
"> c #CAD2DC", "> c #CAD2DC",
"O c #718BA7", "O c #718BA7",
"2 c #65839D", "2 c #65839D",
"6 c #DCE2EA", "6 c #DCE2EA",
"0 c #C3C5C8", "0 c #C3C5C8",
"9 c #F5F6F7", "9 c #F5F6F7",
": c #EBEBEC", ": c #EBEBEC",
"< c #597B9A", "< c #597B9A",
"t c #C6CCD3", "t c #C6CCD3",
" c None", " c None",
"* c #DFE0E2", "* c #DFE0E2",
"e c #467291", "e c #467291",
"a c #526E8B", "a c #526E8B",
", c #7393AB", ", c #7393AB",
"p c #130A0B", "p c #130A0B",
"# c #AABFCD", "# c #AABFCD",
"r c #B4C4D3", "r c #B4C4D3",
"; c #CFCFD0", "; c #CFCFD0",
"X c #6F90A6", "X c #6F90A6",
"+ c #6A89A2", "+ c #6A89A2",
"- c #D2D3D4", "- c #D2D3D4",
"= c #DCDBDA", "= c #DCDBDA",
"w c #E4E9ED", "w c #E4E9ED",
"q c #C6C8CA", "q c #C6C8CA",
"% c #215579", "% c #215579",
"$ c #E7E7E7", "$ c #E7E7E7",
"3 c #7F97B0", "3 c #7F97B0",
"8 c #C0D1DC", "8 c #C0D1DC",
"& c #5D7C93", "& c #5D7C93",
/* pixels */ /* pixels */
" ", " ",
" .XoooXO+@ ", " .XoooXO+@ ",
" #$$%%%%$$$X ", " #$$%%%%$$$X ",
" &$*==-;$$$& ", " &$*==-;$$$& ",
" &:>+,<1234o5 ", " &:>+,<1234o5 ",
" ###+67;;78242 ", " ###+67;;78242 ",
" &4,49*0q*9we4. ", " &4,49*0q*9we4. ",
" &4+49*,,*9wo4. ", " &4+49*,,*9wo4. ",
"&4%r,67;;782t%4.", "&4%r,67;;782t%4.",
"&44468rrrr84444,", "&44468rrrr84444,",
"y11111111111111e", "y11111111111111e",
"1uu1:::::::::::1", "1uu1:::::::::::1",
"1uu1::::::::ip:1", "1uu1::::::::ip:1",
"auu&:::::::::::1", "auu&:::::::::::1",
"1111111111111111" "1111111111111111"
}; };

View File

@ -1,44 +1,44 @@
/* XPM */ /* XPM */
static const char *const helpicon_xpm[] = { static const char *const helpicon_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 6 1", "32 32 6 1",
" c Gray0", " c Gray0",
". c Blue", ". c Blue",
"X c #808080808080", "X c #808080808080",
"o c #c0c0c0c0c0c0", "o c #c0c0c0c0c0c0",
"O c Gray100", "O c Gray100",
"+ c None", "+ c None",
/* pixels */ /* pixels */
"+++++++++++XXXXXXXX+++++++++++++", "+++++++++++XXXXXXXX+++++++++++++",
"++++++++XXXoOOOOOOoXXX++++++++++", "++++++++XXXoOOOOOOoXXX++++++++++",
"++++++XXoOOOOOOOOOOOOoXX++++++++", "++++++XXoOOOOOOOOOOOOoXX++++++++",
"+++++XoOOOOOOOOOOOOOOOOoX+++++++", "+++++XoOOOOOOOOOOOOOOOOoX+++++++",
"++++XOOOOOOOOOOOOOOOOOOOO ++++++", "++++XOOOOOOOOOOOOOOOOOOOO ++++++",
"+++XOOOOOOOo......oOOOOOOO +++++", "+++XOOOOOOOo......oOOOOOOO +++++",
"++XOOOOOOOo.oOO....oOOOOOOO ++++", "++XOOOOOOOo.oOO....oOOOOOOO ++++",
"+XoOOOOOOO..OOOO....OOOOOOOo +++", "+XoOOOOOOO..OOOO....OOOOOOOo +++",
"+XOOOOOOOO....OO....OOOOOOOO X++", "+XOOOOOOOO....OO....OOOOOOOO X++",
"XoOOOOOOOO....Oo....OOOOOOOOo X+", "XoOOOOOOOO....Oo....OOOOOOOOo X+",
"XOOOOOOOOOo..oO....OOOOOOOOOO X+", "XOOOOOOOOOo..oO....OOOOOOOOOO X+",
"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX", "XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX", "XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX", "XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX", "XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX", "XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX", "+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
"+XoOOOOOOOOOO....OOOOOOOOOOo XXX", "+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
"++XOOOOOOOOOO....OOOOOOOOOO XXX+", "++XOOOOOOOOOO....OOOOOOOOOO XXX+",
"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+", "+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
"++++ OOOOOOOOOOOOOOOOOOOO XXXX++", "++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
"+++++ oOOOOOOOOOOOOOOOOo XXXX+++", "+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
"++++++ oOOOOOOOOOOOOo XXXX++++", "++++++ oOOOOOOOOOOOOo XXXX++++",
"+++++++X oOOOOOOo XXXXX+++++", "+++++++X oOOOOOOo XXXXX+++++",
"++++++++XXX oOOO XXXXXXX++++++", "++++++++XXX oOOO XXXXXXX++++++",
"++++++++++XXXX OOO XXXXX++++++++", "++++++++++XXXX OOO XXXXX++++++++",
"+++++++++++++X OOO XX+++++++++++", "+++++++++++++X OOO XX+++++++++++",
"+++++++++++++++ OO XX+++++++++++", "+++++++++++++++ OO XX+++++++++++",
"++++++++++++++++ O XX+++++++++++", "++++++++++++++++ O XX+++++++++++",
"+++++++++++++++++ XX+++++++++++", "+++++++++++++++++ XX+++++++++++",
"++++++++++++++++++XXX+++++++++++", "++++++++++++++++++XXX+++++++++++",
"+++++++++++++++++++XX+++++++++++" "+++++++++++++++++++XX+++++++++++"
}; };

View File

@ -1,24 +1,24 @@
/* XPM */ /* XPM */
static const char *const home_xpm[] = { static const char *const home_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 3 1", "16 15 3 1",
". c Black", ". c Black",
"X c #FFFFFF", "X c #FFFFFF",
" c None", " c None",
/* pixels */ /* pixels */
" .... ", " .... ",
" .XXXX. ", " .XXXX. ",
" .XXXXXX. ", " .XXXXXX. ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" .XXXXXXXXXX. ", " .XXXXXXXXXX. ",
" .............. ", " .............. ",
" .XXXXXXXXXXXX. ", " .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ", " .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ", " .XXXXXXXXXXXX. ",
" .X.....X....X. ", " .X.....X....X. ",
" .X. .X. .X. ", " .X. .X. .X. ",
" .X. .X. .X. ", " .X. .X. .X. ",
" .X.....X. .X. ", " .X.....X. .X. ",
" .XXXXXXX. .X. ", " .XXXXXXX. .X. ",
" ......... ... " " ......... ... "
}; };

View File

@ -1,25 +1,25 @@
/* XPM */ /* XPM */
static const char *const htmbook_xpm[] = { static const char *const htmbook_xpm[] = {
"16 16 6 1", "16 16 6 1",
" c None", " c None",
". c Black", ". c Black",
"X c #000080", "X c #000080",
"o c #c0c0c0", "o c #c0c0c0",
"O c #808080", "O c #808080",
"+ c Gray100", "+ c Gray100",
" ", " ",
" .. ", " .. ",
" ..XX. ", " ..XX. ",
" ..XXXXX. ", " ..XXXXX. ",
" ..XXXXXXXX. ", " ..XXXXXXXX. ",
".oXXXXXXXXXX. ", ".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ", ".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ", ".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..", ".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ", ".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ", " .XXXXoXXX..O+O ",
" .XXXXo..O++o..", " .XXXXo..O++o..",
" .XXX.O+++o.. ", " .XXX.O+++o.. ",
" .XX.o+o.. ", " .XX.o+o.. ",
" .X.o.. ", " .X.o.. ",
" ... "}; " ... "};

View File

@ -1,25 +1,25 @@
/* XPM */ /* XPM */
static const char *const htmfoldr_xpm[] = { static const char *const htmfoldr_xpm[] = {
"16 16 6 1", "16 16 6 1",
" c None", " c None",
". c Black", ". c Black",
"X c #000080", "X c #000080",
"o c #c0c0c0", "o c #c0c0c0",
"O c #808080", "O c #808080",
"+ c Gray100", "+ c Gray100",
" ", " ",
" .. ", " .. ",
" ..XX. ", " ..XX. ",
" ..XXXXX. ", " ..XXXXX. ",
" ..XXXXXXXX. ", " ..XXXXXXXX. ",
".oXXXXXXXXXX. ", ".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ", ".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ", ".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..", ".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ", ".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ", " .XXXXoXXX..O+O ",
" .XXXXo..O++o..", " .XXXXo..O++o..",
" .XXX.O+++o.. ", " .XXX.O+++o.. ",
" .XX.o+o.. ", " .XX.o+o.. ",
" .X.o.. ", " .X.o.. ",
" ... "}; " ... "};

View File

@ -1,20 +1,20 @@
/* XPM */ /* XPM */
static const char *const htmoptns_xpm[] = { static const char *const htmoptns_xpm[] = {
"16 15 2 1", "16 15 2 1",
" c None", " c None",
". c #000000", ". c #000000",
" ", " ",
" .. ", " .. ",
" ... ", " ... ",
" .... ", " .... ",
" . ... ", " . ... ",
" .. ... ", " .. ... ",
" . .. ", " . .. ",
" .. ... ", " .. ... ",
" . .. ", " . .. ",
" ......... ", " ......... ",
" .. ... ", " .. ... ",
" . ... ", " . ... ",
" .. ... ", " .. ... ",
" .... ....... ", " .... ....... ",
" "}; " "};

View File

@ -1,23 +1,23 @@
/* XPM */ /* XPM */
static const char *const htmpage_xpm[] = { static const char *const htmpage_xpm[] = {
"16 16 4 1", "16 16 4 1",
" c None", " c None",
". c #808080", ". c #808080",
"X c Gray100", "X c Gray100",
"o c Black", "o c Black",
" ", " ",
" .......... ", " .......... ",
" .XXXXXXXX.. ", " .XXXXXXXX.. ",
" .XXXXXXXXooo ", " .XXXXXXXXooo ",
" .X......XXXo ", " .X......XXXo ",
" .XXXXXXXXXXo ", " .XXXXXXXXXXo ",
" .X........Xo ", " .X........Xo ",
" .XXXXXXXXXXo ", " .XXXXXXXXXXo ",
" .X........Xo ", " .X........Xo ",
" .XXXXXXXXXXo ", " .XXXXXXXXXXo ",
" .X........Xo ", " .X........Xo ",
" .XXXXXXXXXXo ", " .XXXXXXXXXXo ",
" .X........Xo ", " .X........Xo ",
" .XXXXXXXXXXo ", " .XXXXXXXXXXo ",
" .XXXXXXXXXXo ", " .XXXXXXXXXXo ",
" oooooooooooo "}; " oooooooooooo "};

View File

@ -1,27 +1,27 @@
/* XPM */ /* XPM */
static const char *const htmsidep_xpm[] = { static const char *const htmsidep_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 6 1", "16 15 6 1",
". c Black", ". c Black",
"X c #FFFFFF", "X c #FFFFFF",
"+ c #808080", "+ c #808080",
" c None", " c None",
"O c #0000C0", "O c #0000C0",
"o c #C0C0C0", "o c #C0C0C0",
/* pixels */ /* pixels */
" ", " ",
" .............. ", " .............. ",
" .XXXX.ooooooo. ", " .XXXX.ooooooo. ",
" .XOXX.oo...oo. ", " .XOXX.oo...oo. ",
" .XXOX.ooooooo. ", " .XXOX.ooooooo. ",
" .OOOO.o...+.o. ", " .OOOO.o...+.o. ",
" .XXOX.ooooooo. ", " .XXOX.ooooooo. ",
" .XOXX.ooooooo. ", " .XOXX.ooooooo. ",
" .XXXX.o..+ooo. ", " .XXXX.o..+ooo. ",
" .XXOX.ooooooo. ", " .XXOX.ooooooo. ",
" .XOXX.o...+.o. ", " .XOXX.o...+.o. ",
" .OOOO.ooooooo. ", " .OOOO.ooooooo. ",
" .XOXX.o.+...o. ", " .XOXX.o.+...o. ",
" .XXOX.ooooooo. ", " .XXOX.ooooooo. ",
" .............. " " .............. "
}; };

View File

@ -1,25 +1,25 @@
/* XPM */ /* XPM */
static const char *const listview_xpm[] = { static const char *const listview_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 4 1", "16 15 4 1",
" c Black", " c Black",
". c #FFFFFF", ". c #FFFFFF",
"X c #000084", "X c #000084",
"o c #848484", "o c #848484",
/* pixels */ /* pixels */
" ", " ",
" .............. ", " .............. ",
" .XXX.......... ", " .XXX.......... ",
" .XXX. o o . ", " .XXX. o o . ",
" .XXX.......... ", " .XXX.......... ",
" .............. ", " .............. ",
" .XXX.......... ", " .XXX.......... ",
" .XXX. o . ", " .XXX. o . ",
" .XXX.......... ", " .XXX.......... ",
" .............. ", " .............. ",
" .XXX.......... ", " .XXX.......... ",
" .XXX. o o . ", " .XXX. o o . ",
" .XXX.......... ", " .XXX.......... ",
" .............. ", " .............. ",
" " " "
}; };

View File

@ -1,43 +1,43 @@
/* XPM */ /* XPM */
static const char *const missimg_xpm[] = { static const char *const missimg_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 5 1", "32 32 5 1",
"X c Black", "X c Black",
"o c #FFFFFF", "o c #FFFFFF",
" c None", " c None",
". c #C0C0C0", ". c #C0C0C0",
"O c #E0E0E0", "O c #E0E0E0",
/* pixels */ /* pixels */
" .............................X ", " .............................X ",
" .ooooooooooooooooooooooooooooX ", " .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ", " .ooooooooooooooooooooooooooooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ", " XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
" XXXXX XOOOOOOOOOOOOOOooX ", " XXXXX XOOOOOOOOOOOOOOooX ",
" XOOOXXXOOOOOOOooX ", " XOOOXXXOOOOOOOooX ",
" XXX XXOOOOOooX ", " XXX XXOOOOOooX ",
" XOOOOooX ", " XOOOOooX ",
" . XOOOooX ", " . XOOOooX ",
" .. XXOooX ", " .. XXOooX ",
" .o.. XooX ", " .o.. XooX ",
" .ooO... XXX ", " .ooO... XXX ",
" .ooOOOO.......... ", " .ooOOOO.......... ",
" .ooOOOOOOOOOOOOOO.. ", " .ooOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOO.. ", " .ooOOOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOOOO......... ", " .ooOOOOOOOOOOOOOOOOOO......... ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ", " .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooooooooooooooooooooooooooooX ", " .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ", " .ooooooooooooooooooooooooooooX ",
" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
}; };

View File

@ -1,58 +1,58 @@
/* XPM */ /* XPM */
static const char *const error_xpm[] = { static const char *const error_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 4 1", "48 48 4 1",
" c None", " c None",
"X c #242424", "X c #242424",
"o c #DCDF00", "o c #DCDF00",
". c #C00000", ". c #C00000",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ..... ", " ..... ",
" ............. ", " ............. ",
" ................. ", " ................. ",
" ................... ", " ................... ",
" ....................... ", " ....................... ",
" ......................... ", " ......................... ",
" ........................... ", " ........................... ",
" ...........................X ", " ...........................X ",
" .............................X ", " .............................X ",
" ............................... ", " ............................... ",
" ...............................X ", " ...............................X ",
" .................................X ", " .................................X ",
" .................................X ", " .................................X ",
" .................................XX ", " .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ", " ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ", " ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ", " ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ", " ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ", " ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ", " ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ", " ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ", " ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ", " .................................XX ",
" .................................XX ", " .................................XX ",
" ...............................XXX ", " ...............................XXX ",
" ...............................XXX ", " ...............................XXX ",
" .............................XXX ", " .............................XXX ",
" ...........................XXXX ", " ...........................XXXX ",
" ...........................XXX ", " ...........................XXX ",
" .........................XXX ", " .........................XXX ",
" .......................XXXX ", " .......................XXXX ",
" X...................XXXXX ", " X...................XXXXX ",
" X.................XXXXX ", " X.................XXXXX ",
" X.............XXXXX ", " X.............XXXXX ",
" XXXX.....XXXXXXXX ", " XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ", " XXXXXXXXXXXXX ",
" XXXXX ", " XXXXX ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,63 +1,63 @@
/* XPM */ /* XPM */
static const char *const info_xpm[] = { static const char *const info_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 9 1", "48 48 9 1",
"$ c Black", "$ c Black",
"O c #FFFFFF", "O c #FFFFFF",
"@ c #808080", "@ c #808080",
"+ c #000080", "+ c #000080",
"o c #E8EB01", "o c #E8EB01",
" c None", " c None",
"X c #FFFF40", "X c #FFFF40",
"# c #C0C0C0", "# c #C0C0C0",
". c #ABAD01", ". c #ABAD01",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ..... ", " ..... ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ..XXXXXXXXo.. ", " ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ", " .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ", " .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ", " .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ", " .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ", " .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ", " .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ", " .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ", " .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ", " .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ", " .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ", " .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ", " .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ", " .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ", " .XXXX+++XXoo. ",
" .XXXXXXXXo. ", " .XXXXXXXXo. ",
" ..XXXXXXo.. ", " ..XXXXXXo.. ",
" .XXXXXo.. ", " .XXXXXo.. ",
" @#######@ ", " @#######@ ",
" @@@@@@@@@ ", " @@@@@@@@@ ",
" @#######@ ", " @#######@ ",
" @@@@@@@@@ ", " @@@@@@@@@ ",
" @#######@ ", " @#######@ ",
" @@@@@@@ ", " @@@@@@@ ",
" ### ", " ### ",
" $$$ ", " $$$ ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,75 +1,75 @@
/* XPM */ /* XPM */
static const char *const question_xpm[] = { static const char *const question_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 21 1", "48 48 21 1",
". c Black", ". c Black",
"> c #696969", "> c #696969",
"O c #1F1F00", "O c #1F1F00",
"+ c #181818", "+ c #181818",
"o c #F6F900", "o c #F6F900",
"; c #3F3F00", "; c #3F3F00",
"$ c #111111", "$ c #111111",
" c None", " c None",
"& c #202020", "& c #202020",
"X c #AAAA00", "X c #AAAA00",
"@ c #949400", "@ c #949400",
": c #303030", ": c #303030",
"1 c #383838", "1 c #383838",
"% c #2A2A00", "% c #2A2A00",
", c #404040", ", c #404040",
"= c #B4B400", "= c #B4B400",
"- c #484848", "- c #484848",
"# c #151500", "# c #151500",
"< c #9F9F00", "< c #9F9F00",
"2 c #6A6A00", "2 c #6A6A00",
"* c #353500", "* c #353500",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ......... ", " ......... ",
" ...XXXXXXX.. ", " ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ", " ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ", " ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ", " ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ", " $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ", " &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ", " .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ", " $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ", " .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ", " .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ", " ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ", " ........ >.XoooooX;. ",
" +.XoooooX.. ", " +.XoooooX.. ",
" ,.Xoooooo<.. ", " ,.Xoooooo<.. ",
" 1#XooooooXO.. ", " 1#XooooooXO.. ",
" &#XooooooX2.. ", " &#XooooooX2.. ",
" $%XooooooXX.. ", " $%XooooooXX.. ",
" $%XooooooXX.. ", " $%XooooooXX.. ",
" $%XooooooXX.. ", " $%XooooooXX.. ",
" &.XooooooXX.. ", " &.XooooooXX.. ",
" .XooooooXX.. ", " .XooooooXX.. ",
" &.XoooooXX.. ", " &.XoooooXX.. ",
" ..XooooXX.. ", " ..XooooXX.. ",
" ..XooooX... ", " ..XooooX... ",
" ..XXooXX..& ", " ..XXooXX..& ",
" ...XXXXX.. ", " ...XXXXX.. ",
" ........ ", " ........ ",
" ", " ",
" ", " ",
" ....... ", " ....... ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ..XXoooXX.. ", " ..XXoooXX.. ",
" ..XoooooX.. ", " ..XoooooX.. ",
" ..XoooooX.. ", " ..XoooooX.. ",
" ..XXoooXX.. ", " ..XXoooXX.. ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ....... ", " ....... ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,63 +1,63 @@
/* XPM */ /* XPM */
static const char *const warning_xpm[] = { static const char *const warning_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"48 48 9 1", "48 48 9 1",
"@ c Black", "@ c Black",
"o c #A6A800", "o c #A6A800",
"+ c #8A8C00", "+ c #8A8C00",
"$ c #B8BA00", "$ c #B8BA00",
" c None", " c None",
"O c #6E7000", "O c #6E7000",
"X c #DCDF00", "X c #DCDF00",
". c #C00000", ". c #C00000",
"# c #373800", "# c #373800",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" . ", " . ",
" ... ", " ... ",
" ... ", " ... ",
" ..... ", " ..... ",
" ...X.. ", " ...X.. ",
" ..XXX.. ", " ..XXX.. ",
" ...XXX... ", " ...XXX... ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ..XXXXXX... ", " ..XXXXXX... ",
" ...XXoO+XX.. ", " ...XXoO+XX.. ",
" ..XXXO@#XXX.. ", " ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ", " ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ", " ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ", " ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ", " ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ", " ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ", " ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ", " ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ", " ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ", " ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ", " ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ", " ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ", " ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ", " ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ", " .............................. ",
" .............................. ", " .............................. ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,50 +1,50 @@
/* XPM */ /* XPM */
static const char *const new_xpm[] = { static const char *const new_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 29 1", "16 15 29 1",
"* c #97C4E7", "* c #97C4E7",
"- c #72A8D2", "- c #72A8D2",
": c #FFFFFF", ": c #FFFFFF",
"9 c #839CB5", "9 c #839CB5",
"o c #6B98B8", "o c #6B98B8",
"X c #5A89A6", "X c #5A89A6",
"# c #3A749C", "# c #3A749C",
", c #D1E5F5", ", c #D1E5F5",
"0 c #85A7BC", "0 c #85A7BC",
"$ c #C3DDF1", "$ c #C3DDF1",
"8 c #749BB4", "8 c #749BB4",
"; c #5F9BC8", "; c #5F9BC8",
" c None", " c None",
"+ c #538DB3", "+ c #538DB3",
"= c #85BBE2", "= c #85BBE2",
"3 c #EFF6FC", "3 c #EFF6FC",
"O c #6591AE", "O c #6591AE",
"5 c #F7FBFD", "5 c #F7FBFD",
"7 c #FAFCFE", "7 c #FAFCFE",
"< c #DAEAF7", "< c #DAEAF7",
"4 c #E9F3FA", "4 c #E9F3FA",
"6 c #FDFDFE", "6 c #FDFDFE",
"1 c #E2EFF8", "1 c #E2EFF8",
". c #8EA9BC", ". c #8EA9BC",
"% c #B6D5EE", "% c #B6D5EE",
"& c #A5CCEA", "& c #A5CCEA",
"> c #ACE95B", "> c #ACE95B",
"2 c #F4F9FD", "2 c #F4F9FD",
"@ c #4581AA", "@ c #4581AA",
/* pixels */ /* pixels */
" .XoOO+@#. ", " .XoOO+@#. ",
" .$$%&*=O-; ", " .$$%&*=O-; ",
" @@@@$%&*O:*o ", " @@@@$%&*O:*o ",
" @>>@$$%&O::*o ", " @>>@$$%&O::*o ",
"@@@>>@@@$%OOoO+ ", "@@@>>@@@$%OOoO+ ",
"@>>>>>>@,$%&*=+ ", "@>>>>>>@,$%&*=+ ",
"@>>>>>>@<,$%&*+ ", "@>>>>>>@<,$%&*+ ",
"@@@>>@@@1<,$%&O ", "@@@>>@@@1<,$%&O ",
" @>>@2341<,$%O ", " @>>@2341<,$%O ",
" @@@@52341<,$o ", " @@@@52341<,$o ",
" .:6752341<,8 ", " .:6752341<,8 ",
" .::6752341<8 ", " .::6752341<8 ",
" .:::67523419 ", " .:::67523419 ",
" .::::6752340 ", " .::::6752340 ",
" ............ " " ............ "
}; };

View File

@ -1,43 +1,43 @@
/* XPM */ /* XPM */
static const char *const new_dir_xpm[] = { static const char *const new_dir_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 22 1", "16 15 22 1",
"X c Black", "X c Black",
"> c #9BACC2", "> c #9BACC2",
"o c #547897", "o c #547897",
"1 c #7F99B4", "1 c #7F99B4",
"O c #D1D9E5", "O c #D1D9E5",
"< c #EAEDF3", "< c #EAEDF3",
"# c #CAD2DC", "# c #CAD2DC",
"3 c #718BA7", "3 c #718BA7",
"@ c #BECAD9", "@ c #BECAD9",
"& c #E1E6EE", "& c #E1E6EE",
"; c #F5F6F7", "; c #F5F6F7",
". c #FFFF00", ". c #FFFF00",
", c #8DA0B9", ", c #8DA0B9",
" c None", " c None",
"% c #D6DFE7", "% c #D6DFE7",
"$ c #D2D9E0", "$ c #D2D9E0",
"- c #ADBACE", "- c #ADBACE",
"= c #EEF1F3", "= c #EEF1F3",
"+ c #B3BFD1", "+ c #B3BFD1",
"2 c #7A90AC", "2 c #7A90AC",
": c #A2B3C5", ": c #A2B3C5",
"* c #E5EAF1", "* c #E5EAF1",
/* pixels */ /* pixels */
" .X .XX.", " .X .XX.",
" ooooo .X.X. ", " ooooo .X.X. ",
" oOOOOo XX...XX", " oOOOOo XX...XX",
" oooooooo.......", " oooooooo.......",
" o+@#$%&*XX...XX", " o+@#$%&*XX...XX",
" o+@#$%&*=.X.X. ", " o+@#$%&*=.X.X. ",
" o-+@#O%&.X;.X .", " o-+@#O%&.X;.X .",
" o:-+@#O%&*=;o ", " o:-+@#O%&*=;o ",
" o>:-+@#O%&*=o ", " o>:-+@#O%&*=o ",
" o,>:-+@#O%&<o ", " o,>:-+@#O%&<o ",
" o1,>:-+@#O%&o ", " o1,>:-+@#O%&o ",
" o21,>:-+@#O%o ", " o21,>:-+@#O%o ",
" o321,>:-+@#Oo ", " o321,>:-+@#Oo ",
" ooooooooooooo ", " ooooooooooooo ",
" " " "
}; };

View File

@ -1,2 +0,0 @@
The files in this directory are the sources which were converted by
misc/scripts/png2c.py and included in src/osx/carbon/renderer.cpp.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 421 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 B

View File

@ -1,46 +1,46 @@
/* XPM */ /* XPM */
static const char *const paste_xpm[] = { static const char *const paste_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 25 1", "16 15 25 1",
"< c #FEECE4", "< c #FEECE4",
"> c #FEE3D7", "> c #FEE3D7",
"O c #FFFFFF", "O c #FFFFFF",
"o c #7B767D", "o c #7B767D",
"% c #F79586", "% c #F79586",
"& c #CAE1F3", "& c #CAE1F3",
"@ c #F08B62", "@ c #F08B62",
"# c #FCCBB8", "# c #FCCBB8",
"- c #FDD8C9", "- c #FDD8C9",
"4 c #FFF8F4", "4 c #FFF8F4",
"5 c #FFF5F0", "5 c #FFF5F0",
" c None", " c None",
"$ c #F8AA8F", "$ c #F8AA8F",
", c #EFF6FC", ", c #EFF6FC",
"1 c #F7FBFD", "1 c #F7FBFD",
"2 c #FAFCFE", "2 c #FAFCFE",
"; c #DAEAF7", "; c #DAEAF7",
": c #E9F3FA", ": c #E9F3FA",
"6 c #FFFAF8", "6 c #FFFAF8",
". c #3C78A6", ". c #3C78A6",
"3 c #FFF1ED", "3 c #FFF1ED",
"X c #9B8687", "X c #9B8687",
"+ c #FBBCA4", "+ c #FBBCA4",
"* c #B6D5EE", "* c #B6D5EE",
"= c #F4F9FD", "= c #F4F9FD",
/* pixels */ /* pixels */
" ...... ", " ...... ",
" .XoOOOOoo. ", " .XoOOOOoo. ",
".+XOOOOOOX@. ", ".+XOOOOOOX@. ",
".+XXXXXXXX@. ", ".+XXXXXXXX@. ",
".#++$$%@..... ", ".#++$$%@..... ",
".##++$$%.&*.=. ", ".##++$$%.&*.=. ",
".-##++$$.;&.==. ", ".-##++$$.;&.==. ",
".--##++$.:;.... ", ".--##++$.:;.... ",
".>--##++.,:;&*. ", ".>--##++.,:;&*. ",
".<>--##+.1,:;&. ", ".<>--##+.1,:;&. ",
".<<>--##.21,:;. ", ".<<>--##.21,:;. ",
".3<<>--#.O21=:. ", ".3<<>--#.O21=:. ",
".45<<>--....... ", ".45<<>--....... ",
".6453<>----. ", ".6453<>----. ",
"............ " "............ "
}; };

View File

@ -1,60 +1,60 @@
/* XPM */ /* XPM */
static const char *const print_xpm[] = { static const char *const print_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 39 1", "16 15 39 1",
"< c #E3E4E6", "< c #E3E4E6",
"+ c #C3C3C4", "+ c #C3C3C4",
"i c #FFFFFF", "i c #FFFFFF",
": c #74879B", ": c #74879B",
"# c #5A89A6", "# c #5A89A6",
"a c #F1F4F7", "a c #F1F4F7",
"r c #5A809C", "r c #5A809C",
"@ c #BDCCD9", "@ c #BDCCD9",
"e c #7A92A4", "e c #7A92A4",
"% c #3F6F93", "% c #3F6F93",
"t c #9FA2A6", "t c #9FA2A6",
"3 c #939495", "3 c #939495",
"w c #5F666D", "w c #5F666D",
"9 c #65839E", "9 c #65839E",
"5 c #4A7291", "5 c #4A7291",
"$ c #4B7F9E", "$ c #4B7F9E",
" c None", " c None",
"O c #DFE0E2", "O c #DFE0E2",
"o c #F3F3F3", "o c #F3F3F3",
"; c #84A5BB", "; c #84A5BB",
"& c #467291", "& c #467291",
". c #7897AD", ". c #7897AD",
"* c #407598", "* c #407598",
"4 c #CFCFD0", "4 c #CFCFD0",
"7 c #6F90A6", "7 c #6F90A6",
"y c #6A89A2", "y c #6A89A2",
"0 c #AAADB2", "0 c #AAADB2",
"1 c #D2D3D4", "1 c #D2D3D4",
"u c #4F7592", "u c #4F7592",
", c #BCBDBE", ", c #BCBDBE",
"p c #57778E", "p c #57778E",
"q c #979BA0", "q c #979BA0",
"2 c #ABABAC", "2 c #ABABAC",
"- c #E7E7E7", "- c #E7E7E7",
"= c #D6DEE6", "= c #D6DEE6",
"> c #9FA0A0", "> c #9FA0A0",
"8 c #829EB5", "8 c #829EB5",
"X c #8FB0C3", "X c #8FB0C3",
"6 c #5D7C93", "6 c #5D7C93",
/* pixels */ /* pixels */
" .XXXXXXXX ", " .XXXXXXXX ",
" .oooooooX ", " .oooooooX ",
" .OOOOOOOX ", " .OOOOOOOX ",
" .+++++++X ", " .+++++++X ",
"@##$%&&&&&%*##@ ", "@##$%&&&&&%*##@ ",
"$=-;:>,<123$-=$ ", "$=-;:>,<123$-=$ ",
".44.5678.96$44. ", ".44.5678.96$44. ",
"7,,,,,,,,,,,,,7 ", "7,,,,,,,,,,,,,7 ",
"900qwwwwwwwe009 ", "900qwwwwwwwe009 ",
"rtt9ryyyyyyuttr ", "rtt9ryyyyyyuttr ",
"6qq6iiiiiii%qq6 ", "6qq6iiiiiii%qq6 ",
"633paiiiiii%336 ", "633paiiiiii%336 ",
"XXX*iiiiiii%XXX ", "XXX*iiiiiii%XXX ",
" 6iiiiiii% ", " 6iiiiiii% ",
" $XXXXXXX# " " $XXXXXXX# "
}; };

View File

@ -1,90 +1,90 @@
/* XPM */ /* XPM */
static const char *const quit_xpm[] = { static const char *const quit_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 69 1", "16 15 69 1",
"@ c Black", "@ c Black",
"i c #9AEA53", "i c #9AEA53",
"D c #7E9BB1", "D c #7E9BB1",
"H c #839FB4", "H c #839FB4",
", c #B7C7D3", ", c #B7C7D3",
"8 c #BCCBD6", "8 c #BCCBD6",
"7 c #C1CFDA", "7 c #C1CFDA",
"v c #92ABBD", "v c #92ABBD",
"- c #D0DBE2", "- c #D0DBE2",
"O c #547897", "O c #547897",
"+ c #376485", "+ c #376485",
"L c #7090A8", "L c #7090A8",
"t c #AEC0CE", "t c #AEC0CE",
"g c #B3C4D1", "g c #B3C4D1",
"S c #84A0B4", "S c #84A0B4",
"G c #89A4B8", "G c #89A4B8",
"> c #BDCCD7", "> c #BDCCD7",
"F c #5A809C", "F c #5A809C",
"2 c #C2D0DA", "2 c #C2D0DA",
"k c #93ACBE", "k c #93ACBE",
"= c #D6E0E6", "= c #D6E0E6",
"* c #446A8C", "* c #446A8C",
"z c #A5B9C8", "z c #A5B9C8",
"# c #DEE5EB", "# c #DEE5EB",
"0 c #AFC1CE", "0 c #AFC1CE",
"r c #B4C5D2", "r c #B4C5D2",
"p c #B9C9D5", "p c #B9C9D5",
"A c #8AA5B8", "A c #8AA5B8",
"M c #92AABD", "M c #92AABD",
"j c #A6BAC9", "j c #A6BAC9",
"K c #7796AC", "K c #7796AC",
"l c #ABBECC", "l c #ABBECC",
"o c #E4EAEF", "o c #E4EAEF",
"9 c #B5C6D2", "9 c #B5C6D2",
" c None", " c None",
"; c #C9D6DF", "; c #C9D6DF",
"X c #305F81", "X c #305F81",
"m c #98AFC0", "m c #98AFC0",
"V c #9DB3C3", "V c #9DB3C3",
"% c #D1DBE3", "% c #D1DBE3",
"u c #A2B7C6", "u c #A2B7C6",
"y c #A7BBCA", "y c #A7BBCA",
"h c #ACBFCD", "h c #ACBFCD",
"4 c #B6C7D3", "4 c #B6C7D3",
"w c #C0CFD9", "w c #C0CFD9",
"d c #982106", "d c #982106",
"B c #85A0B5", "B c #85A0B5",
"6 c #C8D4DE", "6 c #C8D4DE",
"c c #99B0C1", "c c #99B0C1",
"x c #9EB4C4", "x c #9EB4C4",
"$ c #D7E0E7", "$ c #D7E0E7",
"q c #A8BCCA", "q c #A8BCCA",
"s c #ADC0CD", "s c #ADC0CD",
"3 c #BCCCD7", "3 c #BCCCD7",
"N c #8BA5B9", "N c #8BA5B9",
": c #C4D1DB", ": c #C4D1DB",
"1 c #C9D5DE", "1 c #C9D5DE",
"f c #9AB1C2", "f c #9AB1C2",
"n c #A4B9C8", "n c #A4B9C8",
"a c #B3C5D1", "a c #B3C5D1",
". c #215579", ". c #215579",
"J c #7D9AB0", "J c #7D9AB0",
"& c #829EB5", "& c #829EB5",
"e c #BBCAD6", "e c #BBCAD6",
"b c #8CA6B9", "b c #8CA6B9",
"Z c #91AABC", "Z c #91AABC",
"C c #96AEC0", "C c #96AEC0",
"< c #CFDAE2", "< c #CFDAE2",
"5 c #AFC2CF", "5 c #AFC2CF",
/* pixels */ /* pixels */
" ..XXXXXXXXXX ", " ..XXXXXXXXXX ",
" XoO+X@@@@@@X ", " XoO+X@@@@@@X ",
" X#$%&X*@@@@X ", " X#$%&X*@@@@X ",
" X=-;:>,X@@@X ", " X=-;:>,X@@@X ",
" X<12345X@@@X ", " X<12345X@@@X ",
" X67890qX@XXX ", " X67890qX@XXX ",
" XwertyuX@XiX ", " XwertyuX@XiX ",
" XpasddfX++iiX ", " XpasddfX++iiX ",
" XghjddkXiiiiiX ", " XghjddkXiiiiiX ",
" XlzxcvbXiiiiiiX", " XlzxcvbXiiiiiiX",
" XnxmMNBXiiiiiX ", " XnxmMNBXiiiiiX ",
" XVCZASDXXXiiX ", " XVCZASDXXXiiX ",
" XXFGHJKX XiX ", " XXFGHJKX XiX ",
" FXXFLX XX ", " FXXFLX XX ",
" XX* " " XX* "
}; };

View File

@ -1,58 +1,58 @@
/* XPM */ /* XPM */
static const char *const redo_xpm[] = { static const char *const redo_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 37 1", "16 15 37 1",
"4 c #9BACC2", "4 c #9BACC2",
"; c #4C7398", "; c #4C7398",
"3 c #547B99", "3 c #547B99",
"* c #547897", "* c #547897",
"# c #5A89A6", "# c #5A89A6",
"8 c #3A749C", "8 c #3A749C",
"5 c #5A809C", "5 c #5A809C",
", c #7F99B4", ", c #7F99B4",
"& c #3F6F93", "& c #3F6F93",
"9 c #85A7BC", "9 c #85A7BC",
"+ c #749BB4", "+ c #749BB4",
"> c #718BA7", "> c #718BA7",
"e c #A5B3C8", "e c #A5B3C8",
"w c #BECAD9", "w c #BECAD9",
": c #65839D", ": c #65839D",
"u c #E1E6EE", "u c #E1E6EE",
"o c #236289", "o c #236289",
"r c #ADBED2", "r c #ADBED2",
"= c #597B9A", "= c #597B9A",
"2 c #8DA0B9", "2 c #8DA0B9",
" c None", " c None",
"% c #467291", "% c #467291",
"1 c #7393AB", "1 c #7393AB",
"i c #4C809F", "i c #4C809F",
"- c #A0BACB", "- c #A0BACB",
"O c #6591AE", "O c #6591AE",
"X c #407598", "X c #407598",
"6 c #6F90A6", "6 c #6F90A6",
"t c #D2D9E0", "t c #D2D9E0",
"7 c #ADBACE", "7 c #ADBACE",
"@ c #326A8F", "@ c #326A8F",
"0 c #467A9C", "0 c #467A9C",
". c #ACC4D3", ". c #ACC4D3",
"< c #7F97B0", "< c #7F97B0",
"y c #B3BFD1", "y c #B3BFD1",
"q c #A2B3C5", "q c #A2B3C5",
"$ c #8FB0C3", "$ c #8FB0C3",
/* pixels */ /* pixels */
" .XoooO ", " .XoooO ",
" +o@@@@@o# +", " +o@@@@@o# +",
" $@%%&@&%%&@ +o", " $@%%&@&%%&@ +o",
" X*=@+-+@*=;@#&@", " X*=@+-+@*=;@#&@",
" @:=+ @=:=*:@", " @:=+ @=:=*:@",
" &>:$ @:>>>@", " &>:$ @:>>>@",
" &,<X X>,,,&", " &,<X X>,,,&",
" +123 @<2222&", " +123 @<2222&",
" X44X #@56<44X", " X44X #@56<44X",
" O1748 .9#&o", " O1748 .9#&o",
" 0qwe8 ", " 0qwe8 ",
" 8rty8 ", " 8rty8 ",
" 8wu+ ", " 8wu+ ",
" i## ", " i## ",
" " " "
}; };

View File

@ -1,44 +1,44 @@
/* XPM */ /* XPM */
static const char *const removable_xpm[] = { static const char *const removable_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 23 1", "16 15 23 1",
"@ c #C3C3C4", "@ c #C3C3C4",
"4 c #FFFFFF", "4 c #FFFFFF",
"o c #D5D6D8", "o c #D5D6D8",
"> c #7A92A3", "> c #7A92A3",
". c #8497A5", ". c #8497A5",
"% c #ACAEB2", "% c #ACAEB2",
"2 c #4A7898", "2 c #4A7898",
": c #DCE2EA", ": c #DCE2EA",
", c #F5F6F7", ", c #F5F6F7",
"= c #EBEBEC", "= c #EBEBEC",
"$ c #B7B7B8", "$ c #B7B7B8",
" c None", " c None",
"X c #DFE0E2", "X c #DFE0E2",
"* c #A6A8AD", "* c #A6A8AD",
"1 c #4C809F", "1 c #4C809F",
"3 c #407598", "3 c #407598",
"O c #CFCFD0", "O c #CFCFD0",
"; c #9EA2A8", "; c #9EA2A8",
"# c #BCBDBE", "# c #BCBDBE",
"+ c #C6C8CA", "+ c #C6C8CA",
"- c #979BA0", "- c #979BA0",
"& c #E7E7E7", "& c #E7E7E7",
"< c #8FB0C3", "< c #8FB0C3",
/* pixels */ /* pixels */
" ......... ", " ......... ",
" .XoO+@#$%. ", " .XoO+@#$%. ",
" .XoO+@#$%. ", " .XoO+@#$%. ",
" .&XoO+@#$%*. ", " .&XoO+@#$%*. ",
" .&XoO+@#$%*. ", " .&XoO+@#$%*. ",
" .=&XoO+@#$%*-. ", " .=&XoO+@#$%*-. ",
" .=&XoO+@#$%*;. ", " .=&XoO+@#$%*;. ",
".:=&XoO+@#$%*;>.", ".:=&XoO+@#$%*;>.",
".,=&XoO+@#$%*;-.", ".,=&XoO+@#$%*;-.",
"<..............<", "<..............<",
"<,=&XoO+@#$%%%%.", "<,=&XoO+@#$%%%%.",
"<O1111122233*4*.", "<O1111122233*4*.",
"<OOOOOOOOOOO***.", "<OOOOOOOOOOO***.",
" <<<<<<<<<<<<<< ", " <<<<<<<<<<<<<< ",
" " " "
}; };

View File

@ -1,24 +1,24 @@
/* XPM */ /* XPM */
static const char *const repview_xpm[] = { static const char *const repview_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 3 1", "16 15 3 1",
" c Black", " c Black",
"X c #FFFFFF", "X c #FFFFFF",
". c #C0C0C0", ". c #C0C0C0",
/* pixels */ /* pixels */
" ", " ",
" .............. ", " .............. ",
" . . . . ", " . . . . ",
" .............. ", " .............. ",
" .............. ", " .............. ",
" XXXXXXXXXXXXXX ", " XXXXXXXXXXXXXX ",
" X X X X ", " X X X X ",
" XXXXXXXXXXXXXX ", " XXXXXXXXXXXXXX ",
" X X X X ", " X X X X ",
" XXXXXXXXXXXXXX ", " XXXXXXXXXXXXXX ",
" X X X X ", " X X X X ",
" XXXXXXXXXXXXXX ", " XXXXXXXXXXXXXX ",
" X X X X ", " X X X X ",
" XXXXXXXXXXXXXX ", " XXXXXXXXXXXXXX ",
" " " "
}; };

View File

@ -0,0 +1,206 @@
/* fullscreen.png - 650 bytes */
static const unsigned char full_screen_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x03, 0x10, 0x13, 0x0d, 0x35, 0xe2,
0x77, 0xdf, 0x9a, 0x00, 0x00, 0x00, 0x35, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x28, 0x63, 0x29, 0x20, 0x32,
0x30, 0x30, 0x34, 0x20, 0x4a, 0x61, 0x6b, 0x75,
0x62, 0x20, 0x53, 0x74, 0x65, 0x69, 0x6e, 0x65,
0x72, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74,
0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50,
0x90, 0xd9, 0x8b, 0x6f, 0x00, 0x00, 0x01, 0xd6,
0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x93,
0x3b, 0x68, 0x93, 0x51, 0x14, 0xc7, 0x7f, 0xff,
0x9b, 0x1b, 0x35, 0x15, 0x69, 0xd3, 0x25, 0x48,
0xf1, 0x05, 0x71, 0x08, 0x08, 0x82, 0x20, 0x94,
0x2a, 0x76, 0x2a, 0x14, 0x5f, 0x50, 0xc5, 0xc9,
0xc7, 0xe0, 0xd0, 0xc1, 0x2a, 0xd5, 0xc5, 0x41,
0x70, 0x70, 0x48, 0xf9, 0x9a, 0xe0, 0xa8, 0x60,
0x06, 0xc1, 0x41, 0x50, 0x02, 0xed, 0xe0, 0xb3,
0x56, 0x51, 0x74, 0x50, 0x71, 0x0d, 0x2d, 0x8a,
0x25, 0x2d, 0x16, 0x45, 0x6a, 0x4d, 0x53, 0x15,
0x4d, 0x4c, 0xfb, 0x75, 0xf8, 0x92, 0xd8, 0xbc,
0x1c, 0x72, 0xe0, 0xc0, 0x85, 0x73, 0xcf, 0xef,
0xfe, 0xcf, 0xb9, 0xe7, 0xc8, 0x89, 0x45, 0x6f,
0x00, 0xfd, 0x34, 0x67, 0x09, 0x9c, 0x58, 0xd4,
0x6d, 0xd6, 0x9c, 0x58, 0xd4, 0xb5, 0x25, 0xd4,
0xee, 0xfe, 0xdb, 0x15, 0xe8, 0x27, 0xc3, 0xbd,
0x00, 0x48, 0x06, 0x70, 0xe9, 0xb9, 0xf8, 0xa8,
0x22, 0xfe, 0x2e, 0x71, 0x1c, 0x00, 0x53, 0xad,
0xc9, 0x18, 0xfd, 0x4b, 0x06, 0x24, 0x90, 0xc4,
0xd3, 0xf8, 0x7e, 0x8c, 0x51, 0x4d, 0x0d, 0xa6,
0x3a, 0x79, 0x43, 0xc0, 0xcf, 0x85, 0xeb, 0x6f,
0xbc, 0x97, 0x65, 0x50, 0xd1, 0x4f, 0x39, 0x2f,
0x68, 0x59, 0x6b, 0xb1, 0x3e, 0xd5, 0x07, 0x48,
0x30, 0xe6, 0xf4, 0xb2, 0xb1, 0x3d, 0x40, 0xb8,
0xa3, 0x95, 0x7b, 0xaf, 0x67, 0x90, 0x3c, 0x19,
0x77, 0x9e, 0x7f, 0x64, 0xc7, 0xd6, 0x76, 0x42,
0xc1, 0x00, 0xe3, 0xf1, 0x83, 0xf8, 0x56, 0x29,
0x29, 0xf7, 0x60, 0x3c, 0x76, 0x00, 0x80, 0x6b,
0x83, 0x7b, 0x19, 0x7d, 0x35, 0x4d, 0x28, 0x18,
0xe0, 0xfd, 0xa7, 0x45, 0xac, 0x35, 0x84, 0x3b,
0xda, 0x58, 0x63, 0x7d, 0x5c, 0x3a, 0xb1, 0x0b,
0x17, 0xf1, 0xec, 0xea, 0xa1, 0x5a, 0x80, 0xe4,
0x55, 0x2d, 0xa0, 0x6f, 0xdf, 0x36, 0x26, 0xa6,
0x33, 0x44, 0xb6, 0xb4, 0x61, 0x64, 0xf8, 0x30,
0xbb, 0x40, 0x67, 0x24, 0x5c, 0xbe, 0xe7, 0xae,
0xaa, 0xbc, 0x0c, 0xb0, 0xb6, 0x74, 0xf4, 0x20,
0x7e, 0xbf, 0xc5, 0xfa, 0xfc, 0xc8, 0x88, 0xf5,
0x2d, 0xeb, 0xf0, 0x59, 0x0b, 0x12, 0xc2, 0x05,
0x57, 0xf5, 0x7a, 0x60, 0x90, 0x84, 0x91, 0x21,
0xf1, 0x60, 0x82, 0xb9, 0x85, 0x3f, 0x4c, 0x7d,
0xce, 0x32, 0x3b, 0xf7, 0x93, 0xec, 0xaf, 0x3c,
0x23, 0x2f, 0xa7, 0x8a, 0xbf, 0x62, 0x4a, 0x72,
0x2b, 0x01, 0xdd, 0xe7, 0x47, 0x91, 0x0c, 0xc7,
0xae, 0x3c, 0x66, 0x72, 0x26, 0x43, 0x2a, 0xfd,
0x9d, 0xed, 0x9b, 0x82, 0x6c, 0x0e, 0xb5, 0x92,
0x4a, 0xcf, 0xf3, 0x76, 0xf2, 0x2b, 0x47, 0x2e,
0x3f, 0x04, 0x60, 0xcf, 0xd9, 0x64, 0x2d, 0xc0,
0x75, 0xa1, 0x7b, 0x70, 0x84, 0xcc, 0x8f, 0x1c,
0xe9, 0x2f, 0x8b, 0x9c, 0x3b, 0xba, 0x13, 0x49,
0x48, 0xe2, 0x64, 0x4f, 0x84, 0x54, 0x7a, 0x9e,
0x6f, 0xd9, 0xdf, 0x74, 0x0d, 0x24, 0x1b, 0xcf,
0xc1, 0xb2, 0x0b, 0xb9, 0xbf, 0x4b, 0xdc, 0x77,
0x0e, 0x7b, 0x9d, 0x28, 0x02, 0x24, 0x31, 0x16,
0xef, 0x63, 0x69, 0xd9, 0xfd, 0xff, 0x20, 0x95,
0xac, 0x6b, 0x20, 0x89, 0x31, 0xc2, 0xc8, 0x73,
0x64, 0xe8, 0x3c, 0x73, 0xb7, 0xee, 0x36, 0xd9,
0xea, 0xd9, 0x6e, 0x64, 0x8d, 0xe2, 0xb6, 0x50,
0x28, 0xdc, 0x1c, 0x8e, 0x0f, 0x9d, 0x6e, 0x66,
0x97, 0xf3, 0xb9, 0xfc, 0xad, 0x15, 0x8e, 0xd3,
0xb9, 0x9f, 0x51, 0xdb, 0x23, 0xbd, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};
/* full_screen.png - 949 bytes */
static const unsigned char full_screen_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
0xf8, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
0x9d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5,
0x94, 0x4d, 0x48, 0x54, 0x51, 0x14, 0xc7, 0x7f,
0xe7, 0xcc, 0x94, 0x4c, 0x5a, 0x3a, 0x03, 0x21,
0xe1, 0x47, 0x06, 0x4a, 0x08, 0x42, 0xab, 0x20,
0x2c, 0xd2, 0x8d, 0x20, 0x7d, 0x81, 0x45, 0x6d,
0xa2, 0x16, 0x2d, 0x0c, 0xb2, 0xb0, 0x16, 0x49,
0x10, 0x2d, 0x5a, 0x18, 0xe3, 0x0c, 0x2d, 0x0b,
0x12, 0x0a, 0x5a, 0x04, 0x85, 0x60, 0x8b, 0x3e,
0xcd, 0xa2, 0x68, 0x53, 0xd1, 0x56, 0x92, 0x40,
0x11, 0xed, 0x8b, 0x32, 0xf3, 0x23, 0x25, 0x67,
0x1c, 0xe7, 0xb5, 0x78, 0xf7, 0xbd, 0x79, 0x33,
0xce, 0xe4, 0x04, 0xb6, 0xe8, 0xc0, 0x7d, 0xe7,
0xde, 0x77, 0xef, 0xfb, 0xff, 0xcf, 0x39, 0xf7,
0x7f, 0x1e, 0xfc, 0xef, 0x26, 0xce, 0x24, 0x1c,
0xe9, 0xbc, 0x06, 0xb4, 0xae, 0x10, 0x6e, 0xf7,
0xb9, 0x8e, 0xf3, 0xc7, 0xd3, 0xde, 0x84, 0x23,
0x9d, 0xd6, 0x4a, 0x59, 0x38, 0xd2, 0x69, 0x39,
0xb8, 0xfe, 0x4c, 0xea, 0xad, 0xad, 0xb7, 0xd2,
0xd6, 0x4f, 0xba, 0x9a, 0xb3, 0xe4, 0x2d, 0x08,
0x02, 0x58, 0x34, 0x75, 0x3c, 0x4a, 0xdb, 0x7a,
0xdb, 0x7d, 0x38, 0x6d, 0xad, 0xb9, 0x72, 0x54,
0x15, 0x17, 0x5c, 0xcc, 0x43, 0x10, 0x44, 0x6c,
0x68, 0x11, 0x10, 0x11, 0x9e, 0x46, 0x77, 0xa1,
0x2a, 0xe4, 0xc4, 0xc9, 0x05, 0xbe, 0x36, 0xb0,
0x8a, 0x33, 0x57, 0x5f, 0x23, 0xa2, 0x20, 0x8a,
0xa0, 0xa0, 0x86, 0x40, 0xd4, 0x1d, 0x47, 0xc3,
0x2f, 0x58, 0x53, 0xe0, 0xc7, 0xef, 0x93, 0xfc,
0x08, 0x44, 0xa0, 0x2f, 0xdc, 0xcc, 0x86, 0x50,
0x80, 0xea, 0xb2, 0x62, 0xee, 0xbd, 0x1a, 0xb5,
0xa3, 0x55, 0x50, 0x71, 0x08, 0xec, 0x8c, 0x6e,
0x3f, 0x1f, 0xa2, 0xae, 0x2a, 0x44, 0x69, 0x30,
0x40, 0x7f, 0x74, 0x0f, 0xbe, 0x2c, 0x99, 0x2c,
0x21, 0xe8, 0x8f, 0xec, 0x46, 0x44, 0xb9, 0xd2,
0xbe, 0x83, 0x8a, 0xf5, 0x45, 0x94, 0x06, 0x03,
0xbc, 0xff, 0x30, 0x63, 0x47, 0x8c, 0xd8, 0xf5,
0x17, 0x61, 0xe8, 0xd3, 0x0c, 0xd5, 0x65, 0x25,
0xd4, 0x94, 0x17, 0x73, 0xfd, 0x6c, 0x23, 0x88,
0xf2, 0xec, 0xf2, 0xde, 0xfc, 0x32, 0x10, 0x73,
0x89, 0x2d, 0x3b, 0x37, 0xb1, 0xae, 0xb0, 0x80,
0xda, 0x8d, 0x25, 0x28, 0x02, 0x2a, 0x26, 0x0b,
0x65, 0x73, 0x79, 0x09, 0xc1, 0xa2, 0xd5, 0x1c,
0x6a, 0xac, 0x46, 0x10, 0x54, 0xb0, 0xd3, 0xcc,
0x30, 0xff, 0x52, 0x02, 0xc5, 0x08, 0x04, 0x15,
0xa8, 0xab, 0x0a, 0xd9, 0xac, 0x0e, 0xb9, 0x65,
0x2e, 0x5c, 0x84, 0xcd, 0x95, 0x21, 0x23, 0x02,
0xc1, 0x12, 0x50, 0x8b, 0x7c, 0x08, 0x4c, 0x1d,
0x1d, 0xa7, 0xae, 0x84, 0x10, 0x0b, 0x2c, 0xc3,
0x2f, 0x9e, 0x68, 0x6d, 0x62, 0xc9, 0x2a, 0x99,
0x2c, 0x04, 0x4e, 0x4c, 0xce, 0xc2, 0x72, 0x37,
0xc4, 0xb3, 0xef, 0xac, 0xdd, 0xef, 0x34, 0x75,
0x74, 0x99, 0x3b, 0x70, 0x54, 0x62, 0x03, 0x0c,
0x8e, 0x4d, 0x21, 0xa4, 0x2e, 0x18, 0x51, 0xb7,
0x17, 0xc6, 0xbe, 0xcd, 0xda, 0x73, 0x55, 0x57,
0xbe, 0x79, 0x10, 0xd8, 0x87, 0x55, 0x94, 0xee,
0x07, 0xef, 0x18, 0x9f, 0x9a, 0x67, 0xf8, 0xf3,
0xb4, 0xfb, 0x4e, 0x4c, 0x10, 0x1f, 0xc7, 0x67,
0x99, 0x9e, 0x8b, 0xd3, 0xfb, 0x72, 0x38, 0x55,
0x32, 0xc9, 0x43, 0xa6, 0x0d, 0xa7, 0xef, 0x22,
0xa2, 0x1c, 0xbc, 0xf8, 0x98, 0xc1, 0xd1, 0x49,
0x06, 0x46, 0x7e, 0x50, 0x53, 0x11, 0x74, 0x01,
0x9c, 0x68, 0x2b, 0x4b, 0x8b, 0x19, 0x18, 0x99,
0xe0, 0xcd, 0xe0, 0x57, 0xf6, 0x5f, 0x78, 0x08,
0xc0, 0xf6, 0x93, 0x3d, 0xcb, 0x13, 0x58, 0x16,
0x34, 0xb4, 0xf7, 0x32, 0xf9, 0x33, 0xc6, 0xc8,
0x97, 0x19, 0x4e, 0x1d, 0xd8, 0xe2, 0x96, 0xcd,
0x91, 0xb0, 0xd3, 0x0b, 0x47, 0x9a, 0x6a, 0x19,
0x18, 0x99, 0xe0, 0xfb, 0xf4, 0x2f, 0xea, 0xdb,
0x96, 0x82, 0x67, 0x25, 0x00, 0x48, 0x5a, 0x10,
0x5b, 0x58, 0xe4, 0x7e, 0x78, 0x5f, 0x5a, 0x73,
0x89, 0xa8, 0xa7, 0x9b, 0xed, 0xd1, 0x17, 0x6d,
0x61, 0x31, 0x69, 0x65, 0x83, 0x91, 0x9c, 0x04,
0x8e, 0xd5, 0xb7, 0xf5, 0xa0, 0x4e, 0x73, 0xa1,
0xa9, 0x26, 0x34, 0x44, 0x88, 0xb2, 0xed, 0xc4,
0x9d, 0x5c, 0x9f, 0xfb, 0x20, 0x8b, 0x4c, 0x33,
0x7f, 0xb7, 0xcb, 0xd9, 0x1f, 0xce, 0x4b, 0x1a,
0x41, 0x22, 0x91, 0xb8, 0xd1, 0x15, 0xbd, 0x74,
0xec, 0xaf, 0xd0, 0x73, 0x58, 0x3c, 0x16, 0xbf,
0x99, 0xc6, 0xe2, 0x49, 0x29, 0x00, 0x14, 0x1a,
0xef, 0x37, 0x25, 0xf4, 0x7b, 0xe6, 0xce, 0x00,
0x48, 0x9a, 0xb1, 0x00, 0x24, 0x8c, 0x8f, 0x03,
0xf3, 0xc0, 0x1c, 0x10, 0x03, 0x92, 0x99, 0xc2,
0xf5, 0x02, 0x8a, 0x07, 0x50, 0x3c, 0xde, 0xe7,
0x21, 0xb0, 0x80, 0x45, 0x8f, 0x4f, 0x1a, 0xbf,
0x60, 0xe6, 0xff, 0xde, 0x7e, 0x03, 0x3e, 0xaa,
0xe6, 0xa9, 0x1d, 0x34, 0x13, 0x4f, 0x00, 0x00,
0x00, 0x35, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x28, 0x63,
0x29, 0x20, 0x32, 0x30, 0x30, 0x34, 0x20, 0x4a,
0x61, 0x6b, 0x75, 0x62, 0x20, 0x53, 0x74, 0x65,
0x69, 0x6e, 0x65, 0x72, 0x0a, 0x0a, 0x43, 0x72,
0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69,
0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47,
0x49, 0x4d, 0x50, 0x90, 0xd9, 0x8b, 0x6f, 0x00,
0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64,
0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61,
0x74, 0x65, 0x00, 0x32, 0x30, 0x31, 0x30, 0x2d,
0x30, 0x37, 0x2d, 0x31, 0x35, 0x54, 0x30, 0x30,
0x3a, 0x35, 0x34, 0x3a, 0x31, 0x34, 0x2b, 0x30,
0x32, 0x3a, 0x30, 0x30, 0x27, 0xe8, 0x22, 0xef,
0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74,
0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64,
0x69, 0x66, 0x79, 0x00, 0x32, 0x30, 0x30, 0x36,
0x2d, 0x30, 0x33, 0x2d, 0x31, 0x36, 0x54, 0x32,
0x30, 0x3a, 0x31, 0x36, 0x3a, 0x30, 0x38, 0x2b,
0x30, 0x31, 0x3a, 0x30, 0x30, 0x33, 0x6a, 0x31,
0x01, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};

View File

@ -1,17 +1,17 @@
/* XPM */ /* XPM */
static const char *const tick_xpm[] = { static const char *const tick_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"10 10 2 1", "10 10 2 1",
". c Gray0", ". c Gray0",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" ..", " ..",
" ...", " ...",
" ... ", " ... ",
".. ... ", ".. ... ",
"... ... ", "... ... ",
" ..... ", " ..... ",
" ... ", " ... ",
" . ", " . ",
" "}; " "};

View File

@ -1,47 +1,47 @@
/* XPM */ /* XPM */
static const char *const tipicon_xpm[] = { static const char *const tipicon_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 9 1", "32 32 9 1",
"$ c Black", "$ c Black",
"O c #FFFFFF", "O c #FFFFFF",
"@ c #808080", "@ c #808080",
"+ c #000080", "+ c #000080",
"o c #E8EB01", "o c #E8EB01",
" c None", " c None",
"X c #FFFF40", "X c #FFFF40",
"# c #C0C0C0", "# c #C0C0C0",
". c #ABAD01", ". c #ABAD01",
/* pixels */ /* pixels */
" ", " ",
" ..... ", " ..... ",
" ..XXXXX.. ", " ..XXXXX.. ",
" ..XXXXXXXXo.. ", " ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ", " .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ", " .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ", " .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ", " .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ", " .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ", " .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ", " .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ", " .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ", " .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ", " .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ", " .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ", " .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ", " .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ", " .XXXX+++XXoo. ",
" .XXXXXXXXo. ", " .XXXXXXXXo. ",
" ..XXXXXXo.. ", " ..XXXXXXo.. ",
" .XXXXXo.. ", " .XXXXXo.. ",
" @#######@ ", " @#######@ ",
" @@@@@@@@@ ", " @@@@@@@@@ ",
" @#######@ ", " @#######@ ",
" @@@@@@@@@ ", " @@@@@@@@@ ",
" @#######@ ", " @#######@ ",
" @@@@@@@ ", " @@@@@@@ ",
" ### ", " ### ",
" $$$ ", " $$$ ",
" ", " ",
" ", " ",
" " " "
}; };

View File

@ -1,21 +1,21 @@
/* XPM */ /* XPM */
static const char *const toparent_xpm[] = { static const char *const toparent_xpm[] = {
"16 15 3 1", "16 15 3 1",
" c None", " c None",
". c Black", ". c Black",
"X c Gray100", "X c Gray100",
" ", " ",
" .. ", " .. ",
" .XX. ", " .XX. ",
" .XXXX. ", " .XXXX. ",
" .XXXXXX. ", " .XXXXXX. ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" ....XXXX.... ", " ....XXXX.... ",
" .XXXX. ", " .XXXX. ",
" .XXXX..... ", " .XXXX..... ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" .......... ", " .......... ",
" "}; " "};

View File

@ -1,58 +1,58 @@
/* XPM */ /* XPM */
static const char *const undo_xpm[] = { static const char *const undo_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 15 37 1", "16 15 37 1",
"4 c #9BACC2", "4 c #9BACC2",
"* c #4C7398", "* c #4C7398",
"2 c #547B99", "2 c #547B99",
"- c #547897", "- c #547897",
"@ c #5A89A6", "@ c #5A89A6",
"8 c #3A749C", "8 c #3A749C",
"6 c #5A809C", "6 c #5A809C",
", c #7F99B4", ", c #7F99B4",
"$ c #3F6F93", "$ c #3F6F93",
"7 c #85A7BC", "7 c #85A7BC",
"+ c #749BB4", "+ c #749BB4",
"> c #718BA7", "> c #718BA7",
"0 c #A5B3C8", "0 c #A5B3C8",
"q c #BECAD9", "q c #BECAD9",
": c #65839D", ": c #65839D",
"u c #E1E6EE", "u c #E1E6EE",
"X c #236289", "X c #236289",
"y c #ADBED2", "y c #ADBED2",
"= c #597B9A", "= c #597B9A",
"1 c #8DA0B9", "1 c #8DA0B9",
" c None", " c None",
"% c #467291", "% c #467291",
"3 c #7393AB", "3 c #7393AB",
"i c #4C809F", "i c #4C809F",
"; c #A0BACB", "; c #A0BACB",
". c #6591AE", ". c #6591AE",
"o c #407598", "o c #407598",
"5 c #6F90A6", "5 c #6F90A6",
"t c #D2D9E0", "t c #D2D9E0",
"9 c #ADBACE", "9 c #ADBACE",
"# c #326A8F", "# c #326A8F",
"e c #467A9C", "e c #467A9C",
"O c #ACC4D3", "O c #ACC4D3",
"< c #7F97B0", "< c #7F97B0",
"r c #B3BFD1", "r c #B3BFD1",
"w c #A2B3C5", "w c #A2B3C5",
"& c #8FB0C3", "& c #8FB0C3",
/* pixels */ /* pixels */
" .XXXoO ", " .XXXoO ",
"+ @X#####X+ ", "+ @X#####X+ ",
"X+ #$%%$#$%%#& ", "X+ #$%%$#$%%#& ",
"#$@#*=-#+;+#=-o ", "#$@#*=-#+;+#=-o ",
"#:-=:=# +=:# ", "#:-=:=# +=:# ",
"#>>>:# &:>$ ", "#>>>:# &:>$ ",
"$,,,>o o<,$ ", "$,,,>o o<,$ ",
"$1111<# 213+ ", "$1111<# 213+ ",
"o44<56#@ o44o ", "o44<56#@ o44o ",
"X$@7O 8493. ", "X$@7O 8493. ",
" 80qwe ", " 80qwe ",
" 8rty8 ", " 8rty8 ",
" +uq8 ", " +uq8 ",
" @@i ", " @@i ",
" " " "
}; };

View File

@ -1,21 +1,21 @@
/* XPM */ /* XPM */
static const char *const up_xpm[] = { static const char *const up_xpm[] = {
"16 15 3 1", "16 15 3 1",
" c None", " c None",
". c Black", ". c Black",
"X c Gray100", "X c Gray100",
" ", " ",
" .. ", " .. ",
" .XX. ", " .XX. ",
" .XXXX. ", " .XXXX. ",
" .XXXXXX. ", " .XXXXXX. ",
" .XXXXXXXX. ", " .XXXXXXXX. ",
" ....XXXX.... ", " ....XXXX.... ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" .XXXX. ", " .XXXX. ",
" ...... ", " ...... ",
" "}; " "};

View File

@ -1,161 +1,161 @@
/* XPM */ /* XPM */
static const char *const wxwin16x16_xpm[] = { static const char *const wxwin16x16_xpm[] = {
"16 16 142 2", "16 16 142 2",
" c None", " c None",
". c #7171C0", ". c #7171C0",
"+ c #7D7DC7", "+ c #7D7DC7",
"@ c #8181CE", "@ c #8181CE",
"# c #7979CE", "# c #7979CE",
"$ c #7171CE", "$ c #7171CE",
"% c #6868CD", "% c #6868CD",
"& c #5050C0", "& c #5050C0",
"* c #7C7CCB", "* c #7C7CCB",
"= c #D3D3FC", "= c #D3D3FC",
"- c #C0C0FF", "- c #C0C0FF",
"; c #B1B1FF", "; c #B1B1FF",
"> c #A4A4FF", "> c #A4A4FF",
", c #9696FF", ", c #9696FF",
"' c #6B6BE3", "' c #6B6BE3",
") c #3E3EC0", ") c #3E3EC0",
"! c #7B7BD3", "! c #7B7BD3",
"~ c #CFCFFF", "~ c #CFCFFF",
"{ c #A7A7FF", "{ c #A7A7FF",
"] c #8989FF", "] c #8989FF",
"^ c #7B7BFF", "^ c #7B7BFF",
"/ c #5E5EEB", "/ c #5E5EEB",
"( c #3333BF", "( c #3333BF",
"_ c #6969D3", "_ c #6969D3",
": c #BEBEFF", ": c #BEBEFF",
"< c #8E8EFF", "< c #8E8EFF",
"[ c #5E5EFF", "[ c #5E5EFF",
"} c #4C4CFD", "} c #4C4CFD",
"| c #6464C6", "| c #6464C6",
"1 c #A4A478", "1 c #A4A478",
"2 c #BFBF63", "2 c #BFBF63",
"3 c #BFBF5C", "3 c #BFBF5C",
"4 c #BFBF56", "4 c #BFBF56",
"5 c #BFBF51", "5 c #BFBF51",
"6 c #C17474", "6 c #C17474",
"7 c #BF7070", "7 c #BF7070",
"8 c #BF6969", "8 c #BF6969",
"9 c #BF6363", "9 c #BF6363",
"0 c #544AC7", "0 c #544AC7",
"a c #A8A8FF", "a c #A8A8FF",
"b c #7070FF", "b c #7070FF",
"c c #5050FF", "c c #5050FF",
"d c #3F3FFF", "d c #3F3FFF",
"e c #8C8CBA", "e c #8C8CBA",
"f c #F6F6C8", "f c #F6F6C8",
"g c #FBFBBB", "g c #FBFBBB",
"h c #FBFBAE", "h c #FBFBAE",
"i c #FBFBA1", "i c #FBFBA1",
"j c #F9F993", "j c #F9F993",
"k c #D7D760", "k c #D7D760",
"l c #D28D8D", "l c #D28D8D",
"m c #EEB8B8", "m c #EEB8B8",
"n c #EFAAAA", "n c #EFAAAA",
"o c #EF9E9E", "o c #EF9E9E",
"p c #7C5ABC", "p c #7C5ABC",
"q c #8D8DFF", "q c #8D8DFF",
"r c #4747FF", "r c #4747FF",
"s c #3535FF", "s c #3535FF",
"t c #2B2BFF", "t c #2B2BFF",
"u c #AAAAA7", "u c #AAAAA7",
"v c #FFFFD2", "v c #FFFFD2",
"w c #FFFFA9", "w c #FFFFA9",
"x c #FFFF9A", "x c #FFFF9A",
"y c #FFFF8D", "y c #FFFF8D",
"z c #FFFF80", "z c #FFFF80",
"A c #E4E45B", "A c #E4E45B",
"B c #E39F9F", "B c #E39F9F",
"C c #FFCCCC", "C c #FFCCCC",
"D c #FFA9A9", "D c #FFA9A9",
"E c #FF9C9C", "E c #FF9C9C",
"F c #B469A0", "F c #B469A0",
"G c #3E3DE7", "G c #3E3DE7",
"H c #2828EF", "H c #2828EF",
"I c #1E1EEF", "I c #1E1EEF",
"J c #1515EF", "J c #1515EF",
"K c #A5A595", "K c #A5A595",
"L c #FFFFC2", "L c #FFFFC2",
"M c #FFFF8F", "M c #FFFF8F",
"N c #F7F765", "N c #F7F765",
"O c #F2F251", "O c #F2F251",
"P c #DBDB3A", "P c #DBDB3A",
"Q c #E48E8E", "Q c #E48E8E",
"R c #FFBABA", "R c #FFBABA",
"S c #FF8E8E", "S c #FF8E8E",
"T c #FF8181", "T c #FF8181",
"U c #FF6868", "U c #FF6868",
"V c #E54D60", "V c #E54D60",
"W c #AC2E56", "W c #AC2E56",
"X c #0B0BBF", "X c #0B0BBF",
"Y c #0606BF", "Y c #0606BF",
"Z c #C8C85D", "Z c #C8C85D",
"` c #FEFEB1", "` c #FEFEB1",
" . c #FEFE74", " . c #FEFE74",
".. c #F4F456", ".. c #F4F456",
"+. c #EFEF42", "+. c #EFEF42",
"@. c #EFEF38", "@. c #EFEF38",
"#. c #D7D725", "#. c #D7D725",
"$. c #E47676", "$. c #E47676",
"%. c #FFA8A8", "%. c #FFA8A8",
"&. c #FF7373", "&. c #FF7373",
"*. c #FF5555", "*. c #FF5555",
"=. c #FF4343", "=. c #FF4343",
"-. c #FF3939", "-. c #FF3939",
";. c #DA2323", ";. c #DA2323",
">. c #CFCF3C", ">. c #CFCF3C",
",. c #F6F694", ",. c #F6F694",
"'. c #F0F047", "'. c #F0F047",
"). c #EFEF2E", "). c #EFEF2E",
"!. c #EFEF24", "!. c #EFEF24",
"~. c #D7D715", "~. c #D7D715",
"{. c #E45757", "{. c #E45757",
"]. c #FF8888", "]. c #FF8888",
"^. c #FF4646", "^. c #FF4646",
"/. c #FF2F2F", "/. c #FF2F2F",
"(. c #FF2525", "(. c #FF2525",
"_. c #DA1414", "_. c #DA1414",
":. c #C3C328", ":. c #C3C328",
"<. c #EBEB55", "<. c #EBEB55",
"[. c #ECEC2F", "[. c #ECEC2F",
"}. c #ECEC24", "}. c #ECEC24",
"|. c #ECEC1A", "|. c #ECEC1A",
"1. c #EBEB10", "1. c #EBEB10",
"2. c #CDCD06", "2. c #CDCD06",
"3. c #DD3A3A", "3. c #DD3A3A",
"4. c #FF6060", "4. c #FF6060",
"5. c #FF1B1B", "5. c #FF1B1B",
"6. c #FE1111", "6. c #FE1111",
"7. c #D10707", "7. c #D10707",
"8. c #B8B819", "8. c #B8B819",
"9. c #B7B715", "9. c #B7B715",
"0. c #B7B710", "0. c #B7B710",
"a. c #B7B70B", "a. c #B7B70B",
"b. c #B7B706", "b. c #B7B706",
"c. c #B7B701", "c. c #B7B701",
"d. c #B7B700", "d. c #B7B700",
"e. c #BF1A1A", "e. c #BF1A1A",
"f. c #CC1919", "f. c #CC1919",
"g. c #CE1414", "g. c #CE1414",
"h. c #CE0E0E", "h. c #CE0E0E",
"i. c #CE0808", "i. c #CE0808",
"j. c #C90202", "j. c #C90202",
"k. c #C00000", "k. c #C00000",
" ", " ",
" ", " ",
" . + @ # $ % & ", " . + @ # $ % & ",
" * = - ; > , ' ) ", " * = - ; > , ' ) ",
" ! ~ { , ] ^ / ( ", " ! ~ { , ] ^ / ( ",
" _ : < ^ [ } | 1 2 3 4 5 ", " _ : < ^ [ } | 1 2 3 4 5 ",
"6 7 8 9 0 a b c d e f g h i j k ", "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 ", "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 ", "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 ` ...+.@.#.", "Q R S T U V W X Y Z ` ...+.@.#.",
"$.%.&.*.=.-.;. >.,.'.@.).!.~.", "$.%.&.*.=.-.;. >.,.'.@.).!.~.",
"{.].^.-./.(._. :.<.[.}.|.1.2.", "{.].^.-./.(._. :.<.[.}.|.1.2.",
"3.4./.(.5.6.7. 8.9.0.a.b.c.d.", "3.4./.(.5.6.7. 8.9.0.a.b.c.d.",
"e.f.g.h.i.j.k. ", "e.f.g.h.i.j.k. ",
" ", " ",
" "}; " "};

View File

@ -1,442 +1,442 @@
/* XPM */ /* XPM */
static const char *const wxwin32x32_xpm[] = { static const char *const wxwin32x32_xpm[] = {
"32 32 407 2", "32 32 407 2",
" c None", " c None",
". c #7373C1", ". c #7373C1",
"+ c #6E6EBF", "+ c #6E6EBF",
"@ c #6B6BBF", "@ c #6B6BBF",
"# c #6868BF", "# c #6868BF",
"$ c #6464BF", "$ c #6464BF",
"% c #6161BF", "% c #6161BF",
"& c #5E5EBF", "& c #5E5EBF",
"* c #5A5ABF", "* c #5A5ABF",
"= c #5959C0", "= c #5959C0",
"- c #7171C0", "- c #7171C0",
"; c #7272C1", "; c #7272C1",
"> c #8686CE", "> c #8686CE",
", c #8686D0", ", c #8686D0",
"' c #8282D0", "' c #8282D0",
") c #7D7DD0", ") c #7D7DD0",
"! c #7979D0", "! c #7979D0",
"~ c #7575D0", "~ c #7575D0",
"{ c #7171D0", "{ c #7171D0",
"] c #6D6DD0", "] c #6D6DD0",
"^ c #6666CD", "^ c #6666CD",
"/ c #5151C1", "/ c #5151C1",
"( c #4C4CBF", "( c #4C4CBF",
"_ c #7171C1", "_ c #7171C1",
": c #7272C2", ": c #7272C2",
"< c #C1C1F2", "< c #C1C1F2",
"[ c #D7D7FF", "[ c #D7D7FF",
"} c #C9C9FF", "} c #C9C9FF",
"| c #C2C2FF", "| c #C2C2FF",
"1 c #BBBBFF", "1 c #BBBBFF",
"2 c #B4B4FF", "2 c #B4B4FF",
"3 c #AEAEFF", "3 c #AEAEFF",
"4 c #A7A7FF", "4 c #A7A7FF",
"5 c #A0A0FF", "5 c #A0A0FF",
"6 c #9A9AFF", "6 c #9A9AFF",
"7 c #8484F2", "7 c #8484F2",
"8 c #4949C2", "8 c #4949C2",
"9 c #4444C1", "9 c #4444C1",
"0 c #6A6AC0", "0 c #6A6AC0",
"a c #8989D4", "a c #8989D4",
"b c #DADAFF", "b c #DADAFF",
"c c #C0C0FF", "c c #C0C0FF",
"d c #9393FF", "d c #9393FF",
"e c #8C8CFF", "e c #8C8CFF",
"f c #8686FF", "f c #8686FF",
"g c #5454D4", "g c #5454D4",
"h c #3E3EC0", "h c #3E3EC0",
"i c #6363BF", "i c #6363BF",
"j c #8686D8", "j c #8686D8",
"k c #D4D4FF", "k c #D4D4FF",
"l c #D2D2FF", "l c #D2D2FF",
"m c #7F7FFF", "m c #7F7FFF",
"n c #7878FF", "n c #7878FF",
"o c #4F4FD7", "o c #4F4FD7",
"p c #3737BF", "p c #3737BF",
"q c #5C5CBF", "q c #5C5CBF",
"r c #7D7DD8", "r c #7D7DD8",
"s c #CCCCFF", "s c #CCCCFF",
"t c #CACAFF", "t c #CACAFF",
"u c #A8A8FF", "u c #A8A8FF",
"v c #7070FF", "v c #7070FF",
"w c #6B6BFF", "w c #6B6BFF",
"x c #4545D7", "x c #4545D7",
"y c #3030BF", "y c #3030BF",
"z c #5555BF", "z c #5555BF",
"A c #7373D8", "A c #7373D8",
"B c #C3C3FF", "B c #C3C3FF",
"C c #9C9CFF", "C c #9C9CFF",
"D c #8D8DFF", "D c #8D8DFF",
"E c #7777FF", "E c #7777FF",
"F c #6262FF", "F c #6262FF",
"G c #5252FF", "G c #5252FF",
"H c #4B4BFF", "H c #4B4BFF",
"I c #4848FF", "I c #4848FF",
"J c #3232D7", "J c #3232D7",
"K c #2626BF", "K c #2626BF",
"L c #4E4EBF", "L c #4E4EBF",
"M c #6A6AD8", "M c #6A6AD8",
"N c #B9B9FF", "N c #B9B9FF",
"O c #9090FF", "O c #9090FF",
"P c #6F6FFF", "P c #6F6FFF",
"Q c #5555FF", "Q c #5555FF",
"R c #4646FF", "R c #4646FF",
"S c #4B4BF5", "S c #4B4BF5",
"T c #8282B4", "T c #8282B4",
"U c #93938E", "U c #93938E",
"V c #B1B173", "V c #B1B173",
"W c #BFBF68", "W c #BFBF68",
"X c #BFBF65", "X c #BFBF65",
"Y c #BFBF62", "Y c #BFBF62",
"Z c #BFBF5E", "Z c #BFBF5E",
"` c #BFBF5B", "` c #BFBF5B",
" . c #BFBF57", " . c #BFBF57",
".. c #BFBF54", ".. c #BFBF54",
"+. c #BFBF51", "+. c #BFBF51",
"@. c #5858D8", "@. c #5858D8",
"#. c #B2B2FF", "#. c #B2B2FF",
"$. c #B1B1FF", "$. c #B1B1FF",
"%. c #8484FF", "%. c #8484FF",
"&. c #7272FF", "&. c #7272FF",
"*. c #6767FF", "*. c #6767FF",
"=. c #4F4FFF", "=. c #4F4FFF",
"-. c #4747FF", "-. c #4747FF",
";. c #4242FF", ";. c #4242FF",
">. c #4141FA", ">. c #4141FA",
",. c #ABAB8A", ",. c #ABAB8A",
"'. c #E4E4AA", "'. c #E4E4AA",
"). c #F5F5C3", "). c #F5F5C3",
"!. c #F6F6BE", "!. c #F6F6BE",
"~. c #F6F6B7", "~. c #F6F6B7",
"{. c #F6F6B1", "{. c #F6F6B1",
"]. c #F6F6AB", "]. c #F6F6AB",
"^. c #F6F6A5", "^. c #F6F6A5",
"/. c #F6F69E", "/. c #F6F69E",
"(. c #F6F698", "(. c #F6F698",
"_. c #F1F18C", "_. c #F1F18C",
":. c #D0D05F", ":. c #D0D05F",
"<. c #BFBF48", "<. c #BFBF48",
"[. c #C17474", "[. c #C17474",
"}. c #C07171", "}. c #C07171",
"|. c #BF6E6E", "|. c #BF6E6E",
"1. c #BF6B6B", "1. c #BF6B6B",
"2. c #BF6868", "2. c #BF6868",
"3. c #BF6464", "3. c #BF6464",
"4. c #BF6161", "4. c #BF6161",
"5. c #7C498C", "5. c #7C498C",
"6. c #4242D8", "6. c #4242D8",
"7. c #A4A4FF", "7. c #A4A4FF",
"8. c #5959FF", "8. c #5959FF",
"9. c #3D3DFF", "9. c #3D3DFF",
"0. c #3838FF", "0. c #3838FF",
"a. c #6666CA", "a. c #6666CA",
"b. c #DCDC98", "b. c #DCDC98",
"c. c #FFFFDD", "c. c #FFFFDD",
"d. c #FFFFD7", "d. c #FFFFD7",
"e. c #FFFFC0", "e. c #FFFFC0",
"f. c #FFFFB8", "f. c #FFFFB8",
"g. c #FFFFB2", "g. c #FFFFB2",
"h. c #FFFFAB", "h. c #FFFFAB",
"i. c #FFFFA4", "i. c #FFFFA4",
"j. c #FFFF9D", "j. c #FFFF9D",
"k. c #FFFF97", "k. c #FFFF97",
"l. c #FFFF90", "l. c #FFFF90",
"m. c #FBFB85", "m. c #FBFB85",
"n. c #C2C244", "n. c #C2C244",
"o. c #C37676", "o. c #C37676",
"p. c #DA9B9B", "p. c #DA9B9B",
"q. c #DF9F9F", "q. c #DF9F9F",
"r. c #DF9A9A", "r. c #DF9A9A",
"s. c #DF9494", "s. c #DF9494",
"t. c #DF8F8F", "t. c #DF8F8F",
"u. c #DF8A8A", "u. c #DF8A8A",
"v. c #B47094", "v. c #B47094",
"w. c #3B3BD8", "w. c #3B3BD8",
"x. c #9292FF", "x. c #9292FF",
"y. c #5656FF", "y. c #5656FF",
"z. c #3333FF", "z. c #3333FF",
"A. c #2E2EFF", "A. c #2E2EFF",
"B. c #7070B6", "B. c #7070B6",
"C. c #E7E79F", "C. c #E7E79F",
"D. c #FFFFDE", "D. c #FFFFDE",
"E. c #FFFFCF", "E. c #FFFFCF",
"F. c #FFFFB5", "F. c #FFFFB5",
"G. c #FFFF9E", "G. c #FFFF9E",
"H. c #FFFF8A", "H. c #FFFF8A",
"I. c #FFFF83", "I. c #FFFF83",
"J. c #FFFF7C", "J. c #FFFF7C",
"K. c #C8C843", "K. c #C8C843",
"L. c #C06D6D", "L. c #C06D6D",
"M. c #F1BEBE", "M. c #F1BEBE",
"N. c #FFDBDB", "N. c #FFDBDB",
"O. c #FFCBCB", "O. c #FFCBCB",
"P. c #FFC0C0", "P. c #FFC0C0",
"Q. c #FFBABA", "Q. c #FFBABA",
"R. c #FFB3B3", "R. c #FFB3B3",
"S. c #FFACAC", "S. c #FFACAC",
"T. c #CE89AC", "T. c #CE89AC",
"U. c #3333D7", "U. c #3333D7",
"V. c #8787FF", "V. c #8787FF",
"W. c #4D4DFF", "W. c #4D4DFF",
"X. c #2929FF", "X. c #2929FF",
"Y. c #2424FF", "Y. c #2424FF",
"Z. c #6B6BB3", "Z. c #6B6BB3",
"`. c #E7E795", "`. c #E7E795",
" + c #FFFFC6", " + c #FFFFC6",
".+ c #FFFFA8", ".+ c #FFFFA8",
"++ c #FFFF76", "++ c #FFFF76",
"@+ c #FFFF6F", "@+ c #FFFF6F",
"#+ c #C8C83C", "#+ c #C8C83C",
"$+ c #C77474", "$+ c #C77474",
"%+ c #FFD3D3", "%+ c #FFD3D3",
"&+ c #FFDEDE", "&+ c #FFDEDE",
"*+ c #FFC4C4", "*+ c #FFC4C4",
"=+ c #FFA6A6", "=+ c #FFA6A6",
"-+ c #FF9F9F", "-+ c #FF9F9F",
";+ c #F3929A", ";+ c #F3929A",
">+ c #2F29C3", ">+ c #2F29C3",
",+ c #4C4CFB", ",+ c #4C4CFB",
"'+ c #6868FF", "'+ c #6868FF",
")+ c #3939FF", ")+ c #3939FF",
"!+ c #1F1FFF", "!+ c #1F1FFF",
"~+ c #1A1AFF", "~+ c #1A1AFF",
"{+ c #6666B0", "{+ c #6666B0",
"]+ c #E7E78A", "]+ c #E7E78A",
"^+ c #FFFFD0", "^+ c #FFFFD0",
"/+ c #FFFFBD", "/+ c #FFFFBD",
"(+ c #FFFF9B", "(+ c #FFFF9B",
"_+ c #FFFF91", "_+ c #FFFF91",
":+ c #FAFA6E", ":+ c #FAFA6E",
"<+ c #F5F55F", "<+ c #F5F55F",
"[+ c #F5F558", "[+ c #F5F558",
"}+ c #F7F756", "}+ c #F7F756",
"|+ c #C7C732", "|+ c #C7C732",
"1+ c #C86E6E", "1+ c #C86E6E",
"2+ c #FFC9C9", "2+ c #FFC9C9",
"3+ c #FFD7D7", "3+ c #FFD7D7",
"4+ c #FFB8B8", "4+ c #FFB8B8",
"5+ c #FF9898", "5+ c #FF9898",
"6+ c #FF9292", "6+ c #FF9292",
"7+ c #FF8B8B", "7+ c #FF8B8B",
"8+ c #B16098", "8+ c #B16098",
"9+ c #2420C6", "9+ c #2420C6",
"0+ c #2222DD", "0+ c #2222DD",
"a+ c #1F1FDF", "a+ c #1F1FDF",
"b+ c #1B1BDF", "b+ c #1B1BDF",
"c+ c #1818DF", "c+ c #1818DF",
"d+ c #1414DF", "d+ c #1414DF",
"e+ c #1010DF", "e+ c #1010DF",
"f+ c #0C0CDF", "f+ c #0C0CDF",
"g+ c #5F5F9C", "g+ c #5F5F9C",
"h+ c #E7E77F", "h+ c #E7E77F",
"i+ c #FFFFC9", "i+ c #FFFFC9",
"j+ c #FFFFB4", "j+ c #FFFFB4",
"k+ c #FFFF8E", "k+ c #FFFF8E",
"l+ c #FFFF7D", "l+ c #FFFF7D",
"m+ c #FEFE75", "m+ c #FEFE75",
"n+ c #F4F45D", "n+ c #F4F45D",
"o+ c #EFEF4F", "o+ c #EFEF4F",
"p+ c #EFEF4A", "p+ c #EFEF4A",
"q+ c #EFEF44", "q+ c #EFEF44",
"r+ c #EFEF3F", "r+ c #EFEF3F",
"s+ c #BFBF22", "s+ c #BFBF22",
"t+ c #C86666", "t+ c #C86666",
"u+ c #FFBFBF", "u+ c #FFBFBF",
"v+ c #FFD0D0", "v+ c #FFD0D0",
"w+ c #FFADAD", "w+ c #FFADAD",
"x+ c #FF8484", "x+ c #FF8484",
"y+ c #FF7E7E", "y+ c #FF7E7E",
"z+ c #FF7373", "z+ c #FF7373",
"A+ c #E75F70", "A+ c #E75F70",
"B+ c #B0457F", "B+ c #B0457F",
"C+ c #9A3776", "C+ c #9A3776",
"D+ c #5F1D7C", "D+ c #5F1D7C",
"E+ c #0C0CBF", "E+ c #0C0CBF",
"F+ c #0909BF", "F+ c #0909BF",
"G+ c #0707BF", "G+ c #0707BF",
"H+ c #0404BF", "H+ c #0404BF",
"I+ c #878766", "I+ c #878766",
"J+ c #E6E674", "J+ c #E6E674",
"K+ c #FFFFC2", "K+ c #FFFFC2",
"L+ c #FFFF82", "L+ c #FFFF82",
"M+ c #FEFE6E", "M+ c #FEFE6E",
"N+ c #F3F355", "N+ c #F3F355",
"O+ c #EFEF45", "O+ c #EFEF45",
"P+ c #EFEF40", "P+ c #EFEF40",
"Q+ c #EFEF3B", "Q+ c #EFEF3B",
"R+ c #EFEF36", "R+ c #EFEF36",
"S+ c #BFBF1C", "S+ c #BFBF1C",
"T+ c #C85F5F", "T+ c #C85F5F",
"U+ c #FFB4B4", "U+ c #FFB4B4",
"V+ c #FFA2A2", "V+ c #FFA2A2",
"W+ c #FF7575", "W+ c #FF7575",
"X+ c #FF5E5E", "X+ c #FF5E5E",
"Y+ c #FF5050", "Y+ c #FF5050",
"Z+ c #FF4A4A", "Z+ c #FF4A4A",
"`+ c #FF4545", "`+ c #FF4545",
" @ c #E73535", " @ c #E73535",
".@ c #BF2121", ".@ c #BF2121",
"+@ c #B7B733", "+@ c #B7B733",
"@@ c #DCDC55", "@@ c #DCDC55",
"#@ c #FDFDB7", "#@ c #FDFDB7",
"$@ c #FFFFA2", "$@ c #FFFFA2",
"%@ c #FFFF75", "%@ c #FFFF75",
"&@ c #FCFC64", "&@ c #FCFC64",
"*@ c #F2F24E", "*@ c #F2F24E",
"=@ c #EFEF31", "=@ c #EFEF31",
"-@ c #EFEF2C", "-@ c #EFEF2C",
";@ c #BFBF16", ";@ c #BFBF16",
">@ c #C85656", ">@ c #C85656",
",@ c #FFAAAA", ",@ c #FFAAAA",
"'@ c #FFC2C2", "'@ c #FFC2C2",
")@ c #FF9797", ")@ c #FF9797",
"!@ c #FF7777", "!@ c #FF7777",
"~@ c #FF6E6E", "~@ c #FF6E6E",
"{@ c #FF5454", "{@ c #FF5454",
"]@ c #FF4040", "]@ c #FF4040",
"^@ c #FF3B3B", "^@ c #FF3B3B",
"/@ c #E72C2C", "/@ c #E72C2C",
"(@ c #BF1919", "(@ c #BF1919",
"_@ c #B7B72E", "_@ c #B7B72E",
":@ c #DADA48", ":@ c #DADA48",
"<@ c #F7F7A6", "<@ c #F7F7A6",
"[@ c #F6F689", "[@ c #F6F689",
"}@ c #F2F254", "}@ c #F2F254",
"|@ c #EFEF27", "|@ c #EFEF27",
"1@ c #EFEF22", "1@ c #EFEF22",
"2@ c #BFBF10", "2@ c #BFBF10",
"3@ c #C84040", "3@ c #C84040",
"4@ c #FF9A9A", "4@ c #FF9A9A",
"5@ c #FFBBBB", "5@ c #FFBBBB",
"6@ c #FF7171", "6@ c #FF7171",
"7@ c #FF6666", "7@ c #FF6666",
"8@ c #FF4E4E", "8@ c #FF4E4E",
"9@ c #FF4646", "9@ c #FF4646",
"0@ c #FF4141", "0@ c #FF4141",
"a@ c #FF3C3C", "a@ c #FF3C3C",
"b@ c #FF3737", "b@ c #FF3737",
"c@ c #FF3232", "c@ c #FF3232",
"d@ c #E72424", "d@ c #E72424",
"e@ c #BF1414", "e@ c #BF1414",
"f@ c #B7B729", "f@ c #B7B729",
"g@ c #DADA3F", "g@ c #DADA3F",
"h@ c #F7F7A1", "h@ c #F7F7A1",
"i@ c #F4F480", "i@ c #F4F480",
"j@ c #F0F047", "j@ c #F0F047",
"k@ c #EFEF1D", "k@ c #EFEF1D",
"l@ c #EFEF18", "l@ c #EFEF18",
"m@ c #BFBF0B", "m@ c #BFBF0B",
"n@ c #C83636", "n@ c #C83636",
"o@ c #FFABAB", "o@ c #FFABAB",
"p@ c #FF7676", "p@ c #FF7676",
"q@ c #FF2D2D", "q@ c #FF2D2D",
"r@ c #FF2828", "r@ c #FF2828",
"s@ c #E71C1C", "s@ c #E71C1C",
"t@ c #BF0F0F", "t@ c #BF0F0F",
"u@ c #B7B724", "u@ c #B7B724",
"v@ c #D1D132", "v@ c #D1D132",
"w@ c #F4F478", "w@ c #F4F478",
"x@ c #EFEF13", "x@ c #EFEF13",
"y@ c #ECEC0E", "y@ c #ECEC0E",
"z@ c #BABA05", "z@ c #BABA05",
"A@ c #C83030", "A@ c #C83030",
"B@ c #FF6161", "B@ c #FF6161",
"C@ c #FF2323", "C@ c #FF2323",
"D@ c #FF1E1E", "D@ c #FF1E1E",
"E@ c #E71414", "E@ c #E71414",
"F@ c #BF0A0A", "F@ c #BF0A0A",
"G@ c #B8B820", "G@ c #B8B820",
"H@ c #B9B91F", "H@ c #B9B91F",
"I@ c #DADA2C", "I@ c #DADA2C",
"J@ c #E9E931", "J@ c #E9E931",
"K@ c #EAEA2A", "K@ c #EAEA2A",
"L@ c #EAEA25", "L@ c #EAEA25",
"M@ c #EAEA20", "M@ c #EAEA20",
"N@ c #EAEA1C", "N@ c #EAEA1C",
"O@ c #EAEA17", "O@ c #EAEA17",
"P@ c #EAEA12", "P@ c #EAEA12",
"Q@ c #EAEA0D", "Q@ c #EAEA0D",
"R@ c #E5E508", "R@ c #E5E508",
"S@ c #C7C703", "S@ c #C7C703",
"T@ c #B7B701", "T@ c #B7B701",
"U@ c #C52929", "U@ c #C52929",
"V@ c #FF5858", "V@ c #FF5858",
"W@ c #FF1919", "W@ c #FF1919",
"X@ c #FF1414", "X@ c #FF1414",
"Y@ c #E30C0C", "Y@ c #E30C0C",
"Z@ c #BF0606", "Z@ c #BF0606",
"`@ c #B8B819", "`@ c #B8B819",
" # c #B7B717", " # c #B7B717",
".# c #B7B714", ".# c #B7B714",
"+# c #B7B711", "+# c #B7B711",
"@# c #B7B70F", "@# c #B7B70F",
"## c #B7B70C", "## c #B7B70C",
"$# c #B7B70A", "$# c #B7B70A",
"%# c #B7B707", "%# c #B7B707",
"&# c #B7B705", "&# c #B7B705",
"*# c #B7B702", "*# c #B7B702",
"=# c #B7B700", "=# c #B7B700",
"-# c #BF2020", "-# c #BF2020",
";# c #E63131", ";# c #E63131",
"># c #FF5555", "># c #FF5555",
",# c #FF3A3A", ",# c #FF3A3A",
"'# c #FF0F0F", "'# c #FF0F0F",
")# c #FA0A0A", ")# c #FA0A0A",
"!# c #C90303", "!# c #C90303",
"~# c #C00202", "~# c #C00202",
"{# c #C01C1C", "{# c #C01C1C",
"]# c #CB1B1B", "]# c #CB1B1B",
"^# c #D01A1A", "^# c #D01A1A",
"/# c #D01616", "/# c #D01616",
"(# c #D01313", "(# c #D01313",
"_# c #D01010", "_# c #D01010",
":# c #D00D0D", ":# c #D00D0D",
"<# c #D00A0A", "<# c #D00A0A",
"[# c #D00707", "[# c #D00707",
"}# c #CF0303", "}# c #CF0303",
"|# c #C30101", "|# c #C30101",
"1# c #C00000", "1# c #C00000",
"2# c #C21414", "2# c #C21414",
"3# c #BF1111", "3# c #BF1111",
"4# c #BF0E0E", "4# c #BF0E0E",
"5# c #BF0C0C", "5# c #BF0C0C",
"6# c #BF0909", "6# c #BF0909",
"7# c #BF0707", "7# c #BF0707",
"8# c #BF0404", "8# c #BF0404",
"9# c #BF0202", "9# c #BF0202",
"0# c #C50000", "0# c #C50000",
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" . + @ # $ % & * = ", " . + @ # $ % & * = ",
" - ; > , ' ) ! ~ { ] ^ / ( ", " - ; > , ' ) ! ~ { ] ^ / ( ",
" _ : < [ } | 1 2 3 4 5 6 7 8 9 ", " _ : < [ } | 1 2 3 4 5 6 7 8 9 ",
" 0 a b b c 2 3 4 5 6 d e f g h ", " 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 ", " 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 ", " 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 ", " 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 ` ...+. ", " L M 1 N O m n P Q H R S T U V W X Y Z ` ...+. ",
" p @.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.", " 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.", " [.}.|.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.", "}.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.++@+#+", "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.:+<+[+}+|+", "$+%+&+*+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+", "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+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+=@-@;@", "T+U+2+V+7+x+y+W+X+Y+Z+`+ @.@ +@@@#@$@%@&@*@O+P+Q+R+=@-@;@",
">@,@'@)@y+!@~@{@Z+`+]@^@/@(@ _@:@<@[@}@O+P+Q+R+=@-@|@1@2@", ">@,@'@)@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@", "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@", "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@", "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@ `@ #.#+#@###$#%#&#*#=#=# ", "U@7@4@V@b@c@q@r@C@D@W@X@Y@Z@ `@ #.#+#@###$#%#&#*#=#=# ",
"-#;#>#,#q@r@C@D@W@X@'#)#!#~# ", "-#;#>#,#q@r@C@D@W@X@'#)#!#~# ",
"{#(@]#^#/#(#_#:#<#[#}#|#1# ", "{#(@]#^#/#(#_#:#<#[#}#|#1# ",
" 2#3#4#5#6#7#8#9#1#0# ", " 2#3#4#5#6#7#8#9#1#0# ",
" ", " ",
" ", " ",
" ", " ",
" "}; " "};

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
@ -14,6 +14,8 @@
<ClInclude Include="..\..\include\wx\aboutdlg.h" /> <ClInclude Include="..\..\include\wx\aboutdlg.h" />
<ClInclude Include="..\..\include\wx\accel.h" /> <ClInclude Include="..\..\include\wx\accel.h" />
<ClInclude Include="..\..\include\wx\access.h" /> <ClInclude Include="..\..\include\wx\access.h" />
<ClInclude Include="..\..\include\wx\activityindicator.h" />
<ClInclude Include="..\..\include\wx\addremovectrl.h" />
<ClInclude Include="..\..\include\wx\affinematrix2d.h" /> <ClInclude Include="..\..\include\wx\affinematrix2d.h" />
<ClInclude Include="..\..\include\wx\affinematrix2dbase.h" /> <ClInclude Include="..\..\include\wx\affinematrix2dbase.h" />
<ClInclude Include="..\..\include\wx\afterstd.h" /> <ClInclude Include="..\..\include\wx\afterstd.h" />
@ -24,11 +26,23 @@
<ClInclude Include="..\..\include\wx\anybutton.h" /> <ClInclude Include="..\..\include\wx\anybutton.h" />
<ClInclude Include="..\..\include\wx\anystr.h" /> <ClInclude Include="..\..\include\wx\anystr.h" />
<ClInclude Include="..\..\include\wx\app.h" /> <ClInclude Include="..\..\include\wx\app.h" />
<ClInclude Include="..\..\include\wx\appprogress.h" />
<ClInclude Include="..\..\include\wx\apptrait.h" /> <ClInclude Include="..\..\include\wx\apptrait.h" />
<ClInclude Include="..\..\include\wx\archive.h" /> <ClInclude Include="..\..\include\wx\archive.h" />
<ClInclude Include="..\..\include\wx\arrstr.h" /> <ClInclude Include="..\..\include\wx\arrstr.h" />
<ClInclude Include="..\..\include\wx\artprov.h" /> <ClInclude Include="..\..\include\wx\artprov.h" />
<ClInclude Include="..\..\include\wx\atomic.h" /> <ClInclude Include="..\..\include\wx\atomic.h" />
<ClInclude Include="..\..\include\wx\aui\aui.h" />
<ClInclude Include="..\..\include\wx\aui\auibar.h" />
<ClInclude Include="..\..\include\wx\aui\auibook.h" />
<ClInclude Include="..\..\include\wx\aui\barartmsw.h" />
<ClInclude Include="..\..\include\wx\aui\dockart.h" />
<ClInclude Include="..\..\include\wx\aui\floatpane.h" />
<ClInclude Include="..\..\include\wx\aui\framemanager.h" />
<ClInclude Include="..\..\include\wx\aui\tabart.h" />
<ClInclude Include="..\..\include\wx\aui\tabartgtk.h" />
<ClInclude Include="..\..\include\wx\aui\tabartmsw.h" />
<ClInclude Include="..\..\include\wx\aui\tabmdi.h" />
<ClInclude Include="..\..\include\wx\bannerwindow.h" /> <ClInclude Include="..\..\include\wx\bannerwindow.h" />
<ClInclude Include="..\..\include\wx\base64.h" /> <ClInclude Include="..\..\include\wx\base64.h" />
<ClInclude Include="..\..\include\wx\beforestd.h" /> <ClInclude Include="..\..\include\wx\beforestd.h" />
@ -41,7 +55,6 @@
<ClInclude Include="..\..\include\wx\build.h" /> <ClInclude Include="..\..\include\wx\build.h" />
<ClInclude Include="..\..\include\wx\busyinfo.h" /> <ClInclude Include="..\..\include\wx\busyinfo.h" />
<ClInclude Include="..\..\include\wx\button.h" /> <ClInclude Include="..\..\include\wx\button.h" />
<ClInclude Include="..\..\include\wx\cairo.h" />
<ClInclude Include="..\..\include\wx\calctrl.h" /> <ClInclude Include="..\..\include\wx\calctrl.h" />
<ClInclude Include="..\..\include\wx\caret.h" /> <ClInclude Include="..\..\include\wx\caret.h" />
<ClInclude Include="..\..\include\wx\chartype.h" /> <ClInclude Include="..\..\include\wx\chartype.h" />
@ -59,6 +72,7 @@
<ClInclude Include="..\..\include\wx\cmdline.h" /> <ClInclude Include="..\..\include\wx\cmdline.h" />
<ClInclude Include="..\..\include\wx\cmdproc.h" /> <ClInclude Include="..\..\include\wx\cmdproc.h" />
<ClInclude Include="..\..\include\wx\cmndata.h" /> <ClInclude Include="..\..\include\wx\cmndata.h" />
<ClInclude Include="..\..\include\wx\collheaderctrl.h" />
<ClInclude Include="..\..\include\wx\collpane.h" /> <ClInclude Include="..\..\include\wx\collpane.h" />
<ClInclude Include="..\..\include\wx\colordlg.h" /> <ClInclude Include="..\..\include\wx\colordlg.h" />
<ClInclude Include="..\..\include\wx\colour.h" /> <ClInclude Include="..\..\include\wx\colour.h" />
@ -161,6 +175,7 @@
<ClInclude Include="..\..\include\wx\gdiobj.h" /> <ClInclude Include="..\..\include\wx\gdiobj.h" />
<ClInclude Include="..\..\include\wx\generic\aboutdlgg.h" /> <ClInclude Include="..\..\include\wx\generic\aboutdlgg.h" />
<ClInclude Include="..\..\include\wx\generic\accel.h" /> <ClInclude Include="..\..\include\wx\generic\accel.h" />
<ClInclude Include="..\..\include\wx\generic\activityindicator.h" />
<ClInclude Include="..\..\include\wx\generic\animate.h" /> <ClInclude Include="..\..\include\wx\generic\animate.h" />
<ClInclude Include="..\..\include\wx\generic\bmpcbox.h" /> <ClInclude Include="..\..\include\wx\generic\bmpcbox.h" />
<ClInclude Include="..\..\include\wx\generic\busyinfo.h" /> <ClInclude Include="..\..\include\wx\generic\busyinfo.h" />
@ -169,6 +184,7 @@
<ClInclude Include="..\..\include\wx\generic\caret.h" /> <ClInclude Include="..\..\include\wx\generic\caret.h" />
<ClInclude Include="..\..\include\wx\generic\choicdgg.h" /> <ClInclude Include="..\..\include\wx\generic\choicdgg.h" />
<ClInclude Include="..\..\include\wx\generic\clrpickerg.h" /> <ClInclude Include="..\..\include\wx\generic\clrpickerg.h" />
<ClInclude Include="..\..\include\wx\generic\collheaderctrl.h" />
<ClInclude Include="..\..\include\wx\generic\collpaneg.h" /> <ClInclude Include="..\..\include\wx\generic\collpaneg.h" />
<ClInclude Include="..\..\include\wx\generic\colour.h" /> <ClInclude Include="..\..\include\wx\generic\colour.h" />
<ClInclude Include="..\..\include\wx\generic\colrdlgg.h" /> <ClInclude Include="..\..\include\wx\generic\colrdlgg.h" />
@ -212,6 +228,15 @@
<ClInclude Include="..\..\include\wx\generic\paletteg.h" /> <ClInclude Include="..\..\include\wx\generic\paletteg.h" />
<ClInclude Include="..\..\include\wx\generic\panelg.h" /> <ClInclude Include="..\..\include\wx\generic\panelg.h" />
<ClInclude Include="..\..\include\wx\generic\printps.h" /> <ClInclude Include="..\..\include\wx\generic\printps.h" />
<ClInclude Include="..\..\include\wx\generic\private\addremovectrl.h" />
<ClInclude Include="..\..\include\wx\generic\private\grid.h" />
<ClInclude Include="..\..\include\wx\generic\private\listctrl.h" />
<ClInclude Include="..\..\include\wx\generic\private\markuptext.h" />
<ClInclude Include="..\..\include\wx\generic\private\notifmsg.h" />
<ClInclude Include="..\..\include\wx\generic\private\richtooltip.h" />
<ClInclude Include="..\..\include\wx\generic\private\textmeasure.h" />
<ClInclude Include="..\..\include\wx\generic\private\timer.h" />
<ClInclude Include="..\..\include\wx\generic\private\widthcalc.h" />
<ClInclude Include="..\..\include\wx\generic\prntdlgg.h" /> <ClInclude Include="..\..\include\wx\generic\prntdlgg.h" />
<ClInclude Include="..\..\include\wx\generic\progdlgg.h" /> <ClInclude Include="..\..\include\wx\generic\progdlgg.h" />
<ClInclude Include="..\..\include\wx\generic\propdlg.h" /> <ClInclude Include="..\..\include\wx\generic\propdlg.h" />
@ -308,6 +333,7 @@
<ClInclude Include="..\..\include\wx\msw\accel.h" /> <ClInclude Include="..\..\include\wx\msw\accel.h" />
<ClInclude Include="..\..\include\wx\msw\anybutton.h" /> <ClInclude Include="..\..\include\wx\msw\anybutton.h" />
<ClInclude Include="..\..\include\wx\msw\app.h" /> <ClInclude Include="..\..\include\wx\msw\app.h" />
<ClInclude Include="..\..\include\wx\msw\appprogress.h" />
<ClInclude Include="..\..\include\wx\msw\apptbase.h" /> <ClInclude Include="..\..\include\wx\msw\apptbase.h" />
<ClInclude Include="..\..\include\wx\msw\apptrait.h" /> <ClInclude Include="..\..\include\wx\msw\apptrait.h" />
<ClInclude Include="..\..\include\wx\msw\bitmap.h" /> <ClInclude Include="..\..\include\wx\msw\bitmap.h" />
@ -377,16 +403,13 @@
<ClInclude Include="..\..\include\wx\msw\menu.h" /> <ClInclude Include="..\..\include\wx\msw\menu.h" />
<ClInclude Include="..\..\include\wx\msw\menuitem.h" /> <ClInclude Include="..\..\include\wx\msw\menuitem.h" />
<ClInclude Include="..\..\include\wx\msw\metafile.h" /> <ClInclude Include="..\..\include\wx\msw\metafile.h" />
<ClInclude Include="..\..\include\wx\msw\microwin.h" />
<ClInclude Include="..\..\include\wx\msw\mimetype.h" /> <ClInclude Include="..\..\include\wx\msw\mimetype.h" />
<ClInclude Include="..\..\include\wx\msw\minifram.h" /> <ClInclude Include="..\..\include\wx\msw\minifram.h" />
<ClInclude Include="..\..\include\wx\msw\missing.h" /> <ClInclude Include="..\..\include\wx\msw\missing.h" />
<ClInclude Include="..\..\include\wx\msw\msgdlg.h" /> <ClInclude Include="..\..\include\wx\msw\msgdlg.h" />
<ClInclude Include="..\..\include\wx\msw\mslu.h" />
<ClInclude Include="..\..\include\wx\msw\msvcrt.h" /> <ClInclude Include="..\..\include\wx\msw\msvcrt.h" />
<ClInclude Include="..\..\include\wx\msw\nonownedwnd.h" /> <ClInclude Include="..\..\include\wx\msw\nonownedwnd.h" />
<ClInclude Include="..\..\include\wx\msw\notebook.h" /> <ClInclude Include="..\..\include\wx\msw\notebook.h" />
<ClInclude Include="..\..\include\wx\msw\notifmsg.h" />
<ClInclude Include="..\..\include\wx\msw\ole\access.h" /> <ClInclude Include="..\..\include\wx\msw\ole\access.h" />
<ClInclude Include="..\..\include\wx\msw\ole\activex.h" /> <ClInclude Include="..\..\include\wx\msw\ole\activex.h" />
<ClInclude Include="..\..\include\wx\msw\ole\automtn.h" /> <ClInclude Include="..\..\include\wx\msw\ole\automtn.h" />
@ -397,6 +420,7 @@
<ClInclude Include="..\..\include\wx\msw\ole\droptgt.h" /> <ClInclude Include="..\..\include\wx\msw\ole\droptgt.h" />
<ClInclude Include="..\..\include\wx\msw\ole\oleutils.h" /> <ClInclude Include="..\..\include\wx\msw\ole\oleutils.h" />
<ClInclude Include="..\..\include\wx\msw\ole\uuid.h" /> <ClInclude Include="..\..\include\wx\msw\ole\uuid.h" />
<ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h" />
<ClInclude Include="..\..\include\wx\msw\ownerdrw.h" /> <ClInclude Include="..\..\include\wx\msw\ownerdrw.h" />
<ClInclude Include="..\..\include\wx\msw\palette.h" /> <ClInclude Include="..\..\include\wx\msw\palette.h" />
<ClInclude Include="..\..\include\wx\msw\panel.h" /> <ClInclude Include="..\..\include\wx\msw\panel.h" />
@ -409,6 +433,7 @@
<ClInclude Include="..\..\include\wx\msw\private\comptr.h" /> <ClInclude Include="..\..\include\wx\msw\private\comptr.h" />
<ClInclude Include="..\..\include\wx\msw\private\datecontrols.h" /> <ClInclude Include="..\..\include\wx\msw\private\datecontrols.h" />
<ClInclude Include="..\..\include\wx\msw\private\dc.h" /> <ClInclude Include="..\..\include\wx\msw\private\dc.h" />
<ClInclude Include="..\..\include\wx\msw\private\event.h" />
<ClInclude Include="..\..\include\wx\msw\private\fswatcher.h" /> <ClInclude Include="..\..\include\wx\msw\private\fswatcher.h" />
<ClInclude Include="..\..\include\wx\msw\private\hiddenwin.h" /> <ClInclude Include="..\..\include\wx\msw\private\hiddenwin.h" />
<ClInclude Include="..\..\include\wx\msw\private\keyboard.h" /> <ClInclude Include="..\..\include\wx\msw\private\keyboard.h" />
@ -447,6 +472,7 @@
<ClInclude Include="..\..\include\wx\msw\stdpaths.h" /> <ClInclude Include="..\..\include\wx\msw\stdpaths.h" />
<ClInclude Include="..\..\include\wx\msw\subwin.h" /> <ClInclude Include="..\..\include\wx\msw\subwin.h" />
<ClInclude Include="..\..\include\wx\msw\taskbar.h" /> <ClInclude Include="..\..\include\wx\msw\taskbar.h" />
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h" />
<ClInclude Include="..\..\include\wx\msw\textctrl.h" /> <ClInclude Include="..\..\include\wx\msw\textctrl.h" />
<ClInclude Include="..\..\include\wx\msw\textentry.h" /> <ClInclude Include="..\..\include\wx\msw\textentry.h" />
<ClInclude Include="..\..\include\wx\msw\tglbtn.h" /> <ClInclude Include="..\..\include\wx\msw\tglbtn.h" />
@ -522,7 +548,6 @@
<ClInclude Include="..\..\include\wx\scrolwin.h" /> <ClInclude Include="..\..\include\wx\scrolwin.h" />
<ClInclude Include="..\..\include\wx\selstore.h" /> <ClInclude Include="..\..\include\wx\selstore.h" />
<ClInclude Include="..\..\include\wx\settings.h" /> <ClInclude Include="..\..\include\wx\settings.h" />
<ClInclude Include="..\..\include\wx\setup_gccxml.h" />
<ClInclude Include="..\..\include\wx\setup_inc.h" /> <ClInclude Include="..\..\include\wx\setup_inc.h" />
<ClInclude Include="..\..\include\wx\setup_redirect.h" /> <ClInclude Include="..\..\include\wx\setup_redirect.h" />
<ClInclude Include="..\..\include\wx\sharedptr.h" /> <ClInclude Include="..\..\include\wx\sharedptr.h" />
@ -628,23 +653,6 @@
<ClInclude Include="..\..\include\wx\wxcrtvararg.h" /> <ClInclude Include="..\..\include\wx\wxcrtvararg.h" />
<ClInclude Include="..\..\include\wx\wxhtml.h" /> <ClInclude Include="..\..\include\wx\wxhtml.h" />
<ClInclude Include="..\..\include\wx\wxprec.h" /> <ClInclude Include="..\..\include\wx\wxprec.h" />
<ClInclude Include="..\..\include\wx\wxshlba_cw.h" />
<ClInclude Include="..\..\include\wx\wxshlba_cwc.h" />
<ClInclude Include="..\..\include\wx\wxshlba_cwc_d.h" />
<ClInclude Include="..\..\include\wx\wxshlba_cw_d.h" />
<ClInclude Include="..\..\include\wx\wxshlb_cw.h" />
<ClInclude Include="..\..\include\wx\wxshlb_cwc.h" />
<ClInclude Include="..\..\include\wx\wxshlb_cwc_d.h" />
<ClInclude Include="..\..\include\wx\wxshlb_cw_d.h" />
<ClInclude Include="..\..\include\wx\wx_cw.h" />
<ClInclude Include="..\..\include\wx\wx_cwc.h" />
<ClInclude Include="..\..\include\wx\wx_cwcocoa.h" />
<ClInclude Include="..\..\include\wx\wx_cwcocoa_cm.h" />
<ClInclude Include="..\..\include\wx\wx_cwcocoa_d.h" />
<ClInclude Include="..\..\include\wx\wx_cwc_d.h" />
<ClInclude Include="..\..\include\wx\wx_cwu_d.h" />
<ClInclude Include="..\..\include\wx\wx_cw_cm.h" />
<ClInclude Include="..\..\include\wx\wx_cw_d.h" />
<ClInclude Include="..\..\include\wx\xlocale.h" /> <ClInclude Include="..\..\include\wx\xlocale.h" />
<ClInclude Include="..\..\include\wx\xpmdecod.h" /> <ClInclude Include="..\..\include\wx\xpmdecod.h" />
<ClInclude Include="..\..\include\wx\xpmhand.h" /> <ClInclude Include="..\..\include\wx\xpmhand.h" />
@ -670,15 +678,21 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\aui\auibar.cpp" /> <ClCompile Include="..\..\src\aui\auibar.cpp" />
<ClCompile Include="..\..\src\aui\auibook.cpp" /> <ClCompile Include="..\..\src\aui\auibook.cpp" />
<ClCompile Include="..\..\src\aui\barartmsw.cpp" />
<ClCompile Include="..\..\src\aui\dockart.cpp" /> <ClCompile Include="..\..\src\aui\dockart.cpp" />
<ClCompile Include="..\..\src\aui\floatpane.cpp" /> <ClCompile Include="..\..\src\aui\floatpane.cpp" />
<ClCompile Include="..\..\src\aui\framemanager.cpp" /> <ClCompile Include="..\..\src\aui\framemanager.cpp" />
<ClCompile Include="..\..\src\aui\tabart.cpp" /> <ClCompile Include="..\..\src\aui\tabart.cpp" />
<ClCompile Include="..\..\src\aui\tabartgtk.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\aui\tabartmsw.cpp" />
<ClCompile Include="..\..\src\aui\tabmdi.cpp" /> <ClCompile Include="..\..\src\aui\tabmdi.cpp" />
<ClCompile Include="..\..\src\common\accelcmn.cpp" /> <ClCompile Include="..\..\src\common\accelcmn.cpp" />
<ClCompile Include="..\..\src\common\accesscmn.cpp"> <ClCompile Include="..\..\src\common\accesscmn.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\common\addremovectrl.cpp" />
<ClCompile Include="..\..\src\common\affinematrix2d.cpp" /> <ClCompile Include="..\..\src\common\affinematrix2d.cpp" />
<ClCompile Include="..\..\src\common\anidecod.cpp" /> <ClCompile Include="..\..\src\common\anidecod.cpp" />
<ClCompile Include="..\..\src\common\animatecmn.cpp" /> <ClCompile Include="..\..\src\common\animatecmn.cpp" />
@ -710,7 +724,9 @@
<ClCompile Include="..\..\src\common\clrpickercmn.cpp" /> <ClCompile Include="..\..\src\common\clrpickercmn.cpp" />
<ClCompile Include="..\..\src\common\cmdline.cpp" /> <ClCompile Include="..\..\src\common\cmdline.cpp" />
<ClCompile Include="..\..\src\common\cmdproc.cpp" /> <ClCompile Include="..\..\src\common\cmdproc.cpp" />
<ClCompile Include="..\..\src\common\cmndata.cpp" /> <ClCompile Include="..\..\src\common\cmndata.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\colourcmn.cpp" /> <ClCompile Include="..\..\src\common\colourcmn.cpp" />
<ClCompile Include="..\..\src\common\colourdata.cpp" /> <ClCompile Include="..\..\src\common\colourdata.cpp" />
<ClCompile Include="..\..\src\common\combocmn.cpp" /> <ClCompile Include="..\..\src\common\combocmn.cpp" />
@ -799,7 +815,9 @@
<ClCompile Include="..\..\src\common\gdicmn.cpp" /> <ClCompile Include="..\..\src\common\gdicmn.cpp" />
<ClCompile Include="..\..\src\common\geometry.cpp" /> <ClCompile Include="..\..\src\common\geometry.cpp" />
<ClCompile Include="..\..\src\common\gifdecod.cpp" /> <ClCompile Include="..\..\src\common\gifdecod.cpp" />
<ClCompile Include="..\..\src\common\glcmn.cpp" /> <ClCompile Include="..\..\src\common\glcmn.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\graphcmn.cpp" /> <ClCompile Include="..\..\src\common\graphcmn.cpp" />
<ClCompile Include="..\..\src\common\gridcmn.cpp" /> <ClCompile Include="..\..\src\common\gridcmn.cpp" />
<ClCompile Include="..\..\src\common\hash.cpp" /> <ClCompile Include="..\..\src\common\hash.cpp" />
@ -869,20 +887,25 @@
<ClCompile Include="..\..\src\common\msgout.cpp" /> <ClCompile Include="..\..\src\common\msgout.cpp" />
<ClCompile Include="..\..\src\common\mstream.cpp" /> <ClCompile Include="..\..\src\common\mstream.cpp" />
<ClCompile Include="..\..\src\common\nbkbase.cpp" /> <ClCompile Include="..\..\src\common\nbkbase.cpp" />
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp" />
<ClCompile Include="..\..\src\common\numformatter.cpp" /> <ClCompile Include="..\..\src\common\numformatter.cpp" />
<ClCompile Include="..\..\src\common\object.cpp" /> <ClCompile Include="..\..\src\common\object.cpp" />
<ClCompile Include="..\..\src\common\odcombocmn.cpp" /> <ClCompile Include="..\..\src\common\odcombocmn.cpp" />
<ClCompile Include="..\..\src\common\overlaycmn.cpp" /> <ClCompile Include="..\..\src\common\overlaycmn.cpp" />
<ClCompile Include="..\..\src\common\ownerdrwcmn.cpp" /> <ClCompile Include="..\..\src\common\ownerdrwcmn.cpp" />
<ClCompile Include="..\..\src\common\panelcmn.cpp" /> <ClCompile Include="..\..\src\common\panelcmn.cpp" />
<ClCompile Include="..\..\src\common\paper.cpp" /> <ClCompile Include="..\..\src\common\paper.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\persist.cpp" /> <ClCompile Include="..\..\src\common\persist.cpp" />
<ClCompile Include="..\..\src\common\pickerbase.cpp" /> <ClCompile Include="..\..\src\common\pickerbase.cpp" />
<ClCompile Include="..\..\src\common\platinfo.cpp" /> <ClCompile Include="..\..\src\common\platinfo.cpp" />
<ClCompile Include="..\..\src\common\popupcmn.cpp" /> <ClCompile Include="..\..\src\common\popupcmn.cpp" />
<ClCompile Include="..\..\src\common\powercmn.cpp" /> <ClCompile Include="..\..\src\common\powercmn.cpp" />
<ClCompile Include="..\..\src\common\preferencescmn.cpp" /> <ClCompile Include="..\..\src\common\preferencescmn.cpp" />
<ClCompile Include="..\..\src\common\prntbase.cpp" /> <ClCompile Include="..\..\src\common\prntbase.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\process.cpp" /> <ClCompile Include="..\..\src\common\process.cpp" />
<ClCompile Include="..\..\src\common\protocol.cpp" /> <ClCompile Include="..\..\src\common\protocol.cpp" />
<ClCompile Include="..\..\src\common\quantize.cpp" /> <ClCompile Include="..\..\src\common\quantize.cpp" />
@ -991,6 +1014,7 @@
<ClCompile Include="..\..\src\common\zipstrm.cpp" /> <ClCompile Include="..\..\src\common\zipstrm.cpp" />
<ClCompile Include="..\..\src\common\zstream.cpp" /> <ClCompile Include="..\..\src\common\zstream.cpp" />
<ClCompile Include="..\..\src\generic\aboutdlgg.cpp" /> <ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
<ClCompile Include="..\..\src\generic\activityindicator.cpp" />
<ClCompile Include="..\..\src\generic\animateg.cpp" /> <ClCompile Include="..\..\src\generic\animateg.cpp" />
<ClCompile Include="..\..\src\generic\bannerwindow.cpp" /> <ClCompile Include="..\..\src\generic\bannerwindow.cpp" />
<ClCompile Include="..\..\src\generic\bmpcboxg.cpp"> <ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
@ -1004,6 +1028,7 @@
<ClCompile Include="..\..\src\generic\choicbkg.cpp" /> <ClCompile Include="..\..\src\generic\choicbkg.cpp" />
<ClCompile Include="..\..\src\generic\choicdgg.cpp" /> <ClCompile Include="..\..\src\generic\choicdgg.cpp" />
<ClCompile Include="..\..\src\generic\clrpickerg.cpp" /> <ClCompile Include="..\..\src\generic\clrpickerg.cpp" />
<ClCompile Include="..\..\src\generic\collheaderctrlg.cpp" />
<ClCompile Include="..\..\src\generic\collpaneg.cpp" /> <ClCompile Include="..\..\src\generic\collpaneg.cpp" />
<ClCompile Include="..\..\src\generic\colrdlgg.cpp" /> <ClCompile Include="..\..\src\generic\colrdlgg.cpp" />
<ClCompile Include="..\..\src\generic\combog.cpp"> <ClCompile Include="..\..\src\generic\combog.cpp">
@ -1064,7 +1089,9 @@
<ClCompile Include="..\..\src\generic\printps.cpp"> <ClCompile Include="..\..\src\generic\printps.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\generic\prntdlgg.cpp" /> <ClCompile Include="..\..\src\generic\prntdlgg.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\generic\progdlgg.cpp" /> <ClCompile Include="..\..\src\generic\progdlgg.cpp" />
<ClCompile Include="..\..\src\generic\propdlg.cpp" /> <ClCompile Include="..\..\src\generic\propdlg.cpp" />
<ClCompile Include="..\..\src\generic\regiong.cpp"> <ClCompile Include="..\..\src\generic\regiong.cpp">
@ -1101,6 +1128,7 @@
<ClCompile Include="..\..\src\msw\accel.cpp" /> <ClCompile Include="..\..\src\msw\accel.cpp" />
<ClCompile Include="..\..\src\msw\anybutton.cpp" /> <ClCompile Include="..\..\src\msw\anybutton.cpp" />
<ClCompile Include="..\..\src\msw\app.cpp" /> <ClCompile Include="..\..\src\msw\app.cpp" />
<ClCompile Include="..\..\src\msw\appprogress.cpp" />
<ClCompile Include="..\..\src\msw\artmsw.cpp" /> <ClCompile Include="..\..\src\msw\artmsw.cpp" />
<ClCompile Include="..\..\src\msw\basemsw.cpp" /> <ClCompile Include="..\..\src\msw\basemsw.cpp" />
<ClCompile Include="..\..\src\msw\bitmap.cpp" /> <ClCompile Include="..\..\src\msw\bitmap.cpp" />
@ -1133,7 +1161,9 @@
<ClCompile Include="..\..\src\msw\dc.cpp" /> <ClCompile Include="..\..\src\msw\dc.cpp" />
<ClCompile Include="..\..\src\msw\dcclient.cpp" /> <ClCompile Include="..\..\src\msw\dcclient.cpp" />
<ClCompile Include="..\..\src\msw\dcmemory.cpp" /> <ClCompile Include="..\..\src\msw\dcmemory.cpp" />
<ClCompile Include="..\..\src\msw\dcprint.cpp" /> <ClCompile Include="..\..\src\msw\dcprint.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\dcscreen.cpp" /> <ClCompile Include="..\..\src\msw\dcscreen.cpp" />
<ClCompile Include="..\..\src\msw\dde.cpp" /> <ClCompile Include="..\..\src\msw\dde.cpp" />
<ClCompile Include="..\..\src\msw\debughlp.cpp" /> <ClCompile Include="..\..\src\msw\debughlp.cpp" />
@ -1168,13 +1198,20 @@
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\msw\gdiplus.cpp" /> <ClCompile Include="..\..\src\msw\gdiplus.cpp" />
<ClCompile Include="..\..\src\msw\glcanvas.cpp" /> <ClCompile Include="..\..\src\msw\glcanvas.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\graphics.cpp" /> <ClCompile Include="..\..\src\msw\graphics.cpp" />
<ClCompile Include="..\..\src\msw\graphicsd2d.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\headerctrl.cpp" /> <ClCompile Include="..\..\src\msw\headerctrl.cpp" />
<ClCompile Include="..\..\src\msw\helpbest.cpp"> <ClCompile Include="..\..\src\msw\helpbest.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\msw\helpchm.cpp" /> <ClCompile Include="..\..\src\msw\helpchm.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\helpwin.cpp" /> <ClCompile Include="..\..\src\msw\helpwin.cpp" />
<ClCompile Include="..\..\src\msw\hyperlink.cpp" /> <ClCompile Include="..\..\src\msw\hyperlink.cpp" />
<ClCompile Include="..\..\src\msw\icon.cpp" /> <ClCompile Include="..\..\src\msw\icon.cpp" />
@ -1203,13 +1240,9 @@
<ClCompile Include="..\..\src\msw\metafile.cpp"> <ClCompile Include="..\..\src\msw\metafile.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\msw\microwin.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\mimetype.cpp" /> <ClCompile Include="..\..\src\msw\mimetype.cpp" />
<ClCompile Include="..\..\src\msw\minifram.cpp" /> <ClCompile Include="..\..\src\msw\minifram.cpp" />
<ClCompile Include="..\..\src\msw\msgdlg.cpp" /> <ClCompile Include="..\..\src\msw\msgdlg.cpp" />
<ClCompile Include="..\..\src\msw\mslu.cpp" />
<ClCompile Include="..\..\src\msw\nativdlg.cpp" /> <ClCompile Include="..\..\src\msw\nativdlg.cpp" />
<ClCompile Include="..\..\src\msw\nativewin.cpp" /> <ClCompile Include="..\..\src\msw\nativewin.cpp" />
<ClCompile Include="..\..\src\msw\nonownedwnd.cpp" /> <ClCompile Include="..\..\src\msw\nonownedwnd.cpp" />
@ -1218,7 +1251,9 @@
<ClCompile Include="..\..\src\msw\ole\access.cpp"> <ClCompile Include="..\..\src\msw\ole\access.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\msw\ole\activex.cpp" /> <ClCompile Include="..\..\src\msw\ole\activex.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\ole\automtn.cpp" /> <ClCompile Include="..\..\src\msw\ole\automtn.cpp" />
<ClCompile Include="..\..\src\msw\ole\dataobj.cpp" /> <ClCompile Include="..\..\src\msw\ole\dataobj.cpp" />
<ClCompile Include="..\..\src\msw\ole\dropsrc.cpp" /> <ClCompile Include="..\..\src\msw\ole\dropsrc.cpp" />
@ -1230,11 +1265,14 @@
<ClCompile Include="..\..\src\msw\palette.cpp" /> <ClCompile Include="..\..\src\msw\palette.cpp" />
<ClCompile Include="..\..\src\msw\panel.cpp" /> <ClCompile Include="..\..\src\msw\panel.cpp" />
<ClCompile Include="..\..\src\msw\pen.cpp" /> <ClCompile Include="..\..\src\msw\pen.cpp" />
<ClCompile Include="..\..\src\msw\penwin.cpp" />
<ClCompile Include="..\..\src\msw\popupwin.cpp" /> <ClCompile Include="..\..\src\msw\popupwin.cpp" />
<ClCompile Include="..\..\src\msw\power.cpp" /> <ClCompile Include="..\..\src\msw\power.cpp" />
<ClCompile Include="..\..\src\msw\printdlg.cpp" /> <ClCompile Include="..\..\src\msw\printdlg.cpp">
<ClCompile Include="..\..\src\msw\printwin.cpp" /> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\printwin.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\progdlg.cpp" /> <ClCompile Include="..\..\src\msw\progdlg.cpp" />
<ClCompile Include="..\..\src\msw\radiobox.cpp" /> <ClCompile Include="..\..\src\msw\radiobox.cpp" />
<ClCompile Include="..\..\src\msw\radiobut.cpp" /> <ClCompile Include="..\..\src\msw\radiobut.cpp" />
@ -1259,7 +1297,9 @@
<ClCompile Include="..\..\src\msw\stattext.cpp" /> <ClCompile Include="..\..\src\msw\stattext.cpp" />
<ClCompile Include="..\..\src\msw\statusbar.cpp" /> <ClCompile Include="..\..\src\msw\statusbar.cpp" />
<ClCompile Include="..\..\src\msw\stdpaths.cpp" /> <ClCompile Include="..\..\src\msw\stdpaths.cpp" />
<ClCompile Include="..\..\src\msw\systhemectrl.cpp" />
<ClCompile Include="..\..\src\msw\taskbar.cpp" /> <ClCompile Include="..\..\src\msw\taskbar.cpp" />
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp" />
<ClCompile Include="..\..\src\msw\textctrl.cpp" /> <ClCompile Include="..\..\src\msw\textctrl.cpp" />
<ClCompile Include="..\..\src\msw\textentry.cpp" /> <ClCompile Include="..\..\src\msw\textentry.cpp" />
<ClCompile Include="..\..\src\msw\textmeasure.cpp" /> <ClCompile Include="..\..\src\msw\textmeasure.cpp" />
@ -1340,4 +1380,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

View File

@ -34,6 +34,12 @@
<Filter Include="MSW\ole"> <Filter Include="MSW\ole">
<UniqueIdentifier>{302035ca-b308-4626-83f9-60c08f3015c9}</UniqueIdentifier> <UniqueIdentifier>{302035ca-b308-4626-83f9-60c08f3015c9}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Headers\AUI">
<UniqueIdentifier>{73f456f5-1828-4572-86a5-6dc15050fb79}</UniqueIdentifier>
</Filter>
<Filter Include="Headers\Generic\private">
<UniqueIdentifier>{f6d51fb6-68c8-4855-8b5c-ef3717f3e1d3}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\wx\setup.h"> <ClInclude Include="..\..\wx\setup.h">
@ -138,9 +144,6 @@
<ClInclude Include="..\..\include\wx\button.h"> <ClInclude Include="..\..\include\wx\button.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\cairo.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\calctrl.h"> <ClInclude Include="..\..\include\wx\calctrl.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
@ -873,9 +876,6 @@
<ClInclude Include="..\..\include\wx\settings.h"> <ClInclude Include="..\..\include\wx\settings.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\setup_gccxml.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\setup_inc.h"> <ClInclude Include="..\..\include\wx\setup_inc.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
@ -1173,33 +1173,6 @@
<ClInclude Include="..\..\include\wx\wx.h"> <ClInclude Include="..\..\include\wx\wx.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\wx_cw.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cw_cm.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cw_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cwc.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cwc_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cwcocoa.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cwcocoa_cm.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cwcocoa_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wx_cwu_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxchar.h"> <ClInclude Include="..\..\include\wx\wxchar.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
@ -1218,30 +1191,6 @@
<ClInclude Include="..\..\include\wx\wxprec.h"> <ClInclude Include="..\..\include\wx\wxprec.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\wxshlb_cw.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxshlb_cw_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxshlb_cwc.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxshlb_cwc_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxshlba_cw.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxshlba_cw_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxshlba_cwc.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\wxshlba_cwc_d.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xlocale.h"> <ClInclude Include="..\..\include\wx\xlocale.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
@ -1488,9 +1437,6 @@
<ClInclude Include="..\..\include\wx\msw\metafile.h"> <ClInclude Include="..\..\include\wx\msw\metafile.h">
<Filter>Headers\MSW</Filter> <Filter>Headers\MSW</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\msw\microwin.h">
<Filter>Headers\MSW</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\mimetype.h"> <ClInclude Include="..\..\include\wx\msw\mimetype.h">
<Filter>Headers\MSW</Filter> <Filter>Headers\MSW</Filter>
</ClInclude> </ClInclude>
@ -1500,9 +1446,6 @@
<ClInclude Include="..\..\include\wx\msw\missing.h"> <ClInclude Include="..\..\include\wx\msw\missing.h">
<Filter>Headers\MSW</Filter> <Filter>Headers\MSW</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\msw\mslu.h">
<Filter>Headers\MSW</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\msvcrt.h"> <ClInclude Include="..\..\include\wx\msw\msvcrt.h">
<Filter>Headers\MSW</Filter> <Filter>Headers\MSW</Filter>
</ClInclude> </ClInclude>
@ -1512,9 +1455,6 @@
<ClInclude Include="..\..\include\wx\msw\notebook.h"> <ClInclude Include="..\..\include\wx\msw\notebook.h">
<Filter>Headers\MSW</Filter> <Filter>Headers\MSW</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\msw\notifmsg.h">
<Filter>Headers\MSW</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\ownerdrw.h"> <ClInclude Include="..\..\include\wx\msw\ownerdrw.h">
<Filter>Headers\MSW</Filter> <Filter>Headers\MSW</Filter>
</ClInclude> </ClInclude>
@ -1977,6 +1917,96 @@
<ClInclude Include="..\..\include\wx\msw\ole\uuid.h"> <ClInclude Include="..\..\include\wx\msw\ole\uuid.h">
<Filter>Headers\MSW\ole</Filter> <Filter>Headers\MSW\ole</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\wx\activityindicator.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\addremovectrl.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\appprogress.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\collheaderctrl.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\activityindicator.h">
<Filter>Headers\Generic</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\collheaderctrl.h">
<Filter>Headers\Generic</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\appprogress.h">
<Filter>Headers\MSW</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\ownerdrawnbutton.h">
<Filter>Headers\MSW</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h">
<Filter>Headers\MSW</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\private\event.h">
<Filter>Headers\MSW\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\aui.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\auibar.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\auibook.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\barartmsw.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\dockart.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\floatpane.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\framemanager.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\tabart.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\tabartgtk.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\tabartmsw.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\aui\tabmdi.h">
<Filter>Headers\AUI</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\addremovectrl.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\grid.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\listctrl.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\markuptext.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\notifmsg.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\richtooltip.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\textmeasure.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\timer.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\generic\private\widthcalc.h">
<Filter>Headers\Generic\private</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\aui\auibar.cpp"> <ClCompile Include="..\..\src\aui\auibar.cpp">
@ -3218,9 +3248,6 @@
<ClCompile Include="..\..\src\msw\metafile.cpp"> <ClCompile Include="..\..\src\msw\metafile.cpp">
<Filter>MSW</Filter> <Filter>MSW</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\msw\microwin.c">
<Filter>MSW</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\mimetype.cpp"> <ClCompile Include="..\..\src\msw\mimetype.cpp">
<Filter>MSW</Filter> <Filter>MSW</Filter>
</ClCompile> </ClCompile>
@ -3230,9 +3257,6 @@
<ClCompile Include="..\..\src\msw\msgdlg.cpp"> <ClCompile Include="..\..\src\msw\msgdlg.cpp">
<Filter>MSW</Filter> <Filter>MSW</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\msw\mslu.cpp">
<Filter>MSW</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\nativdlg.cpp"> <ClCompile Include="..\..\src\msw\nativdlg.cpp">
<Filter>MSW</Filter> <Filter>MSW</Filter>
</ClCompile> </ClCompile>
@ -3260,9 +3284,6 @@
<ClCompile Include="..\..\src\msw\pen.cpp"> <ClCompile Include="..\..\src\msw\pen.cpp">
<Filter>MSW</Filter> <Filter>MSW</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\msw\penwin.cpp">
<Filter>MSW</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\popupwin.cpp"> <ClCompile Include="..\..\src\msw\popupwin.cpp">
<Filter>MSW</Filter> <Filter>MSW</Filter>
</ClCompile> </ClCompile>
@ -3443,6 +3464,39 @@
<ClCompile Include="..\..\src\common\textmeasurecmn.cpp" /> <ClCompile Include="..\..\src\common\textmeasurecmn.cpp" />
<ClCompile Include="..\..\src\common\threadinfo.cpp" /> <ClCompile Include="..\..\src\common\threadinfo.cpp" />
<ClCompile Include="..\..\src\msw\ole\safearray.cpp" /> <ClCompile Include="..\..\src\msw\ole\safearray.cpp" />
<ClCompile Include="..\..\src\aui\barartmsw.cpp">
<Filter>AUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\aui\tabartgtk.cpp">
<Filter>AUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\aui\tabartmsw.cpp">
<Filter>AUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\addremovectrl.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\notifmsgcmn.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\activityindicator.cpp">
<Filter>Generic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\generic\collheaderctrlg.cpp">
<Filter>Generic</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\appprogress.cpp">
<Filter>MSW</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\graphicsd2d.cpp">
<Filter>MSW</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\systhemectrl.cpp">
<Filter>MSW</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp">
<Filter>MSW</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\src\common\unictabl.inc"> <None Include="..\..\src\common\unictabl.inc">

View File

@ -1,7 +1,9 @@
#!/bin/bash #!/bin/bash
svn co -r 75363 http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets #svn co -r 75363 http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets
git clone https://github.com/wxWidgets/wxWidgets.git
cd wxWidgets cd wxWidgets
git checkout cbb799b1ae3f309c99beb0d287e9bb3b62ea405c
case $OSTYPE in case $OSTYPE in
darwin*) darwin*)
@ -11,11 +13,12 @@ ADD_OPTS=--with-macosx-version-min=10.7 --enable-stl
;; ;;
linux*) linux*)
BACKEND="gtk" BACKEND="gtk"
ADD_OPTS=--without-gtkprint
;; ;;
esac esac
mkdir build-local mkdir build-local
cd 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 $ADD_OPTS ../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 make

View File

@ -63,6 +63,8 @@
#define wxCOMPILER_PREFIX vc110 #define wxCOMPILER_PREFIX vc110
#elif _MSC_VER == 1800 #elif _MSC_VER == 1800
#define wxCOMPILER_PREFIX vc120 #define wxCOMPILER_PREFIX vc120
#elif _MSC_VER == 1900
#define wxCOMPILER_PREFIX vc140
#else #else
#error "Unknown MSVC compiler version, please report to wx-dev." #error "Unknown MSVC compiler version, please report to wx-dev."
#endif #endif
@ -153,17 +155,20 @@
#endif #endif
#pragma comment(lib, wxBASE_LIB_NAME("net")) #pragma comment(lib, wxBASE_LIB_NAME("net"))
#endif #endif
#ifndef wxNO_XML_LIB #if wxUSE_XML && !defined(wxNO_XML_LIB)
#pragma comment(lib, wxBASE_LIB_NAME("xml")) #pragma comment(lib, wxBASE_LIB_NAME("xml"))
#if !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
#endif
#endif #endif
#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL) #if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex")) #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
#endif #endif
#if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB) && !defined(WXUSINGDLL)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
#endif
#if wxUSE_GUI #if wxUSE_GUI
#if wxUSE_XML && !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
#endif
#if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB) && !defined(WXUSINGDLL) #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB) && !defined(WXUSINGDLL)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg")) #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
#endif #endif
@ -173,9 +178,6 @@
#if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB) && !defined(WXUSINGDLL) #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB) && !defined(WXUSINGDLL)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff")) #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
#endif #endif
#if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB) && !defined(WXUSINGDLL)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
#endif
#pragma comment(lib, wxTOOLKIT_LIB_NAME("core")) #pragma comment(lib, wxTOOLKIT_LIB_NAME("core"))
@ -183,7 +185,7 @@
#pragma comment(lib, wxTOOLKIT_LIB_NAME("adv")) #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))
#endif #endif
#ifndef wxNO_HTML_LIB #if wxUSE_HTML && !defined(wxNO_HTML_LIB)
#pragma comment(lib, wxTOOLKIT_LIB_NAME("html")) #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
#endif #endif
#if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB) #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
@ -243,8 +245,13 @@
#endif #endif
#ifdef __WXGTK__ #ifdef __WXGTK__
#pragma comment(lib, "gtk-win32-2.0.lib") #ifdef __WXGTK3__
#pragma comment(lib, "gdk-win32-2.0.lib") #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, "pangocairo-1.0.lib")
#pragma comment(lib, "gdk_pixbuf-2.0.lib") #pragma comment(lib, "gdk_pixbuf-2.0.lib")
#pragma comment(lib, "cairo.lib") #pragma comment(lib, "cairo.lib")

View File

@ -32,7 +32,7 @@ enum wxAcceleratorEntryFlags
wxACCEL_ALT = 0x0001, // hold Alt key down wxACCEL_ALT = 0x0001, // hold Alt key down
wxACCEL_CTRL = 0x0002, // hold Ctrl key down wxACCEL_CTRL = 0x0002, // hold Ctrl key down
wxACCEL_SHIFT = 0x0004, // hold Shift key down wxACCEL_SHIFT = 0x0004, // hold Shift key down
#if defined(__WXMAC__) || defined(__WXCOCOA__) #if defined(__WXMAC__)
wxACCEL_RAW_CTRL= 0x0008, // wxACCEL_RAW_CTRL= 0x0008, //
#else #else
wxACCEL_RAW_CTRL= wxACCEL_CTRL, wxACCEL_RAW_CTRL= wxACCEL_CTRL,
@ -164,10 +164,8 @@ private:
#include "wx/gtk1/accel.h" #include "wx/gtk1/accel.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/osx/accel.h" #include "wx/osx/accel.h"
#elif defined(__WXCOCOA__) #elif defined(__WXQT__)
#include "wx/generic/accel.h" #include "wx/qt/accel.h"
#elif defined(__WXPM__)
#include "wx/os2/accel.h"
#endif #endif
extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;

View File

@ -21,14 +21,14 @@
#include "wx/variant.h" #include "wx/variant.h"
typedef enum enum wxAccStatus
{ {
wxACC_FAIL, wxACC_FAIL,
wxACC_FALSE, wxACC_FALSE,
wxACC_OK, wxACC_OK,
wxACC_NOT_IMPLEMENTED, wxACC_NOT_IMPLEMENTED,
wxACC_NOT_SUPPORTED wxACC_NOT_SUPPORTED
} wxAccStatus; };
// Child ids are integer identifiers from 1 up. // Child ids are integer identifiers from 1 up.
// So zero represents 'this' object. // So zero represents 'this' object.
@ -36,7 +36,7 @@ typedef enum
// Navigation constants // Navigation constants
typedef enum enum wxNavDir
{ {
wxNAVDIR_DOWN, wxNAVDIR_DOWN,
wxNAVDIR_FIRSTCHILD, wxNAVDIR_FIRSTCHILD,
@ -46,11 +46,11 @@ typedef enum
wxNAVDIR_PREVIOUS, wxNAVDIR_PREVIOUS,
wxNAVDIR_RIGHT, wxNAVDIR_RIGHT,
wxNAVDIR_UP wxNAVDIR_UP
} wxNavDir; };
// Role constants // Role constants
typedef enum { enum wxAccRole {
wxROLE_NONE, wxROLE_NONE,
wxROLE_SYSTEM_ALERT, wxROLE_SYSTEM_ALERT,
wxROLE_SYSTEM_ANIMATION, wxROLE_SYSTEM_ANIMATION,
@ -113,11 +113,11 @@ typedef enum {
wxROLE_SYSTEM_TOOLTIP, wxROLE_SYSTEM_TOOLTIP,
wxROLE_SYSTEM_WHITESPACE, wxROLE_SYSTEM_WHITESPACE,
wxROLE_SYSTEM_WINDOW wxROLE_SYSTEM_WINDOW
} wxAccRole; };
// Object types // Object types
typedef enum { enum wxAccObject {
wxOBJID_WINDOW = 0x00000000, wxOBJID_WINDOW = 0x00000000,
wxOBJID_SYSMENU = 0xFFFFFFFF, wxOBJID_SYSMENU = 0xFFFFFFFF,
wxOBJID_TITLEBAR = 0xFFFFFFFE, wxOBJID_TITLEBAR = 0xFFFFFFFE,
@ -130,7 +130,7 @@ typedef enum {
wxOBJID_CURSOR = 0xFFFFFFF7, wxOBJID_CURSOR = 0xFFFFFFF7,
wxOBJID_ALERT = 0xFFFFFFF6, wxOBJID_ALERT = 0xFFFFFFF6,
wxOBJID_SOUND = 0xFFFFFFF5 wxOBJID_SOUND = 0xFFFFFFF5
} wxAccObject; };
// Accessible states // Accessible states
@ -163,7 +163,7 @@ typedef enum {
// Selection flag // Selection flag
typedef enum enum wxAccSelectionFlags
{ {
wxACC_SEL_NONE = 0, wxACC_SEL_NONE = 0,
wxACC_SEL_TAKEFOCUS = 1, wxACC_SEL_TAKEFOCUS = 1,
@ -171,7 +171,7 @@ typedef enum
wxACC_SEL_EXTENDSELECTION = 4, wxACC_SEL_EXTENDSELECTION = 4,
wxACC_SEL_ADDSELECTION = 8, wxACC_SEL_ADDSELECTION = 8,
wxACC_SEL_REMOVESELECTION = 16 wxACC_SEL_REMOVESELECTION = 16
} wxAccSelectionFlags; };
// Accessibility event identifiers // Accessibility event identifiers

View File

@ -0,0 +1,60 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/activityindicator.h
// Purpose: wxActivityIndicator declaration.
// Author: Vadim Zeitlin
// Created: 2015-03-05
// Copyright: (c) 2015 Vadim Zeitlin <vadim@wxwidgets.org>
// 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_

View File

@ -0,0 +1,109 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/addremovectrl.h
// Purpose: wxAddRemoveCtrl declaration.
// Author: Vadim Zeitlin
// Created: 2015-01-29
// Copyright: (c) 2015 Vadim Zeitlin <vadim@wxwidgets.org>
// 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_

View File

@ -28,19 +28,19 @@ public:
} }
// Implement base class pure virtual methods. // Implement base class pure virtual methods.
virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr); virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) wxOVERRIDE;
virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const; virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const wxOVERRIDE;
virtual void Concat(const wxAffineMatrix2DBase& t); virtual void Concat(const wxAffineMatrix2DBase& t) wxOVERRIDE;
virtual bool Invert(); virtual bool Invert() wxOVERRIDE;
virtual bool IsIdentity() const; virtual bool IsIdentity() const wxOVERRIDE;
virtual bool IsEqual(const wxAffineMatrix2DBase& t) const; virtual bool IsEqual(const wxAffineMatrix2DBase& t) const wxOVERRIDE;
virtual void Translate(wxDouble dx, wxDouble dy); virtual void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE;
virtual void Scale(wxDouble xScale, wxDouble yScale); virtual void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE;
virtual void Rotate(wxDouble cRadians); virtual void Rotate(wxDouble cRadians) wxOVERRIDE;
protected: protected:
virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const; virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const wxOVERRIDE;
virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const; virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const wxOVERRIDE;
private: private:
wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty; wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;

View File

@ -18,24 +18,7 @@
// undo what we did in wx/beforestd.h // undo what we did in wx/beforestd.h
#if defined(__VISUALC__) && __VISUALC__ <= 1201 #if defined(__VISUALC__) && __VISUALC__ <= 1201
// MSVC 5 does not have this #pragma warning(pop)
#if _MSC_VER > 1100
#pragma warning(pop)
#else
// 'expression' : signed/unsigned mismatch
#pragma warning(default:4018)
// 'identifier' : unreferenced formal parameter
#pragma warning(default:4100)
// 'conversion' : conversion from 'type1' to 'type2',
// possible loss of data
#pragma warning(default:4244)
// C++ language change: to explicitly specialize class template
// 'identifier' use the following syntax
#pragma warning(default:4663)
#endif
#endif #endif
// see beforestd.h for explanation // see beforestd.h for explanation

View File

@ -36,26 +36,26 @@ public:
~wxANIDecoder(); ~wxANIDecoder();
virtual wxSize GetFrameSize(unsigned int frame) const; virtual wxSize GetFrameSize(unsigned int frame) const wxOVERRIDE;
virtual wxPoint GetFramePosition(unsigned int frame) const; virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE;
virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE;
virtual long GetDelay(unsigned int frame) const; virtual long GetDelay(unsigned int frame) const wxOVERRIDE;
virtual wxColour GetTransparentColour(unsigned int frame) const; virtual wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE;
// implementation of wxAnimationDecoder's pure virtuals // implementation of wxAnimationDecoder's pure virtuals
virtual bool Load( wxInputStream& stream ); virtual bool Load( wxInputStream& stream ) wxOVERRIDE;
bool ConvertToImage(unsigned int frame, wxImage *image) const; bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE;
wxAnimationDecoder *Clone() const wxAnimationDecoder *Clone() const wxOVERRIDE
{ return new wxANIDecoder; } { return new wxANIDecoder; }
wxAnimationType GetType() const wxAnimationType GetType() const wxOVERRIDE
{ return wxANIMATION_TYPE_ANI; } { return wxANIMATION_TYPE_ANI; }
private: private:
// wxAnimationDecoder pure virtual: // wxAnimationDecoder pure virtual:
virtual bool DoCanRead( wxInputStream& stream ) const; virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
// modifies current stream position (see wxAnimationDecoder::CanRead) // modifies current stream position (see wxAnimationDecoder::CanRead)
// frames stored as wxImage(s): ANI files are meant to be used mostly for animated // frames stored as wxImage(s): ANI files are meant to be used mostly for animated

View File

@ -50,7 +50,7 @@ public:
wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
protected: protected:
DECLARE_ABSTRACT_CLASS(wxAnimationBase) wxDECLARE_ABSTRACT_CLASS(wxAnimationBase);
}; };
@ -106,7 +106,7 @@ protected:
virtual void DisplayStaticImage() = 0; virtual void DisplayStaticImage() = 0;
private: private:
DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase) wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase);
}; };

View File

@ -102,16 +102,10 @@ public:
Use this template function for checking if wxAnyValueType represents Use this template function for checking if wxAnyValueType represents
a specific C++ data type. a specific C++ data type.
@remarks This template function does not work on some older compilers
(such as Visual C++ 6.0). For full compiler compatibility
please use wxANY_VALUE_TYPE_CHECK_TYPE(valueTypePtr, T) macro
instead.
@see wxAny::CheckType() @see wxAny::CheckType()
*/ */
// FIXME-VC6: remove this hack when VC6 is no longer supported
template <typename T> template <typename T>
bool CheckType(T* reserved = NULL) const; bool CheckType() const;
#if wxUSE_EXTENDED_RTTI #if wxUSE_EXTENDED_RTTI
virtual const wxTypeInfo* GetTypeInfo() const = 0; virtual const wxTypeInfo* GetTypeInfo() const = 0;
@ -139,8 +133,9 @@ private:
}; };
// // Deprecated macro for checking the type which was originally introduced for
// This method of checking the type is compatible with VC6 // 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) \ #define wxANY_VALUE_TYPE_CHECK_TYPE(valueTypePtr, T) \
wxAnyValueTypeImpl<T>::IsSameClass(valueTypePtr) wxAnyValueTypeImpl<T>::IsSameClass(valueTypePtr)
@ -164,13 +159,17 @@ private:
public: \ public: \
static bool IsSameClass(const wxAnyValueType* otherType) \ static bool IsSameClass(const wxAnyValueType* otherType) \
{ \ { \
return wxTypeId(*sm_instance.get()) == wxTypeId(*otherType); \ return AreSameClasses(*sm_instance.get(), *otherType); \
} \ } \
virtual bool IsSameType(const wxAnyValueType* otherType) const \ virtual bool IsSameType(const wxAnyValueType* otherType) const wxOVERRIDE \
{ \ { \
return IsSameClass(otherType); \ return IsSameClass(otherType); \
} \ } \
private: \ private: \
static bool AreSameClasses(const wxAnyValueType& a, const wxAnyValueType& b) \
{ \
return wxTypeId(a) == wxTypeId(b); \
} \
static wxAnyValueTypeScopedPtr sm_instance; \ static wxAnyValueTypeScopedPtr sm_instance; \
public: \ public: \
static wxAnyValueType* GetInstance() \ static wxAnyValueType* GetInstance() \
@ -183,12 +182,6 @@ public: \
wxAnyValueTypeScopedPtr CLS::sm_instance(new CLS()); wxAnyValueTypeScopedPtr CLS::sm_instance(new CLS());
#ifdef __VISUALC6__
// "non dll-interface class 'xxx' used as base interface
#pragma warning (push)
#pragma warning (disable:4275)
#endif
/** /**
Following are helper classes for the wxAnyValueTypeImplBase. Following are helper classes for the wxAnyValueTypeImplBase.
*/ */
@ -201,11 +194,7 @@ class wxAnyValueTypeOpsInplace
public: public:
static void DeleteValue(wxAnyValueBuffer& buf) static void DeleteValue(wxAnyValueBuffer& buf)
{ {
T* value = reinterpret_cast<T*>(&buf.m_buffer[0]); GetValue(buf).~T();
value->~T();
// Some compiler may given 'unused variable' warnings without this
wxUnusedVar(value);
} }
static void SetValue(const T& value, static void SetValue(const T& value,
@ -218,11 +207,17 @@ public:
static const T& GetValue(const wxAnyValueBuffer& buf) static const T& GetValue(const wxAnyValueBuffer& buf)
{ {
// Breaking this code into two lines should suppress // Use a union to avoid undefined behaviour (and gcc -Wstrict-alias
// GCC's 'type-punned pointer will break strict-aliasing rules' // warnings about it) which would occur if we just casted a wxByte
// warning. // pointer to a T one.
const T* value = reinterpret_cast<const T*>(&buf.m_buffer[0]); union
return *value; {
const T* ptr;
const wxByte *buf;
} u;
u.buf = buf.m_buffer;
return *u.ptr;
} }
}; };
@ -266,6 +261,10 @@ public:
} }
}; };
template <typename T>
struct wxAnyAsImpl;
} // namespace wxPrivate } // namespace wxPrivate
@ -288,13 +287,13 @@ public:
wxAnyValueTypeImplBase() : wxAnyValueType() { } wxAnyValueTypeImplBase() : wxAnyValueType() { }
virtual ~wxAnyValueTypeImplBase() { } virtual ~wxAnyValueTypeImplBase() { }
virtual void DeleteValue(wxAnyValueBuffer& buf) const virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
{ {
Ops::DeleteValue(buf); Ops::DeleteValue(buf);
} }
virtual void CopyBuffer(const wxAnyValueBuffer& src, virtual void CopyBuffer(const wxAnyValueBuffer& src,
wxAnyValueBuffer& dst) const wxAnyValueBuffer& dst) const wxOVERRIDE
{ {
Ops::SetValue(Ops::GetValue(src), dst); Ops::SetValue(Ops::GetValue(src), dst);
} }
@ -340,7 +339,7 @@ public:
virtual bool ConvertValue(const wxAnyValueBuffer& src, virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType, wxAnyValueType* dstType,
wxAnyValueBuffer& dst) const wxAnyValueBuffer& dst) const wxOVERRIDE
{ {
wxUnusedVar(src); wxUnusedVar(src);
wxUnusedVar(dstType); wxUnusedVar(dstType);
@ -418,7 +417,7 @@ public:
virtual bool ConvertValue(const wxAnyValueBuffer& src, virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType, wxAnyValueType* dstType,
wxAnyValueBuffer& dst) const; wxAnyValueBuffer& dst) const wxOVERRIDE;
}; };
@ -433,7 +432,7 @@ public:
virtual bool ConvertValue(const wxAnyValueBuffer& src, virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType, wxAnyValueType* dstType,
wxAnyValueBuffer& dst) const; wxAnyValueBuffer& dst) const wxOVERRIDE;
}; };
@ -469,7 +468,7 @@ public: \
virtual ~wxAnyValueTypeImpl##TYPENAME() { } \ virtual ~wxAnyValueTypeImpl##TYPENAME() { } \
virtual bool ConvertValue(const wxAnyValueBuffer& src, \ virtual bool ConvertValue(const wxAnyValueBuffer& src, \
wxAnyValueType* dstType, \ wxAnyValueType* dstType, \
wxAnyValueBuffer& dst) const \ wxAnyValueBuffer& dst) const wxOVERRIDE \
{ \ { \
GV value = GetValue(src); \ GV value = GetValue(src); \
return CONVFUNC(value, dstType, dst); \ return CONVFUNC(value, dstType, dst); \
@ -520,7 +519,7 @@ public:
virtual bool ConvertValue(const wxAnyValueBuffer& src, virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType, wxAnyValueType* dstType,
wxAnyValueBuffer& dst) const; wxAnyValueBuffer& dst) const wxOVERRIDE;
}; };
// //
@ -537,7 +536,7 @@ public:
virtual bool ConvertValue(const wxAnyValueBuffer& src, virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType, wxAnyValueType* dstType,
wxAnyValueBuffer& dst) const; wxAnyValueBuffer& dst) const wxOVERRIDE;
}; };
// WX_ANY_DEFINE_SUB_TYPE requires this // WX_ANY_DEFINE_SUB_TYPE requires this
@ -565,7 +564,7 @@ public: \
\ \
virtual bool ConvertValue(const wxAnyValueBuffer& src, \ virtual bool ConvertValue(const wxAnyValueBuffer& src, \
wxAnyValueType* dstType, \ wxAnyValueType* dstType, \
wxAnyValueBuffer& dst) const \ wxAnyValueBuffer& dst) const wxOVERRIDE \
{ \ { \
wxUnusedVar(src); \ wxUnusedVar(src); \
wxUnusedVar(dstType); \ wxUnusedVar(dstType); \
@ -614,7 +613,7 @@ public:
wxAnyValueTypeImplBase<wxVariantData*>() { } wxAnyValueTypeImplBase<wxVariantData*>() { }
virtual ~wxAnyValueTypeImplVariantData() { } virtual ~wxAnyValueTypeImplVariantData() { }
virtual void DeleteValue(wxAnyValueBuffer& buf) const virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
{ {
wxVariantData* data = static_cast<wxVariantData*>(buf.m_ptr); wxVariantData* data = static_cast<wxVariantData*>(buf.m_ptr);
if ( data ) if ( data )
@ -622,7 +621,7 @@ public:
} }
virtual void CopyBuffer(const wxAnyValueBuffer& src, virtual void CopyBuffer(const wxAnyValueBuffer& src,
wxAnyValueBuffer& dst) const wxAnyValueBuffer& dst) const wxOVERRIDE
{ {
wxVariantData* data = static_cast<wxVariantData*>(src.m_ptr); wxVariantData* data = static_cast<wxVariantData*>(src.m_ptr);
if ( data ) if ( data )
@ -644,7 +643,7 @@ public:
virtual bool ConvertValue(const wxAnyValueBuffer& src, virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType, wxAnyValueType* dstType,
wxAnyValueBuffer& dst) const wxAnyValueBuffer& dst) const wxOVERRIDE
{ {
wxUnusedVar(src); wxUnusedVar(src);
wxUnusedVar(dstType); wxUnusedVar(dstType);
@ -664,11 +663,6 @@ public:
#endif // wxUSE_VARIANT #endif // wxUSE_VARIANT
#ifdef __VISUALC6__
// Re-enable useless VC6 warnings
#pragma warning (pop)
#endif
/* /*
Let's define a discrete Null value so we don't have to really Let's define a discrete Null value so we don't have to really
@ -720,7 +714,6 @@ wxConvertAnyToVariant(const wxAny& any, wxVariant* variant);
#endif // wxUSE_VARIANT #endif // wxUSE_VARIANT
// //
// The wxAny class represents a container for any type. A variant's value // 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. // can be changed at run time, possibly to a different type of value.
@ -790,15 +783,10 @@ public:
Use this template function for checking if this wxAny holds Use this template function for checking if this wxAny holds
a specific C++ data type. a specific C++ data type.
@remarks This template function does not work on some older compilers
(such as Visual C++ 6.0). For full compiler ccompatibility
please use wxANY_CHECK_TYPE(any, T) macro instead.
@see wxAnyValueType::CheckType() @see wxAnyValueType::CheckType()
*/ */
// FIXME-VC6: remove this hack when VC6 is no longer supported
template <typename T> template <typename T>
bool CheckType(T* = NULL) const bool CheckType() const
{ {
return m_type->CheckType<T>(); return m_type->CheckType<T>();
} }
@ -962,14 +950,16 @@ public:
@remarks For convenience, conversion is done when T is wxString. This @remarks For convenience, conversion is done when T is wxString. This
is useful when a string literal (which are treated as is useful when a string literal (which are treated as
const char* and const wchar_t*) has been assigned to wxAny. const char* and const wchar_t*) has been assigned to wxAny.
This template function may not work properly with Visual C++
6. For full compiler compatibility, please use
wxANY_AS(any, T) macro instead.
*/ */
// FIXME-VC6: remove this hack when VC6 is no longer supported template <typename T>
template<typename T>
T As(T* = NULL) const T As(T* = NULL) const
{
return wxPrivate::wxAnyAsImpl<T>::DoAs(*this);
}
// Semi private helper: get the value without coercion, for all types.
template <typename T>
T RawAs() const
{ {
if ( !wxAnyValueTypeImpl<T>::IsSameClass(m_type) ) if ( !wxAnyValueTypeImpl<T>::IsSameClass(m_type) )
{ {
@ -979,19 +969,6 @@ public:
return static_cast<T>(wxAnyValueTypeImpl<T>::GetValue(m_buffer)); return static_cast<T>(wxAnyValueTypeImpl<T>::GetValue(m_buffer));
} }
// Allow easy conversion from 'const char *' etc. to wxString
// FIXME-VC6: remove this hack when VC6 is no longer supported
//template<>
wxString As(wxString*) const
{
wxString value;
if ( !GetAs(&value) )
{
wxFAIL_MSG("Incorrect or non-convertible data type");
}
return value;
}
#if wxUSE_EXTENDED_RTTI #if wxUSE_EXTENDED_RTTI
const wxTypeInfo* GetTypeInfo() const const wxTypeInfo* GetTypeInfo() const
{ {
@ -1087,22 +1064,52 @@ private:
}; };
// namespace wxPrivate
// This method of checking the type is compatible with VC6 {
// 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 <typename T>
struct wxAnyAsImpl
{
static T DoAs(const wxAny& any)
{
return any.RawAs<T>();
}
};
// Specialization for wxString does coercion.
template <>
struct wxAnyAsImpl<wxString>
{
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) \ #define wxANY_CHECK_TYPE(any, T) \
wxANY_VALUE_TYPE_CHECK_TYPE((any).GetType(), T) wxANY_VALUE_TYPE_CHECK_TYPE((any).GetType(), T)
// // This macro shouldn't be used any longer for the same reasons as
// This method of getting the value is compatible with VC6 // wxANY_VALUE_TYPE_CHECK_TYPE(), just call As() directly.
#define wxANY_AS(any, T) \ #define wxANY_AS(any, T) \
(any).As(static_cast<T*>(NULL)) (any).As(static_cast<T*>(NULL))
template<typename T> template<typename T>
inline bool wxAnyValueType::CheckType(T* reserved) const inline bool wxAnyValueType::CheckType() const
{ {
wxUnusedVar(reserved);
return wxAnyValueTypeImpl<T>::IsSameClass(this); return wxAnyValueTypeImpl<T>::IsSameClass(this);
} }

View File

@ -1,9 +1,9 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/anybutton.h // Name: wx/anybutton.h
// Purpose: wxAnyButtonBase class // Purpose: wxAnyButtonBase class
// Author: Vadim Zetlin // Author: Vadim Zeitlin
// Created: 2000-08-15 (extracted from button.h) // Created: 2000-08-15 (extracted from button.h)
// Copyright: (c) Vadim Zetlin // Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -102,7 +102,7 @@ public:
// Buttons on MSW can look bad if they are not native colours, because // 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 // then they become owner-drawn and not theme-drawn. Disable it here
// in wxAnyButtonBase to make it consistent. // in wxAnyButtonBase to make it consistent.
virtual bool ShouldInheritColours() const { return false; } virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
// wxUniv-compatible and deprecated equivalents to SetBitmapXXX() // wxUniv-compatible and deprecated equivalents to SetBitmapXXX()
#if WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
@ -135,6 +135,13 @@ public:
State_Max 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 // 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 // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT
bool DontShowLabel() const bool DontShowLabel() const
@ -150,7 +157,7 @@ public:
protected: protected:
// choose the default border for this window // choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const
{ return wxBitmap(); } { return wxBitmap(); }
@ -186,10 +193,8 @@ protected:
// #include "wx/gtk1/anybutton.h" // #include "wx/gtk1/anybutton.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/osx/anybutton.h" #include "wx/osx/anybutton.h"
//#elif defined(__WXCOCOA__) #elif defined(__WXQT__)
// #include "wx/cocoa/anybutton.h" #include "wx/qt/anybutton.h"
//#elif defined(__WXPM__)
// #include "wx/os2/anybutton.h"
#else #else
typedef wxAnyButtonBase wxAnyButton; typedef wxAnyButtonBase wxAnyButton;
#endif #endif

View File

@ -60,7 +60,7 @@ public:
// different conversions to pointers) // different conversions to pointers)
operator bool() const { return m_str != NULL; } operator bool() const { return m_str != NULL; }
// at least VC6 and VC7 also need this one or they complain about ambiguity // at least VC7 also needs this one or it complains about ambiguity
// for !anystr expressions // for !anystr expressions
bool operator!() const { return !((bool)*this); } bool operator!() const { return !((bool)*this); }

View File

@ -264,7 +264,7 @@ public:
// Implement the inherited wxEventFilter method but just return -1 from it // Implement the inherited wxEventFilter method but just return -1 from it
// to indicate that default processing should take place. // to indicate that default processing should take place.
virtual int FilterEvent(wxEvent& event); virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
// return true if we're running event loop, i.e. if the events can // return true if we're running event loop, i.e. if the events can
// (already) be dispatched // (already) be dispatched
@ -298,10 +298,33 @@ public:
// Function called if an uncaught exception is caught inside the main // Function called if an uncaught exception is caught inside the main
// event loop: it may return true to continue running the event loop or // event loop: it may return true to continue running the event loop or
// false to stop it (in the latter case it may rethrow the exception as // false to stop it. If this function rethrows the exception, as it does by
// well) // 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(); 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 #endif // wxUSE_EXCEPTIONS
@ -516,7 +539,7 @@ protected:
wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
}; };
#if defined(__UNIX__) && !defined(__WXMSW__) #if defined(__UNIX__) && !defined(__WINDOWS__)
#include "wx/unix/app.h" #include "wx/unix/app.h"
#else #else
// this has to be a class and not a typedef as we forward declare it // this has to be a class and not a typedef as we forward declare it
@ -541,7 +564,7 @@ public:
// very first initialization function // very first initialization function
// //
// Override: very rarely // Override: very rarely
virtual bool Initialize(int& _argc, wxChar **_argv); virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
// a platform-dependent version of OnInit(): the code here is likely to // a platform-dependent version of OnInit(): the code here is likely to
// depend on the toolkit. default version does nothing. // depend on the toolkit. default version does nothing.
@ -556,15 +579,15 @@ public:
// of the program really starts here // of the program really starts here
// //
// Override: rarely in GUI applications, always in console ones. // Override: rarely in GUI applications, always in console ones.
virtual int OnRun(); virtual int OnRun() wxOVERRIDE;
// a matching function for OnInit() // a matching function for OnInit()
virtual int OnExit(); virtual int OnExit() wxOVERRIDE;
// very last clean up function // very last clean up function
// //
// Override: very rarely // Override: very rarely
virtual void CleanUp(); virtual void CleanUp() wxOVERRIDE;
// the worker functions - usually not used directly by the user code // the worker functions - usually not used directly by the user code
@ -579,10 +602,10 @@ public:
// parties // parties
// //
// it should return true if more idle events are needed, false if not // it should return true if more idle events are needed, false if not
virtual bool ProcessIdle(); virtual bool ProcessIdle() wxOVERRIDE;
// override base class version: GUI apps always use an event loop // override base class version: GUI apps always use an event loop
virtual bool UsesEventLoop() const { return true; } virtual bool UsesEventLoop() const wxOVERRIDE { return true; }
// top level window functions // top level window functions
@ -645,8 +668,8 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#if wxUSE_CMDLINE_PARSER #if wxUSE_CMDLINE_PARSER
virtual bool OnCmdLineParsed(wxCmdLineParser& parser); virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
virtual void OnInitCmdLine(wxCmdLineParser& parser); virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
#endif #endif
// miscellaneous other stuff // miscellaneous other stuff
@ -657,15 +680,9 @@ public:
// deactivated // deactivated
virtual void SetActive(bool isActive, wxWindow *lastFocus); virtual void SetActive(bool isActive, wxWindow *lastFocus);
#if WXWIN_COMPATIBILITY_2_6
// returns true if the program is successfully initialized
wxDEPRECATED_MSG("always returns true now, don't call")
bool Initialized();
#endif // WXWIN_COMPATIBILITY_2_6
protected: protected:
// override base class method to use GUI traits // override base class method to use GUI traits
virtual wxAppTraits *CreateTraits(); virtual wxAppTraits *CreateTraits() wxOVERRIDE;
// the main top level window (may be NULL) // the main top level window (may be NULL)
@ -694,10 +711,6 @@ protected:
wxDECLARE_NO_COPY_CLASS(wxAppBase); wxDECLARE_NO_COPY_CLASS(wxAppBase);
}; };
#if WXWIN_COMPATIBILITY_2_6
inline bool wxAppBase::Initialized() { return true; }
#endif // WXWIN_COMPATIBILITY_2_6
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// now include the declaration of the real class // now include the declaration of the real class
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -716,10 +729,8 @@ protected:
#include "wx/x11/app.h" #include "wx/x11/app.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/osx/app.h" #include "wx/osx/app.h"
#elif defined(__WXCOCOA__) #elif defined(__WXQT__)
#include "wx/cocoa/app.h" #include "wx/qt/app.h"
#elif defined(__WXPM__)
#include "wx/os2/app.h"
#endif #endif
#else // !GUI #else // !GUI
@ -851,7 +862,7 @@ public:
wxIMPLEMENT_WX_THEME_SUPPORT \ wxIMPLEMENT_WX_THEME_SUPPORT \
wxIMPLEMENT_APP_NO_THEMES(appname) wxIMPLEMENT_APP_NO_THEMES(appname)
// Same as IMPLEMENT_APP(), but for console applications. // Same as wxIMPLEMENT_APP(), but for console applications.
#define wxIMPLEMENT_APP_CONSOLE(appname) \ #define wxIMPLEMENT_APP_CONSOLE(appname) \
wxIMPLEMENT_WXWIN_MAIN_CONSOLE \ wxIMPLEMENT_WXWIN_MAIN_CONSOLE \
wxIMPLEMENT_APP_NO_MAIN(appname) wxIMPLEMENT_APP_NO_MAIN(appname)
@ -875,7 +886,7 @@ extern wxAppInitializer wxTheAppInitializer;
// deprecated variants _not_ requiring a semicolon after them // deprecated variants _not_ requiring a semicolon after them
// (note that also some wx-prefixed macro do _not_ require a semicolon because // (note that also some wx-prefixed macro do _not_ require a semicolon because
// it's not always possible to force the compire to require it) // 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_CONSOLE wxIMPLEMENT_WXWIN_MAIN_CONSOLE
#define IMPLEMENT_WXWIN_MAIN wxIMPLEMENT_WXWIN_MAIN #define IMPLEMENT_WXWIN_MAIN wxIMPLEMENT_WXWIN_MAIN

View File

@ -0,0 +1,54 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/appprogress.h
// Purpose: wxAppProgressIndicator interface.
// Author: Chaobin Zhang <zhchbin@gmail.com>
// 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_

View File

@ -73,7 +73,6 @@ public:
virtual wxRendererNative *CreateRenderer() = 0; virtual wxRendererNative *CreateRenderer() = 0;
// wxStandardPaths object is normally the same for wxBase and wxGUI // wxStandardPaths object is normally the same for wxBase and wxGUI
// except in the case of wxMac and wxCocoa
virtual wxStandardPaths& GetStandardPaths(); virtual wxStandardPaths& GetStandardPaths();
@ -130,7 +129,9 @@ public:
// runtime (not compile-time) version. // runtime (not compile-time) version.
// returns wxPORT_BASE for console applications and one of the remaining // returns wxPORT_BASE for console applications and one of the remaining
// wxPORT_* values for GUI applications. // wxPORT_* values for GUI applications.
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const = 0; 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 // return true if the port is using wxUniversal for the GUI, false if not
virtual bool IsUsingUniversalWidgets() const = 0; virtual bool IsUsingUniversalWidgets() const = 0;
@ -172,10 +173,8 @@ private:
// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
#if defined(__WIN32__) #if defined(__WIN32__)
#include "wx/msw/apptbase.h" #include "wx/msw/apptbase.h"
#elif defined(__UNIX__) && !defined(__EMX__) #elif defined(__UNIX__)
#include "wx/unix/apptbase.h" #include "wx/unix/apptbase.h"
#elif defined(__OS2__)
#include "wx/os2/apptbase.h"
#else // no platform-specific methods to add to wxAppTraits #else // no platform-specific methods to add to wxAppTraits
// wxAppTraits must be a class because it was forward declared as class // wxAppTraits must be a class because it was forward declared as class
class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
@ -199,30 +198,33 @@ public:
#endif // !wxUSE_CONSOLE_EVENTLOOP #endif // !wxUSE_CONSOLE_EVENTLOOP
#if wxUSE_LOG #if wxUSE_LOG
virtual wxLog *CreateLogTarget(); virtual wxLog *CreateLogTarget() wxOVERRIDE;
#endif // wxUSE_LOG #endif // wxUSE_LOG
virtual wxMessageOutput *CreateMessageOutput(); virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE;
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
virtual wxFontMapper *CreateFontMapper(); virtual wxFontMapper *CreateFontMapper() wxOVERRIDE;
#endif // wxUSE_FONTMAP #endif // wxUSE_FONTMAP
virtual wxRendererNative *CreateRenderer(); virtual wxRendererNative *CreateRenderer() wxOVERRIDE;
virtual bool ShowAssertDialog(const wxString& msg); virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
virtual bool HasStderr(); virtual bool HasStderr() wxOVERRIDE;
// the GetToolkitVersion for console application is always the same // the GetToolkitVersion for console application is always the same
virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const wxPortId GetToolkitVersion(int *verMaj = NULL,
int *verMin = NULL,
int *verMicro = NULL) const wxOVERRIDE
{ {
// no toolkits (wxBase is for console applications without GUI support) // no toolkits (wxBase is for console applications without GUI support)
// NB: zero means "no toolkit", -1 means "not initialized yet" // NB: zero means "no toolkit", -1 means "not initialized yet"
// so we must use zero here! // so we must use zero here!
if (verMaj) *verMaj = 0; if (verMaj) *verMaj = 0;
if (verMin) *verMin = 0; if (verMin) *verMin = 0;
if (verMicro) *verMicro = 0;
return wxPORT_BASE; return wxPORT_BASE;
} }
virtual bool IsUsingUniversalWidgets() const { return false; } virtual bool IsUsingUniversalWidgets() const wxOVERRIDE { return false; }
virtual wxString GetDesktopEnvironment() const { return wxEmptyString; } virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; }
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -235,18 +237,18 @@ class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits
{ {
public: public:
#if wxUSE_LOG #if wxUSE_LOG
virtual wxLog *CreateLogTarget(); virtual wxLog *CreateLogTarget() wxOVERRIDE;
#endif // wxUSE_LOG #endif // wxUSE_LOG
virtual wxMessageOutput *CreateMessageOutput(); virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE;
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
virtual wxFontMapper *CreateFontMapper(); virtual wxFontMapper *CreateFontMapper() wxOVERRIDE;
#endif // wxUSE_FONTMAP #endif // wxUSE_FONTMAP
virtual wxRendererNative *CreateRenderer(); virtual wxRendererNative *CreateRenderer() wxOVERRIDE;
virtual bool ShowAssertDialog(const wxString& msg); virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
virtual bool HasStderr(); virtual bool HasStderr() wxOVERRIDE;
virtual bool IsUsingUniversalWidgets() const virtual bool IsUsingUniversalWidgets() const wxOVERRIDE
{ {
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
return true; return true;
@ -255,7 +257,7 @@ public:
#endif #endif
} }
virtual wxString GetDesktopEnvironment() const { return wxEmptyString; } virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; }
}; };
#endif // wxUSE_GUI #endif // wxUSE_GUI
@ -267,12 +269,8 @@ public:
// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
#if defined(__WIN32__) #if defined(__WIN32__)
#include "wx/msw/apptrait.h" #include "wx/msw/apptrait.h"
#elif defined(__OS2__)
#include "wx/os2/apptrait.h"
#elif defined(__UNIX__) #elif defined(__UNIX__)
#include "wx/unix/apptrait.h" #include "wx/unix/apptrait.h"
#elif defined(__DOS__)
#include "wx/msdos/apptrait.h"
#else #else
#if wxUSE_GUI #if wxUSE_GUI
class wxGUIAppTraits : public wxGUIAppTraitsBase class wxGUIAppTraits : public wxGUIAppTraitsBase

View File

@ -73,7 +73,7 @@ protected:
private: private:
wxArchiveNotifier *m_notifier; wxArchiveNotifier *m_notifier;
DECLARE_ABSTRACT_CLASS(wxArchiveEntry) wxDECLARE_ABSTRACT_CLASS(wxArchiveEntry);
}; };
@ -99,7 +99,7 @@ public:
wxArchiveEntry *GetNextEntry() { return DoGetNextEntry(); } wxArchiveEntry *GetNextEntry() { return DoGetNextEntry(); }
virtual char Peek() { return wxInputStream::Peek(); } virtual char Peek() wxOVERRIDE { return wxInputStream::Peek(); }
protected: protected:
wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv); wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv);
@ -181,11 +181,7 @@ void _wxSetArchiveIteratorValue(
val = std::make_pair(X(entry->GetInternalName()), Y(entry)); val = std::make_pair(X(entry->GetInternalName()), Y(entry));
} }
#if defined _MSC_VER && _MSC_VER < 1300
template <class Arc, class T = Arc::entry_type*>
#else
template <class Arc, class T = typename Arc::entry_type*> template <class Arc, class T = typename Arc::entry_type*>
#endif
class wxArchiveIterator class wxArchiveIterator
{ {
public: public:
@ -374,7 +370,7 @@ private:
static wxArchiveClassFactory *sm_first; static wxArchiveClassFactory *sm_first;
wxArchiveClassFactory *m_next; wxArchiveClassFactory *m_next;
DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory) wxDECLARE_ABSTRACT_CLASS(wxArchiveClassFactory);
}; };
#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS #endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

View File

@ -14,19 +14,39 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/string.h" #include "wx/string.h"
#if wxUSE_STD_CONTAINERS_COMPATIBLY
#include <vector>
#endif
// these functions are only used in STL build now but we define them in any // 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 // case for compatibility with the existing code outside of the library which
// could be using them // could be using them
inline int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2) inline int wxCMPFUNC_CONV wxStringSortAscending(const wxString& s1, const wxString& s2)
{ {
return s1->Cmp(*s2); return s1.Cmp(s2);
} }
inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2) inline int wxCMPFUNC_CONV wxStringSortDescending(const wxString& s1, const wxString& s2)
{ {
return wxStringSortAscending(s2, s1); 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 #if wxUSE_STD_CONTAINERS
#include "wx/dynarray.h" #include "wx/dynarray.h"
@ -38,9 +58,6 @@ _WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,
class WXDLLIMPEXP_BASE); class WXDLLIMPEXP_BASE);
WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase,
wxBaseArrayStringBase, WXDLLIMPEXP_BASE); wxBaseArrayStringBase, WXDLLIMPEXP_BASE);
_WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase,
wxBaseArrayStringBase, = wxStringSortAscending,
class WXDLLIMPEXP_BASE, CMPFUNCwxString);
class WXDLLIMPEXP_BASE wxArrayString : public wxArrayStringBase class WXDLLIMPEXP_BASE wxArrayString : public wxArrayStringBase
{ {
@ -68,6 +85,10 @@ public:
} }
}; };
_WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase,
wxBaseArrayStringBase, = wxStringSortAscending,
class WXDLLIMPEXP_BASE, wxArrayString::CompareFunction);
class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase
{ {
public: public:
@ -84,6 +105,9 @@ public:
for ( size_t n = 0; n < src.size(); n++ ) for ( size_t n = 0; n < src.size(); n++ )
Add(src[n]); Add(src[n]);
} }
wxEXPLICIT wxSortedArrayString(wxArrayString::CompareFunction compareFunction)
: wxSortedArrayStringBase(compareFunction)
{ }
int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const; int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const;
@ -101,21 +125,9 @@ private:
#else // if !wxUSE_STD_CONTAINERS #else // if !wxUSE_STD_CONTAINERS
// this shouldn't be defined for compilers not supporting template methods or #include "wx/beforestd.h"
// without std::distance() #include <iterator>
// #include "wx/afterstd.h"
// FIXME-VC6: currently it's only not defined for VC6 in DLL build as it
// doesn't export template methods from DLL correctly so even though
// it compiles them fine, we get link errors when using wxArrayString
#if !defined(__VISUALC6__) || !(defined(WXMAKINGDLL) || defined(WXUSINGDLL))
#define wxHAS_VECTOR_TEMPLATE_ASSIGN
#endif
#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
#include "wx/beforestd.h"
#include <iterator>
#include "wx/afterstd.h"
#endif // wxHAS_VECTOR_TEMPLATE_ASSIGN
class WXDLLIMPEXP_BASE wxArrayString class WXDLLIMPEXP_BASE wxArrayString
{ {
@ -159,7 +171,7 @@ public:
void Clear(); void Clear();
// preallocates memory for given number of items // preallocates memory for given number of items
void Alloc(size_t nCount); void Alloc(size_t nCount);
// minimzes the memory usage (by freeing all extra memory) // minimizes the memory usage (by freeing all extra memory)
void Shrink(); void Shrink();
// simple accessors // simple accessors
@ -295,7 +307,6 @@ public:
{ Init(false); assign(first, last); } { Init(false); assign(first, last); }
wxArrayString(size_type n, const_reference v) { Init(false); assign(n, v); } wxArrayString(size_type n, const_reference v) { Init(false); assign(n, v); }
#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
template <class Iterator> template <class Iterator>
void assign(Iterator first, Iterator last) void assign(Iterator first, Iterator last)
{ {
@ -304,15 +315,6 @@ public:
for(; first != last; ++first) for(; first != last; ++first)
push_back(*first); push_back(*first);
} }
#else // !wxHAS_VECTOR_TEMPLATE_ASSIGN
void assign(const_iterator first, const_iterator last)
{
clear();
reserve(last - first);
for(; first != last; ++first)
push_back(*first);
}
#endif // wxHAS_VECTOR_TEMPLATE_ASSIGN/!wxHAS_VECTOR_TEMPLATE_ASSIGN
void assign(size_type n, const_reference v) void assign(size_type n, const_reference v)
{ clear(); Add(v, n); } { clear(); Add(v, n); }
@ -363,8 +365,13 @@ protected:
void Init(bool autoSort); // common part of all ctors void Init(bool autoSort); // common part of all ctors
void Copy(const wxArrayString& src); // copies the contents of another array void Copy(const wxArrayString& src); // copies the contents of another array
CompareFunction m_compareFunction; // set only from wxSortedArrayString
private: private:
void Grow(size_t nIncrement = 0); // makes array bigger if needed // 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 size_t m_nSize, // current size of the array
m_nCount; // current number of elements m_nCount; // current number of elements
@ -381,6 +388,10 @@ public:
{ } { }
wxSortedArrayString(const wxArrayString& array) : wxArrayString(true) wxSortedArrayString(const wxArrayString& array) : wxArrayString(true)
{ Copy(array); } { Copy(array); }
wxEXPLICIT wxSortedArrayString(CompareFunction compareFunction)
: wxArrayString(true)
{ m_compareFunction = compareFunction; }
}; };
#endif // !wxUSE_STD_CONTAINERS #endif // !wxUSE_STD_CONTAINERS
@ -467,6 +478,16 @@ public:
m_data.ptr = strings; m_data.ptr = strings;
} }
#if wxUSE_STD_CONTAINERS_COMPATIBLY
// construct an adapter from a vector of strings (of any type)
template <class T>
wxArrayStringsAdapter(const std::vector<T>& 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 // construct an adapter from a single wxString
wxArrayStringsAdapter(const wxString& s) wxArrayStringsAdapter(const wxString& s)
: m_type(wxSTRING_POINTER), m_size(1) : m_type(wxSTRING_POINTER), m_size(1)

View File

@ -111,6 +111,9 @@ typedef wxString wxArtID;
#define wxART_FIND wxART_MAKE_ART_ID(wxART_FIND) #define wxART_FIND wxART_MAKE_ART_ID(wxART_FIND)
#define wxART_FIND_AND_REPLACE wxART_MAKE_ART_ID(wxART_FIND_AND_REPLACE) #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 // wxArtProvider class
@ -186,17 +189,8 @@ public:
// the topmost provider if platform_dependent = false // the topmost provider if platform_dependent = false
static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false); static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false);
#if WXWIN_COMPATIBILITY_2_6 // Rescale bitmap (used internally if requested size is other than the available).
// use the corresponding methods without redundant "Provider" suffix static void RescaleBitmap(wxBitmap& bmp, const wxSize& sizeNeeded);
static wxDEPRECATED( void PushProvider(wxArtProvider *provider) );
static wxDEPRECATED( void InsertProvider(wxArtProvider *provider) );
static wxDEPRECATED( bool PopProvider() );
// use Delete() if this is what you really need, or just delete the
// provider pointer, do not use Remove() as it does not delete the pointer
// unlike RemoveProvider() which does
static wxDEPRECATED( bool RemoveProvider(wxArtProvider *provider) );
#endif // WXWIN_COMPATIBILITY_2_6
protected: protected:
friend class wxArtProviderModule; friend class wxArtProviderModule;
@ -246,7 +240,7 @@ private:
// art resources cache (so that CreateXXX is not called that often): // art resources cache (so that CreateXXX is not called that often):
static wxArtProviderCache *sm_cache; static wxArtProviderCache *sm_cache;
DECLARE_ABSTRACT_CLASS(wxArtProvider) wxDECLARE_ABSTRACT_CLASS(wxArtProvider);
}; };

View File

@ -57,7 +57,7 @@ inline wxUint32 wxAtomicDec (wxUint32 &value)
return InterlockedDecrement ((LONG*)&value); return InterlockedDecrement ((LONG*)&value);
} }
#elif defined(__WXMAC__) || defined(__DARWIN__) #elif defined(__DARWIN__)
#include "libkern/OSAtomic.h" #include "libkern/OSAtomic.h"
inline void wxAtomicInc (wxUint32 &value) inline void wxAtomicInc (wxUint32 &value)

View File

@ -83,7 +83,7 @@ public:
m_toolId = c.m_toolId; m_toolId = c.m_toolId;
} }
#endif #endif
wxEvent *Clone() const { return new wxAuiToolBarEvent(*this); } wxEvent *Clone() const wxOVERRIDE { return new wxAuiToolBarEvent(*this); }
bool IsDropDownClicked() const { return m_isDropdownClicked; } bool IsDropDownClicked() const { return m_isDropdownClicked; }
void SetDropDownClicked(bool c) { m_isDropdownClicked = c; } void SetDropDownClicked(bool c) { m_isDropdownClicked = c; }
@ -105,7 +105,7 @@ private:
int m_toolId; int m_toolId;
private: private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent);
}; };
@ -347,86 +347,86 @@ public:
class WXDLLIMPEXP_AUI wxAuiDefaultToolBarArt : public wxAuiToolBarArt class WXDLLIMPEXP_AUI wxAuiGenericToolBarArt : public wxAuiToolBarArt
{ {
public: public:
wxAuiDefaultToolBarArt(); wxAuiGenericToolBarArt();
virtual ~wxAuiDefaultToolBarArt(); virtual ~wxAuiGenericToolBarArt();
virtual wxAuiToolBarArt* Clone(); virtual wxAuiToolBarArt* Clone() wxOVERRIDE;
virtual void SetFlags(unsigned int flags); virtual void SetFlags(unsigned int flags) wxOVERRIDE;
virtual unsigned int GetFlags(); virtual unsigned int GetFlags() wxOVERRIDE;
virtual void SetFont(const wxFont& font); virtual void SetFont(const wxFont& font) wxOVERRIDE;
virtual wxFont GetFont(); virtual wxFont GetFont() wxOVERRIDE;
virtual void SetTextOrientation(int orientation); virtual void SetTextOrientation(int orientation) wxOVERRIDE;
virtual int GetTextOrientation(); virtual int GetTextOrientation() wxOVERRIDE;
virtual void DrawBackground( virtual void DrawBackground(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawPlainBackground(wxDC& dc, virtual void DrawPlainBackground(wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawLabel( virtual void DrawLabel(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxAuiToolBarItem& item, const wxAuiToolBarItem& item,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawButton( virtual void DrawButton(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxAuiToolBarItem& item, const wxAuiToolBarItem& item,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawDropDownButton( virtual void DrawDropDownButton(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxAuiToolBarItem& item, const wxAuiToolBarItem& item,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawControlLabel( virtual void DrawControlLabel(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxAuiToolBarItem& item, const wxAuiToolBarItem& item,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawSeparator( virtual void DrawSeparator(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawGripper( virtual void DrawGripper(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
virtual void DrawOverflowButton( virtual void DrawOverflowButton(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect, const wxRect& rect,
int state); int state) wxOVERRIDE;
virtual wxSize GetLabelSize( virtual wxSize GetLabelSize(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxAuiToolBarItem& item); const wxAuiToolBarItem& item) wxOVERRIDE;
virtual wxSize GetToolSize( virtual wxSize GetToolSize(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxAuiToolBarItem& item); const wxAuiToolBarItem& item) wxOVERRIDE;
virtual int GetElementSize(int element); virtual int GetElementSize(int element) wxOVERRIDE;
virtual void SetElementSize(int elementId, int size); virtual void SetElementSize(int elementId, int size) wxOVERRIDE;
virtual int ShowDropDown(wxWindow* wnd, virtual int ShowDropDown(wxWindow* wnd,
const wxAuiToolBarItemArray& items); const wxAuiToolBarItemArray& items) wxOVERRIDE;
protected: protected:
@ -475,12 +475,12 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxAUI_TB_DEFAULT_STYLE); long style = wxAUI_TB_DEFAULT_STYLE);
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
void SetArtProvider(wxAuiToolBarArt* art); void SetArtProvider(wxAuiToolBarArt* art);
wxAuiToolBarArt* GetArtProvider() const; wxAuiToolBarArt* GetArtProvider() const;
bool SetFont(const wxFont& font); bool SetFont(const wxFont& font) wxOVERRIDE;
wxAuiToolBarItem* AddTool(int toolId, wxAuiToolBarItem* AddTool(int toolId,
@ -605,7 +605,7 @@ public:
bool IsPaneValid(const wxAuiPaneInfo& pane) const; bool IsPaneValid(const wxAuiPaneInfo& pane) const;
// Override to call DoIdleUpdate(). // Override to call DoIdleUpdate().
virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE); virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE;
protected: protected:
void Init(); void Init();
@ -631,7 +631,7 @@ protected:
int y, int y,
int width, int width,
int height, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
protected: // handlers protected: // handlers
@ -692,8 +692,8 @@ private:
// Common part of OnLeaveWindow() and OnCaptureLost(). // Common part of OnLeaveWindow() and OnCaptureLost().
void DoResetMouseState(); void DoResetMouseState();
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
DECLARE_CLASS(wxAuiToolBar) wxDECLARE_CLASS(wxAuiToolBar);
}; };
@ -750,6 +750,16 @@ typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
#define wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK wxEVT_AUITOOLBAR_MIDDLE_CLICK #define wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK wxEVT_AUITOOLBAR_MIDDLE_CLICK
#define wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG wxEVT_AUITOOLBAR_BEGIN_DRAG #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 // wxUSE_AUI
#endif // _WX_AUIBAR_H_ #endif // _WX_AUIBAR_H_

View File

@ -75,7 +75,7 @@ public:
m_dragSource = c.m_dragSource; m_dragSource = c.m_dragSource;
} }
#endif #endif
wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); } wxEvent *Clone() const wxOVERRIDE { return new wxAuiNotebookEvent(*this); }
void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; } void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; }
wxAuiNotebook* GetDragSource() const { return m_dragSource; } wxAuiNotebook* GetDragSource() const { return m_dragSource; }
@ -85,7 +85,7 @@ private:
#ifndef SWIG #ifndef SWIG
private: private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent);
#endif #endif
}; };
@ -99,6 +99,7 @@ public:
wxBitmap bitmap; // tab's bitmap wxBitmap bitmap; // tab's bitmap
wxRect rect; // tab's hit rectangle wxRect rect; // tab's hit rectangle
bool active; // true if the page is currently active bool active; // true if the page is currently active
bool hover; // true if mouse hovering over tab
}; };
class WXDLLIMPEXP_AUI wxAuiTabContainerButton class WXDLLIMPEXP_AUI wxAuiTabContainerButton
@ -206,7 +207,7 @@ public:
protected: protected:
// choose the default border for this window // choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
void OnPaint(wxPaintEvent& evt); void OnPaint(wxPaintEvent& evt);
void OnEraseBackground(wxEraseEvent& evt); void OnEraseBackground(wxEraseEvent& evt);
@ -234,9 +235,11 @@ protected:
wxAuiTabContainerButton* m_hoverButton; wxAuiTabContainerButton* m_hoverButton;
wxAuiTabContainerButton* m_pressedButton; wxAuiTabContainerButton* m_pressedButton;
void SetHoverTab(wxWindow* wnd);
#ifndef SWIG #ifndef SWIG
DECLARE_CLASS(wxAuiTabCtrl) wxDECLARE_CLASS(wxAuiTabCtrl);
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
#endif #endif
}; };
@ -268,7 +271,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0); long style = 0);
void SetWindowStyleFlag(long style); void SetWindowStyleFlag(long style) wxOVERRIDE;
void SetArtProvider(wxAuiTabArt* art); void SetArtProvider(wxAuiTabArt* art);
wxAuiTabArt* GetArtProvider() const; wxAuiTabArt* GetArtProvider() const;
@ -286,15 +289,15 @@ public:
bool select = false, bool select = false,
const wxBitmap& bitmap = wxNullBitmap); const wxBitmap& bitmap = wxNullBitmap);
bool DeletePage(size_t page); bool DeletePage(size_t page) wxOVERRIDE;
bool RemovePage(size_t page); bool RemovePage(size_t page) wxOVERRIDE;
virtual size_t GetPageCount() const; virtual size_t GetPageCount() const wxOVERRIDE;
virtual wxWindow* GetPage(size_t pageIdx) const; virtual wxWindow* GetPage(size_t pageIdx) const wxOVERRIDE;
int GetPageIndex(wxWindow* pageWnd) const; int GetPageIndex(wxWindow* pageWnd) const;
bool SetPageText(size_t page, const wxString& text); bool SetPageText(size_t page, const wxString& text) wxOVERRIDE;
wxString GetPageText(size_t pageIdx) const; wxString GetPageText(size_t pageIdx) const wxOVERRIDE;
bool SetPageToolTip(size_t page, const wxString& text); bool SetPageToolTip(size_t page, const wxString& text);
wxString GetPageToolTip(size_t pageIdx) const; wxString GetPageToolTip(size_t pageIdx) const;
@ -302,8 +305,8 @@ public:
bool SetPageBitmap(size_t page, const wxBitmap& bitmap); bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
wxBitmap GetPageBitmap(size_t pageIdx) const; wxBitmap GetPageBitmap(size_t pageIdx) const;
int SetSelection(size_t newPage); int SetSelection(size_t newPage) wxOVERRIDE;
int GetSelection() const; int GetSelection() const wxOVERRIDE;
virtual void Split(size_t page, int direction); virtual void Split(size_t page, int direction);
@ -319,7 +322,7 @@ public:
void SetMeasuringFont(const wxFont& font); void SetMeasuringFont(const wxFont& font);
// Sets the tab font // Sets the tab font
virtual bool SetFont(const wxFont& font); virtual bool SetFont(const wxFont& font) wxOVERRIDE;
// Gets the tab control height // Gets the tab control height
int GetTabCtrlHeight() const; int GetTabCtrlHeight() const;
@ -331,36 +334,36 @@ public:
bool ShowWindowMenu(); bool ShowWindowMenu();
// we do have multiple pages // we do have multiple pages
virtual bool HasMultiplePages() const { return true; } virtual bool HasMultiplePages() const wxOVERRIDE { return true; }
// we don't want focus for ourselves // we don't want focus for ourselves
// virtual bool AcceptsFocus() const { return false; } // virtual bool AcceptsFocus() const { return false; }
//wxBookCtrlBase functions //wxBookCtrlBase functions
virtual void SetPageSize (const wxSize &size); virtual void SetPageSize (const wxSize &size) wxOVERRIDE;
virtual int HitTest (const wxPoint &pt, long *flags=NULL) const; virtual int HitTest (const wxPoint &pt, long *flags=NULL) const wxOVERRIDE;
virtual int GetPageImage(size_t n) const; virtual int GetPageImage(size_t n) const wxOVERRIDE;
virtual bool SetPageImage(size_t n, int imageId); virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
virtual int ChangeSelection(size_t n); virtual int ChangeSelection(size_t n) wxOVERRIDE;
virtual bool AddPage(wxWindow *page, const wxString &text, bool select, virtual bool AddPage(wxWindow *page, const wxString &text, bool select,
int imageId); int imageId) wxOVERRIDE;
virtual bool DeleteAllPages(); virtual bool DeleteAllPages() wxOVERRIDE;
virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text, virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text,
bool select, int imageId); bool select, int imageId) wxOVERRIDE;
protected: protected:
// Common part of all ctors. // Common part of all ctors.
void Init(); void Init();
// choose the default border for this window // choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// Redo sizing after thawing // Redo sizing after thawing
virtual void DoThaw(); virtual void DoThaw() wxOVERRIDE;
// these can be overridden // these can be overridden
@ -372,7 +375,7 @@ protected:
virtual wxSize CalculateNewSplitSize(); virtual wxSize CalculateNewSplitSize();
// remove the page and return a pointer to it // remove the page and return a pointer to it
virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) { return NULL; } virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) wxOVERRIDE { return NULL; }
//A general selection function //A general selection function
virtual int DoModifySelection(size_t n, bool events); virtual int DoModifySelection(size_t n, bool events);
@ -432,8 +435,8 @@ protected:
unsigned int m_flags; unsigned int m_flags;
#ifndef SWIG #ifndef SWIG
DECLARE_CLASS(wxAuiNotebook) wxDECLARE_CLASS(wxAuiNotebook);
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
#endif #endif
}; };

View File

@ -0,0 +1,86 @@
/////////////////////////////////////////////////////////////////////////////
// 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_

View File

@ -43,6 +43,9 @@ public:
void SetPaneWindow(const wxAuiPaneInfo& pane); void SetPaneWindow(const wxAuiPaneInfo& pane);
wxAuiManager* GetOwnerManager() const; wxAuiManager* GetOwnerManager() const;
// Allow processing accelerators to the parent frame
virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE;
protected: protected:
virtual void OnMoveStart(); virtual void OnMoveStart();
virtual void OnMoving(const wxRect& windowRect, wxDirection dir); virtual void OnMoving(const wxRect& windowRect, wxDirection dir);
@ -70,8 +73,8 @@ private:
wxAuiManager m_mgr; wxAuiManager m_mgr;
#ifndef SWIG #ifndef SWIG
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
DECLARE_CLASS(wxAuiFloatingFrame) wxDECLARE_CLASS(wxAuiFloatingFrame);
#endif // SWIG #endif // SWIG
}; };

View File

@ -664,8 +664,8 @@ protected:
void* m_reserved; void* m_reserved;
#ifndef SWIG #ifndef SWIG
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
DECLARE_CLASS(wxAuiManager) wxDECLARE_CLASS(wxAuiManager);
#endif // SWIG #endif // SWIG
}; };
@ -696,7 +696,7 @@ public:
dc = c.dc; dc = c.dc;
} }
#endif #endif
wxEvent *Clone() const { return new wxAuiManagerEvent(*this); } wxEvent *Clone() const wxOVERRIDE { return new wxAuiManagerEvent(*this); }
void SetManager(wxAuiManager* mgr) { manager = mgr; } void SetManager(wxAuiManager* mgr) { manager = mgr; }
void SetPane(wxAuiPaneInfo* p) { pane = p; } void SetPane(wxAuiPaneInfo* p) { pane = p; }
@ -723,7 +723,7 @@ public:
#ifndef SWIG #ifndef SWIG
private: private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent);
#endif #endif
}; };

View File

@ -120,26 +120,26 @@ public:
wxAuiGenericTabArt(); wxAuiGenericTabArt();
virtual ~wxAuiGenericTabArt(); virtual ~wxAuiGenericTabArt();
wxAuiTabArt* Clone(); wxAuiTabArt* Clone() wxOVERRIDE;
void SetFlags(unsigned int flags); void SetFlags(unsigned int flags) wxOVERRIDE;
void SetSizingInfo(const wxSize& tabCtrlSize, void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount); size_t tabCount) wxOVERRIDE;
void SetNormalFont(const wxFont& font); void SetNormalFont(const wxFont& font) wxOVERRIDE;
void SetSelectedFont(const wxFont& font); void SetSelectedFont(const wxFont& font) wxOVERRIDE;
void SetMeasuringFont(const wxFont& font); void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
void SetColour(const wxColour& colour); void SetColour(const wxColour& colour) wxOVERRIDE;
void SetActiveColour(const wxColour& colour); void SetActiveColour(const wxColour& colour) wxOVERRIDE;
void DrawBorder( void DrawBorder(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
void DrawBackground( void DrawBackground(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
void DrawTab(wxDC& dc, void DrawTab(wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
@ -148,7 +148,7 @@ public:
int closeButtonState, int closeButtonState,
wxRect* outTabRect, wxRect* outTabRect,
wxRect* outButtonRect, wxRect* outButtonRect,
int* xExtent); int* xExtent) wxOVERRIDE;
void DrawButton( void DrawButton(
wxDC& dc, wxDC& dc,
@ -157,15 +157,15 @@ public:
int bitmapId, int bitmapId,
int buttonState, int buttonState,
int orientation, int orientation,
wxRect* outRect); wxRect* outRect) wxOVERRIDE;
int GetIndentSize(); int GetIndentSize() wxOVERRIDE;
int GetBorderWidth( int GetBorderWidth(
wxWindow* wnd); wxWindow* wnd) wxOVERRIDE;
int GetAdditionalBorderSpace( int GetAdditionalBorderSpace(
wxWindow* wnd); wxWindow* wnd) wxOVERRIDE;
wxSize GetTabSize( wxSize GetTabSize(
wxDC& dc, wxDC& dc,
@ -174,16 +174,16 @@ public:
const wxBitmap& bitmap, const wxBitmap& bitmap,
bool active, bool active,
int closeButtonState, int closeButtonState,
int* xExtent); int* xExtent) wxOVERRIDE;
int ShowDropDown( int ShowDropDown(
wxWindow* wnd, wxWindow* wnd,
const wxAuiNotebookPageArray& items, const wxAuiNotebookPageArray& items,
int activeIdx); int activeIdx) wxOVERRIDE;
int GetBestTabCtrlSize(wxWindow* wnd, int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages, const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize); const wxSize& requiredBmpSize) wxOVERRIDE;
protected: protected:
@ -218,27 +218,27 @@ public:
wxAuiSimpleTabArt(); wxAuiSimpleTabArt();
virtual ~wxAuiSimpleTabArt(); virtual ~wxAuiSimpleTabArt();
wxAuiTabArt* Clone(); wxAuiTabArt* Clone() wxOVERRIDE;
void SetFlags(unsigned int flags); void SetFlags(unsigned int flags) wxOVERRIDE;
void SetSizingInfo(const wxSize& tabCtrlSize, void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount); size_t tabCount) wxOVERRIDE;
void SetNormalFont(const wxFont& font); void SetNormalFont(const wxFont& font) wxOVERRIDE;
void SetSelectedFont(const wxFont& font); void SetSelectedFont(const wxFont& font) wxOVERRIDE;
void SetMeasuringFont(const wxFont& font); void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
void SetColour(const wxColour& colour); void SetColour(const wxColour& colour) wxOVERRIDE;
void SetActiveColour(const wxColour& colour); void SetActiveColour(const wxColour& colour) wxOVERRIDE;
void DrawBorder( void DrawBorder(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
void DrawBackground( void DrawBackground(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxRect& rect); const wxRect& rect) wxOVERRIDE;
void DrawTab(wxDC& dc, void DrawTab(wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
@ -247,7 +247,7 @@ public:
int closeButtonState, int closeButtonState,
wxRect* outTabRect, wxRect* outTabRect,
wxRect* outButtonRect, wxRect* outButtonRect,
int* xExtent); int* xExtent) wxOVERRIDE;
void DrawButton( void DrawButton(
wxDC& dc, wxDC& dc,
@ -256,15 +256,15 @@ public:
int bitmapId, int bitmapId,
int buttonState, int buttonState,
int orientation, int orientation,
wxRect* outRect); wxRect* outRect) wxOVERRIDE;
int GetIndentSize(); int GetIndentSize() wxOVERRIDE;
int GetBorderWidth( int GetBorderWidth(
wxWindow* wnd); wxWindow* wnd) wxOVERRIDE;
int GetAdditionalBorderSpace( int GetAdditionalBorderSpace(
wxWindow* wnd); wxWindow* wnd) wxOVERRIDE;
wxSize GetTabSize( wxSize GetTabSize(
wxDC& dc, wxDC& dc,
@ -273,22 +273,24 @@ public:
const wxBitmap& bitmap, const wxBitmap& bitmap,
bool active, bool active,
int closeButtonState, int closeButtonState,
int* xExtent); int* xExtent) wxOVERRIDE;
int ShowDropDown( int ShowDropDown(
wxWindow* wnd, wxWindow* wnd,
const wxAuiNotebookPageArray& items, const wxAuiNotebookPageArray& items,
int activeIdx); int activeIdx) wxOVERRIDE;
int GetBestTabCtrlSize(wxWindow* wnd, int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages, const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize); const wxSize& requiredBmpSize) wxOVERRIDE;
protected: protected:
wxFont m_normalFont; wxFont m_normalFont;
wxFont m_selectedFont; wxFont m_selectedFont;
wxFont m_measuringFont; wxFont m_measuringFont;
wxColour m_normalTextColour;
wxColour m_selectedTextColour;
wxPen m_normalBkPen; wxPen m_normalBkPen;
wxPen m_selectedBkPen; wxPen m_selectedBkPen;
wxBrush m_normalBkBrush; wxBrush m_normalBkBrush;
@ -312,6 +314,10 @@ protected:
#define wxHAS_NATIVE_TABART #define wxHAS_NATIVE_TABART
#include "wx/aui/tabartgtk.h" #include "wx/aui/tabartgtk.h"
#define wxAuiDefaultTabArt wxAuiGtkTabArt #define wxAuiDefaultTabArt wxAuiGtkTabArt
#elif defined(__WXMSW__)
#define wxHAS_NATIVE_TABART
#include "wx/aui/tabartmsw.h"
#define wxAuiDefaultTabArt wxAuiMSWTabArt
#endif #endif
#endif // !__WXUNIVERSAL__ #endif // !__WXUNIVERSAL__

View File

@ -31,9 +31,9 @@ class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt
public: public:
wxAuiGtkTabArt(); wxAuiGtkTabArt();
virtual wxAuiTabArt* Clone(); virtual wxAuiTabArt* Clone() wxOVERRIDE;
virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect); virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect); virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
virtual void DrawTab(wxDC& dc, virtual void DrawTab(wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
const wxAuiNotebookPage& page, const wxAuiNotebookPage& page,
@ -41,16 +41,16 @@ public:
int close_button_state, int close_button_state,
wxRect* out_tab_rect, wxRect* out_tab_rect,
wxRect* out_button_rect, wxRect* out_button_rect,
int* x_extent); int* x_extent) wxOVERRIDE;
void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id,
int button_state, int orientation, wxRect* out_rect); int button_state, int orientation, wxRect* out_rect) wxOVERRIDE;
int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages,
const wxSize& required_bmp_size); const wxSize& required_bmp_size) wxOVERRIDE;
int GetBorderWidth(wxWindow* wnd); int GetBorderWidth(wxWindow* wnd) wxOVERRIDE;
int GetAdditionalBorderSpace(wxWindow* wnd); int GetAdditionalBorderSpace(wxWindow* wnd) wxOVERRIDE;
virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption,
const wxBitmap& bitmap, bool active, const wxBitmap& bitmap, bool active,
int close_button_state, int* x_extent); int close_button_state, int* x_extent) wxOVERRIDE;
}; };
#endif // wxUSE_AUI #endif // wxUSE_AUI

View File

@ -0,0 +1,90 @@
/////////////////////////////////////////////////////////////////////////////
// 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_

View File

@ -65,7 +65,7 @@ public:
wxMenu* GetWindowMenu() const { return m_pWindowMenu; } wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
void SetWindowMenu(wxMenu* pMenu); void SetWindowMenu(wxMenu* pMenu);
virtual void SetMenuBar(wxMenuBar *pMenuBar); virtual void SetMenuBar(wxMenuBar *pMenuBar) wxOVERRIDE;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
void SetChildMenuBar(wxAuiMDIChildFrame *pChild); void SetChildMenuBar(wxAuiMDIChildFrame *pChild);
@ -102,13 +102,13 @@ protected:
void DoHandleUpdateUI(wxUpdateUIEvent &event); void DoHandleUpdateUI(wxUpdateUIEvent &event);
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
private: private:
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
DECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame) wxDECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame);
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -151,9 +151,9 @@ public:
virtual const wxIcon& GetIcon() const; virtual const wxIcon& GetIcon() const;
virtual void Activate(); virtual void Activate();
virtual bool Destroy(); virtual bool Destroy() wxOVERRIDE;
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// no status bars // no status bars
@ -187,7 +187,7 @@ public:
virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; } virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; }
virtual bool IsFullScreen() const { return false; } virtual bool IsFullScreen() const { return false; }
virtual bool IsTopLevel() const { return false; } virtual bool IsTopLevel() const wxOVERRIDE { return false; }
void OnMenuHighlight(wxMenuEvent& evt); void OnMenuHighlight(wxMenuEvent& evt);
void OnActivate(wxActivateEvent& evt); void OnActivate(wxActivateEvent& evt);
@ -198,13 +198,13 @@ public:
protected: protected:
void Init(); void Init();
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); 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); virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
// no size hints // no size hints
virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(maxW), int WXUNUSED(maxH),
int WXUNUSED(incW), int WXUNUSED(incH)) {} int WXUNUSED(incW), int WXUNUSED(incH)) wxOVERRIDE {}
public: public:
// This function needs to be called when a size change is confirmed, // This function needs to be called when a size change is confirmed,
// we needed this function to prevent anybody from the outside // we needed this function to prevent anybody from the outside
@ -228,8 +228,8 @@ protected:
private: private:
DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame) wxDECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame);
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
friend class wxAuiMDIClientWindow; friend class wxAuiMDIClientWindow;
}; };
@ -247,7 +247,7 @@ public:
virtual bool CreateClient(wxAuiMDIParentFrame *parent, virtual bool CreateClient(wxAuiMDIParentFrame *parent,
long style = wxVSCROLL | wxHSCROLL); long style = wxVSCROLL | wxHSCROLL);
virtual int SetSelection(size_t page); virtual int SetSelection(size_t page) wxOVERRIDE;
virtual wxAuiMDIChildFrame* GetActiveChild(); virtual wxAuiMDIChildFrame* GetActiveChild();
virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame) virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
{ {
@ -262,8 +262,8 @@ protected:
void OnSize(wxSizeEvent& evt); void OnSize(wxSizeEvent& evt);
private: private:
DECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow) wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow);
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
}; };
#endif // wxUSE_AUI #endif // wxUSE_AUI

View File

@ -87,7 +87,7 @@ public:
void SetGradient(const wxColour& start, const wxColour& end); void SetGradient(const wxColour& start, const wxColour& end);
protected: protected:
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
private: private:
// Common part of all constructors. // Common part of all constructors.

View File

@ -9,6 +9,8 @@
#ifndef _WX_BASE64_H_ #ifndef _WX_BASE64_H_
#define _WX_BASE64_H_ #define _WX_BASE64_H_
#include "wx/defs.h"
#if wxUSE_BASE64 #if wxUSE_BASE64
#include "wx/string.h" #include "wx/string.h"

View File

@ -36,31 +36,14 @@
// 'id': identifier was truncated to 'num' characters in the debug info // 'id': identifier was truncated to 'num' characters in the debug info
#pragma warning(disable:4786) #pragma warning(disable:4786)
// MSVC 5 does not have this // we have to disable (and reenable in afterstd.h) this one because,
#if __VISUALC__ > 1100 // even though it is of level 4, it is not disabled by warning(push, 1)
// we have to disable (and reenable in afterstd.h) this one because, // below for VC7.1!
// even though it is of level 4, it is not disabled by warning(push, 1)
// below for VC7.1!
// unreachable code // unreachable code
#pragma warning(disable:4702) #pragma warning(disable:4702)
#pragma warning(push, 1) #pragma warning(push, 1)
#else // VC 5
// 'expression' : signed/unsigned mismatch
#pragma warning(disable:4018)
// 'identifier' : unreferenced formal parameter
#pragma warning(disable:4100)
// 'conversion' : conversion from 'type1' to 'type2',
// possible loss of data
#pragma warning(disable:4244)
// C++ language change: to explicitly specialize class template
// 'identifier' use the following syntax
#pragma warning(disable:4663)
#endif
#endif // VC++ < 7 #endif // VC++ < 7
/** /**

View File

@ -71,9 +71,9 @@ protected:
#if defined(__WXDFB__) || \ #if defined(__WXDFB__) || \
defined(__WXMAC__) || \ defined(__WXMAC__) || \
defined(__WXGTK__) || \ defined(__WXGTK__) || \
defined(__WXCOCOA__) || \
defined(__WXMOTIF__) || \ defined(__WXMOTIF__) || \
defined(__WXX11__) defined(__WXX11__) || \
defined(__WXQT__)
#define wxUSE_BITMAP_BASE 1 #define wxUSE_BITMAP_BASE 1
#else #else
#define wxUSE_BITMAP_BASE 0 #define wxUSE_BITMAP_BASE 0
@ -100,8 +100,8 @@ public:
}; };
// All ports except wxMSW and wxOS2 use wxBitmapHandler and wxBitmapBase as // All ports except wxMSW use wxBitmapHandler and wxBitmapBase as
// base class for wxBitmapHandler; wxMSW and wxOS2 use wxGDIImageHandler as // base class for wxBitmapHandler; wxMSW uses wxGDIImageHandler as
// base class since it allows some code reuse there. // base class since it allows some code reuse there.
#if wxUSE_BITMAP_BASE #if wxUSE_BITMAP_BASE
@ -146,7 +146,7 @@ private:
wxString m_extension; wxString m_extension;
wxBitmapType m_type; wxBitmapType m_type;
DECLARE_ABSTRACT_CLASS(wxBitmapHandler) wxDECLARE_ABSTRACT_CLASS(wxBitmapHandler);
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -254,7 +254,7 @@ public:
protected: protected:
static wxList sm_handlers; static wxList sm_handlers;
DECLARE_ABSTRACT_CLASS(wxBitmapBase) wxDECLARE_ABSTRACT_CLASS(wxBitmapBase);
}; };
#endif // wxUSE_BITMAP_BASE #endif // wxUSE_BITMAP_BASE
@ -287,12 +287,9 @@ protected:
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_PICT_RESOURCE #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_PICT_RESOURCE
#include "wx/osx/bitmap.h" #include "wx/osx/bitmap.h"
#elif defined(__WXCOCOA__) #elif defined(__WXQT__)
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/cocoa/bitmap.h" #include "wx/qt/bitmap.h"
#elif defined(__WXPM__)
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE
#include "wx/os2/bitmap.h"
#endif #endif
#if wxUSE_IMAGE #if wxUSE_IMAGE
@ -305,13 +302,8 @@ wxBitmap::
#endif #endif
ConvertToDisabled(unsigned char brightness) const ConvertToDisabled(unsigned char brightness) const
{ {
// XXX comex: scale support const wxImage imgDisabled = ConvertToImage().ConvertToDisabled(brightness);
wxImage disabledImage = ConvertToImage().ConvertToDisabled(brightness); return wxBitmap(imgDisabled, -1, GetScaleFactor());
#ifdef __APPLE__
return wxBitmap(disabledImage, -1, GetScaleFactor());
#else
return disabledImage;
#endif
} }
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE

View File

@ -20,7 +20,7 @@
// FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton // FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton
// itself, this shouldn't be used for the other platforms neither // itself, this shouldn't be used for the other platforms neither
// when all of them do it // when all of them do it
#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__) #if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__) || defined(__WXQT__)) && !defined(__WXUNIVERSAL__)
#define wxHAS_BUTTON_BITMAP #define wxHAS_BUTTON_BITMAP
#endif #endif
@ -66,7 +66,7 @@ public:
} }
// Special creation function for a standard "Close" bitmap. It allows to // Special creation function for a standard "Close" bitmap. It allows to
// simply create a close button with the image appropriate for the common // simply create a close button with the image appropriate for the current
// platform. // platform.
static wxBitmapButton* NewCloseButton(wxWindow* parent, wxWindowID winid); static wxBitmapButton* NewCloseButton(wxWindow* parent, wxWindowID winid);
@ -80,16 +80,6 @@ public:
int GetMarginX() const { return DoGetBitmapMargins().x; } int GetMarginX() const { return DoGetBitmapMargins().x; }
int GetMarginY() const { return DoGetBitmapMargins().y; } int GetMarginY() const { return DoGetBitmapMargins().y; }
// deprecated synonym for SetBitmapLabel()
#if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
SetBitmapLabel(bitmap); )
// prevent virtual function hiding
virtual void SetLabel(const wxString& label)
{ wxWindow::SetLabel(label); }
#endif // WXWIN_COMPATIBILITY_2_6
protected: protected:
#ifndef wxHAS_BUTTON_BITMAP #ifndef wxHAS_BUTTON_BITMAP
// function called when any of the bitmaps changes // function called when any of the bitmaps changes
@ -133,10 +123,8 @@ protected:
#include "wx/gtk1/bmpbuttn.h" #include "wx/gtk1/bmpbuttn.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/osx/bmpbuttn.h" #include "wx/osx/bmpbuttn.h"
#elif defined(__WXCOCOA__) #elif defined(__WXQT__)
#include "wx/cocoa/bmpbuttn.h" #include "wx/qt/bmpbuttn.h"
#elif defined(__WXPM__)
#include "wx/os2/bmpbuttn.h"
#endif #endif
#endif // wxUSE_BMPBUTTON #endif // wxUSE_BMPBUTTON

View File

@ -17,6 +17,7 @@
#if wxUSE_BITMAPCOMBOBOX #if wxUSE_BITMAPCOMBOBOX
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/dynarray.h"
class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxItemContainer; class WXDLLIMPEXP_FWD_CORE wxItemContainer;

Some files were not shown because too many files have changed in this diff Show More