Merge pull request #3737 from EmptyChaos/update-wx

Externals: Update wxWidgets to 3.1.0

CMakeLists.txt

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

Externals/wxWidgets3/CMakeLists.txt

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

Externals/wxWidgets3/art/edit.xpm

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

Externals/wxWidgets3/art/fullscreen.xpm

@@ -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>",
+":>>>>>>>>>>>>>> "
+};

Externals/wxWidgets3/art/osx/README

@@ -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.

Externals/wxWidgets3/art/tango/fullscreen.h

@@ -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};

Externals/wxWidgets3/build/msw/wx_base.vcxproj

@@ -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">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -14,6 +14,8 @@
     <ClInclude Include="..\..\include\wx\aboutdlg.h" />
     <ClInclude Include="..\..\include\wx\accel.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\affinematrix2dbase.h" />
     <ClInclude Include="..\..\include\wx\afterstd.h" />
@@ -24,11 +26,23 @@
     <ClInclude Include="..\..\include\wx\anybutton.h" />
     <ClInclude Include="..\..\include\wx\anystr.h" />
     <ClInclude Include="..\..\include\wx\app.h" />
+    <ClInclude Include="..\..\include\wx\appprogress.h" />
     <ClInclude Include="..\..\include\wx\apptrait.h" />
     <ClInclude Include="..\..\include\wx\archive.h" />
     <ClInclude Include="..\..\include\wx\arrstr.h" />
     <ClInclude Include="..\..\include\wx\artprov.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\base64.h" />
     <ClInclude Include="..\..\include\wx\beforestd.h" />
@@ -41,7 +55,6 @@
     <ClInclude Include="..\..\include\wx\build.h" />
     <ClInclude Include="..\..\include\wx\busyinfo.h" />
     <ClInclude Include="..\..\include\wx\button.h" />
-    <ClInclude Include="..\..\include\wx\cairo.h" />
     <ClInclude Include="..\..\include\wx\calctrl.h" />
     <ClInclude Include="..\..\include\wx\caret.h" />
     <ClInclude Include="..\..\include\wx\chartype.h" />
@@ -59,6 +72,7 @@
     <ClInclude Include="..\..\include\wx\cmdline.h" />
     <ClInclude Include="..\..\include\wx\cmdproc.h" />
     <ClInclude Include="..\..\include\wx\cmndata.h" />
+    <ClInclude Include="..\..\include\wx\collheaderctrl.h" />
     <ClInclude Include="..\..\include\wx\collpane.h" />
     <ClInclude Include="..\..\include\wx\colordlg.h" />
     <ClInclude Include="..\..\include\wx\colour.h" />
@@ -161,6 +175,7 @@
     <ClInclude Include="..\..\include\wx\gdiobj.h" />
     <ClInclude Include="..\..\include\wx\generic\aboutdlgg.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\bmpcbox.h" />
     <ClInclude Include="..\..\include\wx\generic\busyinfo.h" />
@@ -169,6 +184,7 @@
     <ClInclude Include="..\..\include\wx\generic\caret.h" />
     <ClInclude Include="..\..\include\wx\generic\choicdgg.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\colour.h" />
     <ClInclude Include="..\..\include\wx\generic\colrdlgg.h" />
@@ -212,6 +228,15 @@
     <ClInclude Include="..\..\include\wx\generic\paletteg.h" />
     <ClInclude Include="..\..\include\wx\generic\panelg.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\progdlgg.h" />
     <ClInclude Include="..\..\include\wx\generic\propdlg.h" />
@@ -308,6 +333,7 @@
     <ClInclude Include="..\..\include\wx\msw\accel.h" />
     <ClInclude Include="..\..\include\wx\msw\anybutton.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\apptrait.h" />
     <ClInclude Include="..\..\include\wx\msw\bitmap.h" />
@@ -377,16 +403,13 @@
     <ClInclude Include="..\..\include\wx\msw\menu.h" />
     <ClInclude Include="..\..\include\wx\msw\menuitem.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\minifram.h" />
     <ClInclude Include="..\..\include\wx\msw\missing.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\nonownedwnd.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\activex.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\oleutils.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\palette.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\datecontrols.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\hiddenwin.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\subwin.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\textentry.h" />
     <ClInclude Include="..\..\include\wx\msw\tglbtn.h" />
@@ -522,7 +548,6 @@
     <ClInclude Include="..\..\include\wx\scrolwin.h" />
     <ClInclude Include="..\..\include\wx\selstore.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_redirect.h" />
     <ClInclude Include="..\..\include\wx\sharedptr.h" />
@@ -628,23 +653,6 @@
     <ClInclude Include="..\..\include\wx\wxcrtvararg.h" />
     <ClInclude Include="..\..\include\wx\wxhtml.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\xpmdecod.h" />
     <ClInclude Include="..\..\include\wx\xpmhand.h" />
@@ -670,15 +678,21 @@
   <ItemGroup>
     <ClCompile Include="..\..\src\aui\auibar.cpp" />
     <ClCompile Include="..\..\src\aui\auibook.cpp" />
+    <ClCompile Include="..\..\src\aui\barartmsw.cpp" />
     <ClCompile Include="..\..\src\aui\dockart.cpp" />
     <ClCompile Include="..\..\src\aui\floatpane.cpp" />
     <ClCompile Include="..\..\src\aui\framemanager.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\common\accelcmn.cpp" />
     <ClCompile Include="..\..\src\common\accesscmn.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\addremovectrl.cpp" />
     <ClCompile Include="..\..\src\common\affinematrix2d.cpp" />
     <ClCompile Include="..\..\src\common\anidecod.cpp" />
     <ClCompile Include="..\..\src\common\animatecmn.cpp" />
@@ -710,7 +724,9 @@
     <ClCompile Include="..\..\src\common\clrpickercmn.cpp" />
     <ClCompile Include="..\..\src\common\cmdline.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\colourdata.cpp" />
     <ClCompile Include="..\..\src\common\combocmn.cpp" />
@@ -799,7 +815,9 @@
     <ClCompile Include="..\..\src\common\gdicmn.cpp" />
     <ClCompile Include="..\..\src\common\geometry.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\gridcmn.cpp" />
     <ClCompile Include="..\..\src\common\hash.cpp" />
@@ -869,20 +887,25 @@
     <ClCompile Include="..\..\src\common\msgout.cpp" />
     <ClCompile Include="..\..\src\common\mstream.cpp" />
     <ClCompile Include="..\..\src\common\nbkbase.cpp" />
+    <ClCompile Include="..\..\src\common\notifmsgcmn.cpp" />
     <ClCompile Include="..\..\src\common\numformatter.cpp" />
     <ClCompile Include="..\..\src\common\object.cpp" />
     <ClCompile Include="..\..\src\common\odcombocmn.cpp" />
     <ClCompile Include="..\..\src\common\overlaycmn.cpp" />
     <ClCompile Include="..\..\src\common\ownerdrwcmn.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\pickerbase.cpp" />
     <ClCompile Include="..\..\src\common\platinfo.cpp" />
     <ClCompile Include="..\..\src\common\popupcmn.cpp" />
     <ClCompile Include="..\..\src\common\powercmn.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\protocol.cpp" />
     <ClCompile Include="..\..\src\common\quantize.cpp" />
@@ -991,6 +1014,7 @@
     <ClCompile Include="..\..\src\common\zipstrm.cpp" />
     <ClCompile Include="..\..\src\common\zstream.cpp" />
     <ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
+    <ClCompile Include="..\..\src\generic\activityindicator.cpp" />
     <ClCompile Include="..\..\src\generic\animateg.cpp" />
     <ClCompile Include="..\..\src\generic\bannerwindow.cpp" />
     <ClCompile Include="..\..\src\generic\bmpcboxg.cpp">
@@ -1004,6 +1028,7 @@
     <ClCompile Include="..\..\src\generic\choicbkg.cpp" />
     <ClCompile Include="..\..\src\generic\choicdgg.cpp" />
     <ClCompile Include="..\..\src\generic\clrpickerg.cpp" />
+    <ClCompile Include="..\..\src\generic\collheaderctrlg.cpp" />
     <ClCompile Include="..\..\src\generic\collpaneg.cpp" />
     <ClCompile Include="..\..\src\generic\colrdlgg.cpp" />
     <ClCompile Include="..\..\src\generic\combog.cpp">
@@ -1064,7 +1089,9 @@
     <ClCompile Include="..\..\src\generic\printps.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </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\propdlg.cpp" />
     <ClCompile Include="..\..\src\generic\regiong.cpp">
@@ -1101,6 +1128,7 @@
     <ClCompile Include="..\..\src\msw\accel.cpp" />
     <ClCompile Include="..\..\src\msw\anybutton.cpp" />
     <ClCompile Include="..\..\src\msw\app.cpp" />
+    <ClCompile Include="..\..\src\msw\appprogress.cpp" />
     <ClCompile Include="..\..\src\msw\artmsw.cpp" />
     <ClCompile Include="..\..\src\msw\basemsw.cpp" />
     <ClCompile Include="..\..\src\msw\bitmap.cpp" />
@@ -1133,7 +1161,9 @@
     <ClCompile Include="..\..\src\msw\dc.cpp" />
     <ClCompile Include="..\..\src\msw\dcclient.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\dde.cpp" />
     <ClCompile Include="..\..\src\msw\debughlp.cpp" />
@@ -1168,13 +1198,20 @@
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <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\graphicsd2d.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\headerctrl.cpp" />
     <ClCompile Include="..\..\src\msw\helpbest.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </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\hyperlink.cpp" />
     <ClCompile Include="..\..\src\msw\icon.cpp" />
@@ -1203,13 +1240,9 @@
     <ClCompile Include="..\..\src\msw\metafile.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\microwin.c">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\msw\mimetype.cpp" />
     <ClCompile Include="..\..\src\msw\minifram.cpp" />
     <ClCompile Include="..\..\src\msw\msgdlg.cpp" />
-    <ClCompile Include="..\..\src\msw\mslu.cpp" />
     <ClCompile Include="..\..\src\msw\nativdlg.cpp" />
     <ClCompile Include="..\..\src\msw\nativewin.cpp" />
     <ClCompile Include="..\..\src\msw\nonownedwnd.cpp" />
@@ -1218,7 +1251,9 @@
     <ClCompile Include="..\..\src\msw\ole\access.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </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\dataobj.cpp" />
     <ClCompile Include="..\..\src\msw\ole\dropsrc.cpp" />
@@ -1230,11 +1265,14 @@
     <ClCompile Include="..\..\src\msw\palette.cpp" />
     <ClCompile Include="..\..\src\msw\panel.cpp" />
     <ClCompile Include="..\..\src\msw\pen.cpp" />
-    <ClCompile Include="..\..\src\msw\penwin.cpp" />
     <ClCompile Include="..\..\src\msw\popupwin.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\radiobox.cpp" />
     <ClCompile Include="..\..\src\msw\radiobut.cpp" />
@@ -1259,7 +1297,9 @@
     <ClCompile Include="..\..\src\msw\stattext.cpp" />
     <ClCompile Include="..\..\src\msw\statusbar.cpp" />
     <ClCompile Include="..\..\src\msw\stdpaths.cpp" />
+    <ClCompile Include="..\..\src\msw\systhemectrl.cpp" />
     <ClCompile Include="..\..\src\msw\taskbar.cpp" />
+    <ClCompile Include="..\..\src\msw\taskbarbutton.cpp" />
     <ClCompile Include="..\..\src\msw\textctrl.cpp" />
     <ClCompile Include="..\..\src\msw\textentry.cpp" />
     <ClCompile Include="..\..\src\msw\textmeasure.cpp" />

Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters

@@ -34,6 +34,12 @@
     <Filter Include="MSW\ole">
       <UniqueIdentifier>{302035ca-b308-4626-83f9-60c08f3015c9}</UniqueIdentifier>
     </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>
     <ClInclude Include="..\..\wx\setup.h">
@@ -138,9 +144,6 @@
     <ClInclude Include="..\..\include\wx\button.h">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\cairo.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\calctrl.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -873,9 +876,6 @@
     <ClInclude Include="..\..\include\wx\settings.h">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\setup_gccxml.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\setup_inc.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -1173,33 +1173,6 @@
     <ClInclude Include="..\..\include\wx\wx.h">
       <Filter>Headers</Filter>
     </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">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -1218,30 +1191,6 @@
     <ClInclude Include="..\..\include\wx\wxprec.h">
       <Filter>Headers</Filter>
     </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">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -1488,9 +1437,6 @@
     <ClInclude Include="..\..\include\wx\msw\metafile.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\msw\microwin.h">
-      <Filter>Headers\MSW</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\mimetype.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
@@ -1500,9 +1446,6 @@
     <ClInclude Include="..\..\include\wx\msw\missing.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\msw\mslu.h">
-      <Filter>Headers\MSW</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\msvcrt.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
@@ -1512,9 +1455,6 @@
     <ClInclude Include="..\..\include\wx\msw\notebook.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\msw\notifmsg.h">
-      <Filter>Headers\MSW</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\ownerdrw.h">
       <Filter>Headers\MSW</Filter>
     </ClInclude>
@@ -1977,6 +1917,96 @@
     <ClInclude Include="..\..\include\wx\msw\ole\uuid.h">
       <Filter>Headers\MSW\ole</Filter>
     </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>
     <ClCompile Include="..\..\src\aui\auibar.cpp">
@@ -3218,9 +3248,6 @@
     <ClCompile Include="..\..\src\msw\metafile.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\microwin.c">
-      <Filter>MSW</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\msw\mimetype.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
@@ -3230,9 +3257,6 @@
     <ClCompile Include="..\..\src\msw\msgdlg.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\mslu.cpp">
-      <Filter>MSW</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\msw\nativdlg.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
@@ -3260,9 +3284,6 @@
     <ClCompile Include="..\..\src\msw\pen.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\penwin.cpp">
-      <Filter>MSW</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\msw\popupwin.cpp">
       <Filter>MSW</Filter>
     </ClCompile>
@@ -3443,6 +3464,39 @@
     <ClCompile Include="..\..\src\common\textmeasurecmn.cpp" />
     <ClCompile Include="..\..\src\common\threadinfo.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>
     <None Include="..\..\src\common\unictabl.inc">

Externals/wxWidgets3/build_wx.sh

@@ -1,7 +1,9 @@
 #!/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
+git checkout cbb799b1ae3f309c99beb0d287e9bb3b62ea405c
 
 case $OSTYPE in
 darwin*)
@@ -11,11 +13,12 @@ ADD_OPTS=--with-macosx-version-min=10.7 --enable-stl
 ;;
 linux*)
 BACKEND="gtk"
+ADD_OPTS=--without-gtkprint
 ;;
 esac
 
 mkdir build-local
 cd build-local
 
-../configure --with-$BACKEND --disable-shared --enable-unicode --disable-compat28 --disable-exceptions --disable-fswatcher --without-regex --without-expat --disable-xml --disable-ribbon --disable-propgrid --disable-stc --disable-html --disable-richtext --without-libjpeg --without-libtiff --disable-webview --disable-markup $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

Externals/wxWidgets3/include/msvc/wx/setup.h

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

Externals/wxWidgets3/include/wx/accel.h

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

Externals/wxWidgets3/include/wx/access.h

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

Externals/wxWidgets3/include/wx/activityindicator.h

@@ -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_

Externals/wxWidgets3/include/wx/addremovectrl.h

@@ -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_

Externals/wxWidgets3/include/wx/affinematrix2d.h

@@ -28,19 +28,19 @@ public:
     }
 
     // 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:
-    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:
     wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;

Externals/wxWidgets3/include/wx/afterstd.h

@@ -18,24 +18,7 @@
 
 // undo what we did in wx/beforestd.h
 #if defined(__VISUALC__) && __VISUALC__ <= 1201
-    // MSVC 5 does not have this
-    #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
 
 // see beforestd.h for explanation

Externals/wxWidgets3/include/wx/anidecod.h

@@ -36,26 +36,26 @@ public:
     ~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
 
-    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; }
-    wxAnimationType GetType() const
+    wxAnimationType GetType() const wxOVERRIDE
         { return wxANIMATION_TYPE_ANI; }
 
 private:
     // wxAnimationDecoder pure virtual:
-    virtual bool DoCanRead( wxInputStream& stream ) const;
+    virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
             // modifies current stream position (see wxAnimationDecoder::CanRead)
 
     // frames stored as wxImage(s): ANI files are meant to be used mostly for animated

Externals/wxWidgets3/include/wx/animate.h

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

Externals/wxWidgets3/include/wx/any.h

@@ -102,16 +102,10 @@ public:
         Use this template function for checking if wxAnyValueType represents
         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()
     */
-    // FIXME-VC6: remove this hack when VC6 is no longer supported
     template <typename T>
-    bool CheckType(T* reserved = NULL) const;
+    bool CheckType() const;
 
 #if wxUSE_EXTENDED_RTTI
     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) \
     wxAnyValueTypeImpl<T>::IsSameClass(valueTypePtr)
 
@@ -164,13 +159,17 @@ private:
 public: \
     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); \
     } \
 private: \
+    static bool AreSameClasses(const wxAnyValueType& a, const wxAnyValueType& b) \
+    { \
+        return wxTypeId(a) == wxTypeId(b); \
+    } \
     static wxAnyValueTypeScopedPtr sm_instance; \
 public: \
     static wxAnyValueType* GetInstance() \
@@ -183,12 +182,6 @@ public: \
 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.
 */
@@ -201,11 +194,7 @@ class wxAnyValueTypeOpsInplace
 public:
     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,
@@ -218,11 +207,17 @@ public:
 
     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
 
 
@@ -288,13 +287,13 @@ public:
     wxAnyValueTypeImplBase() : wxAnyValueType() { }
     virtual ~wxAnyValueTypeImplBase() { }
 
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
+    virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
     {
         Ops::DeleteValue(buf);
     }
 
     virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
+                            wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         Ops::SetValue(Ops::GetValue(src), dst);
     }
@@ -340,7 +339,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const
+                              wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         wxUnusedVar(src);
         wxUnusedVar(dstType);
@@ -418,7 +417,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 
@@ -433,7 +432,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 
@@ -469,7 +468,7 @@ public: \
     virtual ~wxAnyValueTypeImpl##TYPENAME() { } \
     virtual bool ConvertValue(const wxAnyValueBuffer& src, \
                               wxAnyValueType* dstType, \
-                              wxAnyValueBuffer& dst) const \
+                              wxAnyValueBuffer& dst) const wxOVERRIDE \
     { \
         GV value = GetValue(src); \
         return CONVFUNC(value, dstType, dst); \
@@ -520,7 +519,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 //
@@ -537,7 +536,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 // WX_ANY_DEFINE_SUB_TYPE requires this
@@ -565,7 +564,7 @@ public: \
  \
     virtual bool ConvertValue(const wxAnyValueBuffer& src, \
                               wxAnyValueType* dstType, \
-                              wxAnyValueBuffer& dst) const \
+                              wxAnyValueBuffer& dst) const wxOVERRIDE \
     { \
         wxUnusedVar(src); \
         wxUnusedVar(dstType); \
@@ -614,7 +613,7 @@ public:
         wxAnyValueTypeImplBase<wxVariantData*>() { }
     virtual ~wxAnyValueTypeImplVariantData() { }
 
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
+    virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
     {
         wxVariantData* data = static_cast<wxVariantData*>(buf.m_ptr);
         if ( data )
@@ -622,7 +621,7 @@ public:
     }
 
     virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
+                            wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         wxVariantData* data = static_cast<wxVariantData*>(src.m_ptr);
         if ( data )
@@ -644,7 +643,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const
+                              wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         wxUnusedVar(src);
         wxUnusedVar(dstType);
@@ -664,11 +663,6 @@ public:
 
 #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
@@ -720,7 +714,6 @@ wxConvertAnyToVariant(const wxAny& any, wxVariant* variant);
 
 #endif // wxUSE_VARIANT
 
-
 //
 // The wxAny class represents a container for any type. A variant's value
 // can be changed at run time, possibly to a different type of value.
@@ -790,15 +783,10 @@ public:
         Use this template function for checking if this wxAny holds
         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()
     */
-    // FIXME-VC6: remove this hack when VC6 is no longer supported
     template <typename T>
-    bool CheckType(T* = NULL) const
+    bool CheckType() const
     {
         return m_type->CheckType<T>();
     }
@@ -962,14 +950,16 @@ public:
         @remarks For convenience, conversion is done when T is wxString. This
                  is useful when a string literal (which are treated as
                  const char* and const wchar_t*) has been assigned to wxAny.
-
-                 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>
     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) )
         {
@@ -979,19 +969,6 @@ public:
         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
     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) \
     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) \
     (any).As(static_cast<T*>(NULL))
 
 
 template<typename T>
-inline bool wxAnyValueType::CheckType(T* reserved) const
+inline bool wxAnyValueType::CheckType() const
 {
-    wxUnusedVar(reserved);
     return wxAnyValueTypeImpl<T>::IsSameClass(this);
 }
 

Externals/wxWidgets3/include/wx/anybutton.h

@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/anybutton.h
 // Purpose:     wxAnyButtonBase class
-// Author:      Vadim Zetlin
+// Author:      Vadim Zeitlin
 // Created:     2000-08-15 (extracted from button.h)
-// Copyright:   (c) Vadim Zetlin
+// Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -102,7 +102,7 @@ public:
     // Buttons on MSW can look bad if they are not native colours, because
     // then they become owner-drawn and not theme-drawn.  Disable it here
     // in wxAnyButtonBase to make it consistent.
-    virtual bool ShouldInheritColours() const { return false; }
+    virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
 
     // wxUniv-compatible and deprecated equivalents to SetBitmapXXX()
 #if WXWIN_COMPATIBILITY_2_8
@@ -135,6 +135,13 @@ public:
         State_Max
     };
 
+    // return the current setting for the "normal" state of the button, it can
+    // be different from State_Normal for a wxToggleButton
+    virtual State GetNormalState() const
+    {
+        return State_Normal;
+    }
+
     // return true if this button shouldn't show the text label, either because
     // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT
     bool DontShowLabel() const
@@ -150,7 +157,7 @@ public:
 
 protected:
     // 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
         { return wxBitmap(); }
@@ -186,10 +193,8 @@ protected:
 //    #include "wx/gtk1/anybutton.h"
 #elif defined(__WXMAC__)
     #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
     typedef wxAnyButtonBase wxAnyButton;
 #endif

Externals/wxWidgets3/include/wx/anystr.h

@@ -60,7 +60,7 @@ public:
     // different conversions to pointers)
     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
     bool operator!() const { return !((bool)*this); }
 

Externals/wxWidgets3/include/wx/app.h

@@ -264,7 +264,7 @@ public:
 
     // Implement the inherited wxEventFilter method but just return -1 from it
     // 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
     // (already) be dispatched
@@ -298,10 +298,33 @@ public:
 
     // Function called if an uncaught exception is caught inside the main
     // event loop: it may return true to continue running the event loop or
-    // false to stop it (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();
 
+    // 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
 
 
@@ -516,7 +539,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
 };
 
-#if defined(__UNIX__) && !defined(__WXMSW__)
+#if defined(__UNIX__) && !defined(__WINDOWS__)
     #include "wx/unix/app.h"
 #else
     // this has to be a class and not a typedef as we forward declare it
@@ -541,7 +564,7 @@ public:
         // very first initialization function
         //
         // 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
         // depend on the toolkit. default version does nothing.
@@ -556,15 +579,15 @@ public:
         // of the program really starts here
         //
         // Override: rarely in GUI applications, always in console ones.
-    virtual int OnRun();
+    virtual int OnRun() wxOVERRIDE;
 
         // a matching function for OnInit()
-    virtual int OnExit();
+    virtual int OnExit() wxOVERRIDE;
 
         // very last clean up function
         //
         // Override: very rarely
-    virtual void CleanUp();
+    virtual void CleanUp() wxOVERRIDE;
 
 
     // the worker functions - usually not used directly by the user code
@@ -579,10 +602,10 @@ public:
         // parties
         //
         // 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
-    virtual bool UsesEventLoop() const { return true; }
+    virtual bool UsesEventLoop() const wxOVERRIDE { return true; }
 
 
     // top level window functions
@@ -645,8 +668,8 @@ public:
     // ------------------------------------------------------------------------
 
 #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
 
     // miscellaneous other stuff
@@ -657,15 +680,9 @@ public:
     // deactivated
     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:
     // override base class method to use GUI traits
-    virtual wxAppTraits *CreateTraits();
+    virtual wxAppTraits *CreateTraits() wxOVERRIDE;
 
 
     // the main top level window (may be NULL)
@@ -694,10 +711,6 @@ protected:
     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
 // ----------------------------------------------------------------------------
@@ -716,10 +729,8 @@ protected:
     #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
     #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
 
 #else // !GUI
@@ -851,7 +862,7 @@ public:
     wxIMPLEMENT_WX_THEME_SUPPORT            \
     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)    \
     wxIMPLEMENT_WXWIN_MAIN_CONSOLE          \
     wxIMPLEMENT_APP_NO_MAIN(appname)
@@ -875,7 +886,7 @@ extern wxAppInitializer wxTheAppInitializer;
 
 // deprecated variants _not_ requiring a semicolon after them
 // (note that also some wx-prefixed macro do _not_ require a semicolon because
-//  it's not always possible to force the 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                    wxIMPLEMENT_WXWIN_MAIN

Externals/wxWidgets3/include/wx/appprogress.h

@@ -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_

Externals/wxWidgets3/include/wx/apptrait.h

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

Externals/wxWidgets3/include/wx/archive.h

@@ -73,7 +73,7 @@ protected:
 private:
     wxArchiveNotifier *m_notifier;
 
-    DECLARE_ABSTRACT_CLASS(wxArchiveEntry)
+    wxDECLARE_ABSTRACT_CLASS(wxArchiveEntry);
 };
 
 
@@ -99,7 +99,7 @@ public:
 
     wxArchiveEntry *GetNextEntry()  { return DoGetNextEntry(); }
 
-    virtual char Peek()             { return wxInputStream::Peek(); }
+    virtual char Peek() wxOVERRIDE  { return wxInputStream::Peek(); }
 
 protected:
     wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv);
@@ -181,11 +181,7 @@ void _wxSetArchiveIteratorValue(
     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*>
-#endif
 class wxArchiveIterator
 {
 public:
@@ -374,7 +370,7 @@ private:
     static wxArchiveClassFactory *sm_first;
     wxArchiveClassFactory *m_next;
 
-    DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory)
+    wxDECLARE_ABSTRACT_CLASS(wxArchiveClassFactory);
 };
 
 #endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

Externals/wxWidgets3/include/wx/arrstr.h

@@ -14,19 +14,39 @@
 #include "wx/defs.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
 // case for compatibility with the existing code outside of the library which
 // 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);
 }
 
+// This comparison function ignores case when comparing strings differing not
+// in case only, i.e. this ensures that "Aa" comes before "AB", unlike with
+// wxStringSortAscending().
+inline int wxCMPFUNC_CONV
+wxDictionaryStringSortAscending(const wxString& s1, const wxString& s2)
+{
+    const int cmp = s1.CmpNoCase(s2);
+    return cmp ? cmp : s1.Cmp(s2);
+}
+
+inline int wxCMPFUNC_CONV
+wxDictionaryStringSortDescending(const wxString& s1, const wxString& s2)
+{
+    return wxDictionaryStringSortAscending(s2, s1);
+}
+
 #if wxUSE_STD_CONTAINERS
 
 #include "wx/dynarray.h"
@@ -38,9 +58,6 @@ _WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,
                         class WXDLLIMPEXP_BASE);
 WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase,
                                   wxBaseArrayStringBase, WXDLLIMPEXP_BASE);
-_WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase,
-                              wxBaseArrayStringBase, = wxStringSortAscending,
-                              class WXDLLIMPEXP_BASE, CMPFUNCwxString);
 
 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
 {
 public:
@@ -84,6 +105,9 @@ public:
         for ( size_t n = 0; n < src.size(); n++ )
             Add(src[n]);
     }
+    wxEXPLICIT wxSortedArrayString(wxArrayString::CompareFunction compareFunction)
+        : wxSortedArrayStringBase(compareFunction)
+        { }
 
     int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const;
 
@@ -101,21 +125,9 @@ private:
 
 #else // if !wxUSE_STD_CONTAINERS
 
-// this shouldn't be defined for compilers not supporting template methods or
-// without std::distance()
-//
-// 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
 {
@@ -159,7 +171,7 @@ public:
   void Clear();
     // preallocates memory for given number of items
   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();
 
   // simple accessors
@@ -295,7 +307,6 @@ public:
     { Init(false); assign(first, last); }
   wxArrayString(size_type n, const_reference v) { Init(false); assign(n, v); }
 
-#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
   template <class Iterator>
   void assign(Iterator first, Iterator last)
   {
@@ -304,15 +315,6 @@ public:
       for(; first != last; ++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)
     { clear(); Add(v, n); }
@@ -363,8 +365,13 @@ protected:
   void Init(bool autoSort);             // common part of all ctors
   void Copy(const wxArrayString& src);  // copies the contents of another array
 
+  CompareFunction m_compareFunction;    // set only from wxSortedArrayString
+
 private:
-  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
           m_nCount;   // current number of elements
@@ -381,6 +388,10 @@ public:
     { }
   wxSortedArrayString(const wxArrayString& array) : wxArrayString(true)
     { Copy(array); }
+
+  wxEXPLICIT wxSortedArrayString(CompareFunction compareFunction)
+      : wxArrayString(true)
+    { m_compareFunction = compareFunction; }
 };
 
 #endif // !wxUSE_STD_CONTAINERS
@@ -467,6 +478,16 @@ public:
         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
     wxArrayStringsAdapter(const wxString& s)
         : m_type(wxSTRING_POINTER), m_size(1)

Externals/wxWidgets3/include/wx/artprov.h

@@ -111,6 +111,9 @@ typedef wxString wxArtID;
 #define wxART_FIND                 wxART_MAKE_ART_ID(wxART_FIND)
 #define wxART_FIND_AND_REPLACE     wxART_MAKE_ART_ID(wxART_FIND_AND_REPLACE)
 
+#define wxART_FULL_SCREEN          wxART_MAKE_ART_ID(wxART_FULL_SCREEN)
+
+#define wxART_EDIT                 wxART_MAKE_ART_ID(wxART_EDIT)
 
 // ----------------------------------------------------------------------------
 // wxArtProvider class
@@ -186,17 +189,8 @@ public:
     // the topmost provider if 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:
     friend class wxArtProviderModule;
@@ -246,7 +240,7 @@ private:
     // art resources cache (so that CreateXXX is not called that often):
     static wxArtProviderCache *sm_cache;
 
-    DECLARE_ABSTRACT_CLASS(wxArtProvider)
+    wxDECLARE_ABSTRACT_CLASS(wxArtProvider);
 };
 
 

Externals/wxWidgets3/include/wx/atomic.h

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

Externals/wxWidgets3/include/wx/aui/auibar.h

@@ -83,7 +83,7 @@ public:
         m_toolId = c.m_toolId;
     }
 #endif
-    wxEvent *Clone() const { return new wxAuiToolBarEvent(*this); }
+    wxEvent *Clone() const wxOVERRIDE { return new wxAuiToolBarEvent(*this); }
 
     bool IsDropDownClicked() const  { return m_isDropdownClicked; }
     void SetDropDownClicked(bool c) { m_isDropdownClicked = c;    }
@@ -105,7 +105,7 @@ private:
     int m_toolId;
 
 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:
 
-    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(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxRect& rect);
+                const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawPlainBackground(wxDC& dc,
                                   wxWindow* wnd,
-                                  const wxRect& rect);
+                                  const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawLabel(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect);
+                const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawButton(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect);
+                const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawDropDownButton(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect);
+                const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawControlLabel(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect);
+                const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawSeparator(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxRect& rect);
+                const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawGripper(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxRect& rect);
+                const wxRect& rect) wxOVERRIDE;
 
     virtual void DrawOverflowButton(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxRect& rect,
-                int state);
+                int state) wxOVERRIDE;
 
     virtual wxSize GetLabelSize(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxAuiToolBarItem& item);
+                const wxAuiToolBarItem& item) wxOVERRIDE;
 
     virtual wxSize GetToolSize(
                 wxDC& dc,
                 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,
-                             const wxAuiToolBarItemArray& items);
+                             const wxAuiToolBarItemArray& items) wxOVERRIDE;
 
 protected:
 
@@ -475,12 +475,12 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxAUI_TB_DEFAULT_STYLE);
 
-    virtual void SetWindowStyleFlag(long style);
+    virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
 
     void SetArtProvider(wxAuiToolBarArt* art);
     wxAuiToolBarArt* GetArtProvider() const;
 
-    bool SetFont(const wxFont& font);
+    bool SetFont(const wxFont& font) wxOVERRIDE;
 
 
     wxAuiToolBarItem* AddTool(int toolId,
@@ -605,7 +605,7 @@ public:
     bool IsPaneValid(const wxAuiPaneInfo& pane) const;
 
     // Override to call DoIdleUpdate().
-    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
+    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE;
 
 protected:
     void Init();
@@ -631,7 +631,7 @@ protected:
                    int y,
                    int width,
                    int height,
-                   int sizeFlags = wxSIZE_AUTO);
+                   int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
 
 protected: // handlers
 
@@ -692,8 +692,8 @@ private:
     // Common part of OnLeaveWindow() and OnCaptureLost().
     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_BEGIN_DRAG       wxEVT_AUITOOLBAR_BEGIN_DRAG
 
+#ifdef __WXMSW__
+    #define wxHAS_NATIVE_TOOLBAR_ART
+    #include "wx/aui/barartmsw.h"
+    #define wxAuiDefaultToolBarArt wxAuiMSWToolBarArt
+#endif
+
+#ifndef wxHAS_NATIVE_TOOLBAR_ART
+    #define wxAuiDefaultToolBarArt wxAuiGenericToolBarArt
+#endif
+
 #endif  // wxUSE_AUI
 #endif  // _WX_AUIBAR_H_
 

Externals/wxWidgets3/include/wx/aui/auibook.h

@@ -75,7 +75,7 @@ public:
         m_dragSource = c.m_dragSource;
     }
 #endif
-    wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); }
+    wxEvent *Clone() const wxOVERRIDE { return new wxAuiNotebookEvent(*this); }
 
     void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; }
     wxAuiNotebook* GetDragSource() const { return m_dragSource; }
@@ -85,7 +85,7 @@ private:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent);
 #endif
 };
 
@@ -99,6 +99,7 @@ public:
     wxBitmap bitmap;      // tab's bitmap
     wxRect rect;          // tab's hit rectangle
     bool active;          // true if the page is currently active
+    bool hover;           // true if mouse hovering over tab
 };
 
 class WXDLLIMPEXP_AUI wxAuiTabContainerButton
@@ -206,7 +207,7 @@ public:
 
 protected:
     // 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 OnEraseBackground(wxEraseEvent& evt);
@@ -234,9 +235,11 @@ protected:
     wxAuiTabContainerButton* m_hoverButton;
     wxAuiTabContainerButton* m_pressedButton;
 
+    void SetHoverTab(wxWindow* wnd);
+
 #ifndef SWIG
-    DECLARE_CLASS(wxAuiTabCtrl)
+    wxDECLARE_CLASS(wxAuiTabCtrl);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
@@ -268,7 +271,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0);
 
-    void SetWindowStyleFlag(long style);
+    void SetWindowStyleFlag(long style) wxOVERRIDE;
     void SetArtProvider(wxAuiTabArt* art);
     wxAuiTabArt* GetArtProvider() const;
 
@@ -286,15 +289,15 @@ public:
                     bool select = false,
                     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;
 
-    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);
     wxString GetPageToolTip(size_t pageIdx) const;
@@ -302,8 +305,8 @@ public:
     bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
     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);
 
@@ -319,7 +322,7 @@ public:
     void SetMeasuringFont(const wxFont& font);
 
     // Sets the tab font
-    virtual bool SetFont(const wxFont& font);
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
 
     // Gets the tab control height
     int GetTabCtrlHeight() const;
@@ -331,36 +334,36 @@ public:
     bool ShowWindowMenu();
 
     // 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
     // virtual bool AcceptsFocus() const { return false; }
 
     //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, 
-                         int imageId);
+                         int imageId) wxOVERRIDE;
-    virtual bool DeleteAllPages();
+    virtual bool DeleteAllPages() wxOVERRIDE;
     virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text,
-                            bool select, int imageId);
+                            bool select, int imageId) wxOVERRIDE;
 
 protected:
     // Common part of all ctors.
     void Init();
 
     // 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
-    virtual void DoThaw();
+    virtual void DoThaw() wxOVERRIDE;
 
     // these can be overridden
 
@@ -372,7 +375,7 @@ protected:
     virtual wxSize CalculateNewSplitSize();
 
     // 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
     virtual int DoModifySelection(size_t n, bool events);
@@ -432,8 +435,8 @@ protected:
     unsigned int m_flags;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxAuiNotebook)
+    wxDECLARE_CLASS(wxAuiNotebook);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 

Externals/wxWidgets3/include/wx/aui/barartmsw.h

@@ -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_

Externals/wxWidgets3/include/wx/aui/floatpane.h

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

Externals/wxWidgets3/include/wx/aui/framemanager.h

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

Externals/wxWidgets3/include/wx/aui/tabart.h

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

Externals/wxWidgets3/include/wx/aui/tabartgtk.h

@@ -31,9 +31,9 @@ class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt
 public:
     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,
                          wxWindow* wnd,
                          const wxAuiNotebookPage& page,
@@ -41,16 +41,16 @@ public:
                          int close_button_state,
                          wxRect* out_tab_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,
-                    int button_state, int orientation, wxRect* out_rect);
+                    int button_state, int orientation, wxRect* out_rect) wxOVERRIDE;
     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,
                               const wxBitmap& bitmap, bool active,
-                              int close_button_state, int* x_extent);
+                              int close_button_state, int* x_extent) wxOVERRIDE;
 };
 
 #endif  // wxUSE_AUI

Externals/wxWidgets3/include/wx/aui/tabartmsw.h

@@ -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_

Externals/wxWidgets3/include/wx/aui/tabmdi.h

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

Externals/wxWidgets3/include/wx/bannerwindow.h

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

Externals/wxWidgets3/include/wx/base64.h

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

Externals/wxWidgets3/include/wx/beforestd.h

@@ -36,8 +36,6 @@
     // 'id': identifier was truncated to 'num' characters in the debug info
     #pragma warning(disable:4786)
 
-    // MSVC 5 does not have this
-    #if __VISUALC__ > 1100
     // we have to disable (and reenable in afterstd.h) this one because,
     // even though it is of level 4, it is not disabled by warning(push, 1)
     // below for VC7.1!
@@ -46,21 +44,6 @@
     #pragma warning(disable:4702)
 
     #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
 
 /**

Externals/wxWidgets3/include/wx/bitmap.h

@@ -71,9 +71,9 @@ protected:
 #if defined(__WXDFB__) || \
     defined(__WXMAC__) || \
     defined(__WXGTK__) || \
-    defined(__WXCOCOA__) || \
     defined(__WXMOTIF__) || \
-    defined(__WXX11__)
+    defined(__WXX11__) || \
+    defined(__WXQT__)
     #define wxUSE_BITMAP_BASE 1
 #else
     #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.
 #if wxUSE_BITMAP_BASE
 
@@ -146,7 +146,7 @@ private:
     wxString      m_extension;
     wxBitmapType  m_type;
 
-    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
+    wxDECLARE_ABSTRACT_CLASS(wxBitmapHandler);
 };
 
 // ----------------------------------------------------------------------------
@@ -254,7 +254,7 @@ public:
 protected:
     static wxList sm_handlers;
 
-    DECLARE_ABSTRACT_CLASS(wxBitmapBase)
+    wxDECLARE_ABSTRACT_CLASS(wxBitmapBase);
 };
 
 #endif // wxUSE_BITMAP_BASE
@@ -287,12 +287,9 @@ protected:
 #elif defined(__WXMAC__)
     #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_PICT_RESOURCE
     #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
 
 #if wxUSE_IMAGE
@@ -305,13 +302,8 @@ wxBitmap::
 #endif
 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
 

Externals/wxWidgets3/include/wx/bmpbuttn.h

@@ -20,7 +20,7 @@
 // FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton
 //        itself, this shouldn't be used for the other platforms neither
 //        when all of them do it
-#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
+#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__) || defined(__WXQT__)) && !defined(__WXUNIVERSAL__)
     #define wxHAS_BUTTON_BITMAP
 #endif
 
@@ -66,7 +66,7 @@ public:
     }
 
     // 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.
     static wxBitmapButton* NewCloseButton(wxWindow* parent, wxWindowID winid);
 
@@ -80,16 +80,6 @@ public:
     int GetMarginX() const { return DoGetBitmapMargins().x; }
     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:
 #ifndef wxHAS_BUTTON_BITMAP
     // function called when any of the bitmaps changes
@@ -133,10 +123,8 @@ protected:
     #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
     #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 // wxUSE_BMPBUTTON

Externals/wxWidgets3/include/wx/bmpcbox.h

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

Externals/wxWidgets3/include/wx/bookctrl.h

@@ -38,7 +38,7 @@ enum
     wxBK_HITTEST_NOWHERE = 1,   // not on tab
     wxBK_HITTEST_ONICON  = 2,   // on icon
     wxBK_HITTEST_ONLABEL = 4,   // on label
-    wxBK_HITTEST_ONITEM  = wxBK_HITTEST_ONICON | wxBK_HITTEST_ONLABEL,
+    wxBK_HITTEST_ONITEM  = 16,  // on tab control but not on its icon or label
     wxBK_HITTEST_ONPAGE  = 8    // not on tab control, but over the selected page
 };
 
@@ -226,13 +226,13 @@ public:
 
 
     // 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
-    virtual bool AcceptsFocus() const { return false; }
+    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
 
     // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
+    virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
 
 protected:
     // flags for DoSetSelection()
@@ -242,7 +242,7 @@ protected:
     };
 
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     // After the insertion of the page in the method InsertPage, calling this
     // method sets the selection to the given page or the first one if there is
@@ -303,7 +303,7 @@ protected:
     virtual wxWindow *DoRemovePage(size_t page) = 0;
 
     // our best size is the size which fits all our pages
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
     // helper: get the next page wrapping if we reached the end
     int GetNextPage(bool forward) const;
@@ -356,10 +356,10 @@ private:
     // internal border
     unsigned int m_internalBorder;
 
-    DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
+    wxDECLARE_ABSTRACT_CLASS(wxBookCtrlBase);
     wxDECLARE_NO_COPY_CLASS(wxBookCtrlBase);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -384,7 +384,7 @@ public:
         m_nOldSel = event.m_nOldSel;
     }
 
-    virtual wxEvent *Clone() const { return new wxBookCtrlEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxBookCtrlEvent(*this); }
 
     // accessors
         // the currently selected page (wxNOT_FOUND if none)
@@ -398,7 +398,7 @@ private:
     int m_nSel,     // currently selected page
         m_nOldSel;  // previously selected page
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent);
 };
 
 typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
@@ -432,14 +432,6 @@ typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
 #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED    wxEVT_BOOKCTRL_PAGE_CHANGED
 #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING   wxEVT_BOOKCTRL_PAGE_CHANGING
 
-#if WXWIN_COMPATIBILITY_2_6
-    #define wxBC_TOP                               wxBK_TOP
-    #define wxBC_BOTTOM                            wxBK_BOTTOM
-    #define wxBC_LEFT                              wxBK_LEFT
-    #define wxBC_RIGHT                             wxBK_RIGHT
-    #define wxBC_DEFAULT                           wxBK_DEFAULT
-#endif
-
 #endif // wxUSE_BOOKCTRL
 
 #endif // _WX_BOOKCTRL_H_

Externals/wxWidgets3/include/wx/brush.h

@@ -81,10 +81,8 @@ public:
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/brush.h"
-#elif defined(__WXCOCOA__)
+#elif defined(__WXQT__)
-    #include "wx/cocoa/brush.h"
+    #include "wx/qt/brush.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/brush.h"
 #endif
 
 class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
@@ -93,15 +91,9 @@ public:
     wxBrush *FindOrCreateBrush(const wxColour& colour,
                                wxBrushStyle style = wxBRUSHSTYLE_SOLID);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
     wxBrush *FindOrCreateBrush(const wxColour& colour, int style)
         { return FindOrCreateBrush(colour, (wxBrushStyle)style); }
-#endif
-
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void AddBrush(wxBrush*) );
-    wxDEPRECATED( void RemoveBrush(wxBrush*) );
-#endif
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxBrushList*)   wxTheBrushList;
@@ -112,25 +104,24 @@ extern WXDLLIMPEXP_DATA_CORE(wxBrushList*)   wxTheBrushList;
 //
 // to compile without warnings which it would otherwise provoke from some
 // compilers as it compares elements of different enums
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
 
 // Unfortunately some compilers have ambiguity issues when enum comparisons are
 // overloaded so we have to disable the overloads in this case, see
 // wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
 #ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
 
+wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
 inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
 {
     return static_cast<int>(s) == static_cast<int>(t);
 }
 
+wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
 inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
 {
-    return !(s == t);
+    return static_cast<int>(s) != static_cast<int>(t);
 }
 
 #endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
 
-#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
-
 #endif // _WX_BRUSH_H_BASE_

Externals/wxWidgets3/include/wx/buffer.h

@@ -354,9 +354,6 @@ public:
     }
 };
 
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<char> )
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<char> )
-
 class wxCharBuffer : public wxCharTypeBuffer<char>
 {
 public:
@@ -374,9 +371,6 @@ public:
     wxCharBuffer(const wxCStrData& cstr);
 };
 
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<wchar_t> )
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wchar_t> )
-
 class wxWCharBuffer : public wxCharTypeBuffer<wchar_t>
 {
 public:
@@ -464,13 +458,17 @@ private:
     {
         if (newSize > m_size)
         {
-            void *dataOld = m_data;
+            void* const data = realloc(m_data, newSize + wxMemoryBufferData::DefBufSize);
-            m_data = realloc(m_data, newSize + wxMemoryBufferData::DefBufSize);
+            if ( !data )
-            if ( !m_data )
             {
-                free(dataOld);
+                // It's better to crash immediately dereferencing a null
+                // pointer in the function calling us than overflowing the
+                // buffer which couldn't be made big enough.
+                free(release());
+                return;
             }
 
+            m_data = data;
             m_size = newSize + wxMemoryBufferData::DefBufSize;
         }
     }

Externals/wxWidgets3/include/wx/build.h

@@ -52,36 +52,44 @@
 // GCC and Intel C++ share same C++ ABI (and possibly others in the future),
 // check if compiler versions are compatible:
 #if defined(__GXX_ABI_VERSION)
+    // The changes between ABI versions 1002 through 1010 (documented at
+    // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html
+    // under -fabi-version) don't affect wxWidgets, so we allow a library
+    // and an application to differ within that range.
+    #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1010))
+        #define wxGXX_EFFECTIVE_ABI_VERSION 1002
+    #else
+        #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION
+    #endif
     #define __WX_BO_COMPILER \
-            ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
+            ",compiler with C++ ABI " __WX_BO_STRINGIZE(wxGXX_EFFECTIVE_ABI_VERSION)
-#elif defined(__INTEL_COMPILER)
-    #define __WX_BO_COMPILER ",Intel C++"
 #elif defined(__GNUG__)
     #define __WX_BO_COMPILER ",GCC " \
             __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
 #elif defined(__VISUALC__)
     #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER)
+#elif defined(__INTEL_COMPILER)
+    // Notice that this must come after MSVC check as ICC under Windows is
+    // ABI-compatible with the corresponding version of the MSVC and we want to
+    // allow using it compile the application code using MSVC-built DLLs.
+    #define __WX_BO_COMPILER ",Intel C++"
 #elif defined(__BORLANDC__)
     #define __WX_BO_COMPILER ",Borland C++"
-#elif defined(__DIGITALMARS__)
-    #define __WX_BO_COMPILER ",DigitalMars"
-#elif defined(__WATCOMC__)
-    #define __WX_BO_COMPILER ",Watcom C++"
 #else
     #define __WX_BO_COMPILER
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
-#if WXWIN_COMPATIBILITY_2_6
-    #define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6"
-#else
-    #define __WX_BO_WXWIN_COMPAT_2_6
-#endif
 #if WXWIN_COMPATIBILITY_2_8
     #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8"
 #else
     #define __WX_BO_WXWIN_COMPAT_2_8
 #endif
+#if WXWIN_COMPATIBILITY_3_0
+    #define __WX_BO_WXWIN_COMPAT_3_0 ",compatible with 3.0"
+#else
+    #define __WX_BO_WXWIN_COMPAT_3_0
+#endif
 
 // deriving wxWin containers from STL ones changes them completely:
 #if wxUSE_STD_CONTAINERS
@@ -90,13 +98,13 @@
     #define __WX_BO_STL ",wx containers"
 #endif
 
-// This macro is passed as argument to wxConsoleApp::CheckBuildOptions()
+// This macro is passed as argument to wxAppConsole::CheckBuildOptions()
 #define WX_BUILD_OPTIONS_SIGNATURE \
     __WX_BO_VERSION(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) \
     " (" __WX_BO_UNICODE \
      __WX_BO_COMPILER \
      __WX_BO_STL \
-     __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \
+     __WX_BO_WXWIN_COMPAT_2_8 __WX_BO_WXWIN_COMPAT_3_0 \
      ")"
 
 

Externals/wxWidgets3/include/wx/busyinfo.h

@@ -13,6 +13,64 @@
 
 #if wxUSE_BUSYINFO
 
+#include "wx/colour.h"
+#include "wx/icon.h"
+
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+
+// This class is used to pass all the various parameters to wxBusyInfo ctor.
+// According to the usual naming conventions (see wxAboutDialogInfo,
+// wxFontInfo, ...) it would be called wxBusyInfoInfo, but this would have been
+// rather strange, so we call it wxBusyInfoFlags instead.
+//
+// Methods are mostly self-explanatory except for the difference between "Text"
+// and "Label": the former can contain markup, while the latter is just plain
+// string which is not parsed in any way.
+class wxBusyInfoFlags
+{
+public:
+    wxBusyInfoFlags()
+    {
+        m_parent = NULL;
+        m_alpha = wxALPHA_OPAQUE;
+    }
+
+    wxBusyInfoFlags& Parent(wxWindow* parent)
+        { m_parent = parent; return *this; }
+
+    wxBusyInfoFlags& Icon(const wxIcon& icon)
+        { m_icon = icon; return *this; }
+    wxBusyInfoFlags& Title(const wxString& title)
+        { m_title = title; return *this; }
+    wxBusyInfoFlags& Text(const wxString& text)
+        { m_text = text; return *this; }
+    wxBusyInfoFlags& Label(const wxString& label)
+        { m_label = label; return *this; }
+
+    wxBusyInfoFlags& Foreground(const wxColour& foreground)
+        { m_foreground = foreground; return *this; }
+    wxBusyInfoFlags& Background(const wxColour& background)
+        { m_background = background; return *this; }
+
+    wxBusyInfoFlags& Transparency(wxByte alpha)
+        { m_alpha = alpha; return *this; }
+
+private:
+    wxWindow* m_parent;
+
+    wxIcon m_icon;
+    wxString m_title,
+             m_text,
+             m_label;
+
+    wxColour m_foreground,
+             m_background;
+
+    wxByte m_alpha;
+
+    friend class wxBusyInfo;
+};
+
 #include "wx/generic/busyinfo.h"
 
 #endif // wxUSE_BUSYINFO

Externals/wxWidgets3/include/wx/button.h

@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/button.h
 // Purpose:     wxButtonBase class
-// Author:      Vadim Zetlin
+// Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.08.00
-// Copyright:   (c) Vadim Zetlin
+// Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -58,10 +58,8 @@ protected:
     #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/button.h"
-#elif defined(__WXCOCOA__)
+#elif defined(__WXQT__)
-    #include "wx/cocoa/button.h"
+    #include "wx/qt/button.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/button.h"
 #endif
 
 #endif // wxUSE_BUTTON

Externals/wxWidgets3/include/wx/cairo.h

@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cairo.h
-// Purpose:     Cairo library
-// Author:      Anthony Bretaudeau
-// Created:     2007-08-25
-// RCS-ID:      $Id: cairo.h 68935 2011-08-27 23:26:53Z RD $
-// Copyright:   (c) Anthony Bretaudeau
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CAIRO_H_BASE_
-#define _WX_CAIRO_H_BASE_
-
-#if wxUSE_CAIRO
-
-#include "wx/dynlib.h"
-#include <cairo.h>
-
-extern "C"
-{
-    
-bool wxCairoInit();
-void wxCairoCleanUp();
-
-}
-
-#endif // wxUSE_CAIRO
-
-#endif // _WX_CAIRO_H_BASE_

Externals/wxWidgets3/include/wx/calctrl.h

@@ -164,15 +164,15 @@ public:
     wxCalendarEvent(const wxCalendarEvent& event)
         : wxDateEvent(event), m_wday(event.m_wday) { }
 
-    void SetWeekDay(const wxDateTime::WeekDay wd) { m_wday = wd; }
+    void SetWeekDay(wxDateTime::WeekDay wd) { m_wday = wd; }
     wxDateTime::WeekDay GetWeekDay() const { return m_wday; }
 
-    virtual wxEvent *Clone() const { return new wxCalendarEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalendarEvent(*this); }
 
 private:
     wxDateTime::WeekDay m_wday;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalendarEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalendarEvent);
 };
 
 // ----------------------------------------------------------------------------
@@ -348,6 +348,9 @@ protected:
     #elif defined(__WXMSW__)
         #define wxHAS_NATIVE_CALENDARCTRL
         #include "wx/msw/calctrl.h"
+    #elif defined(__WXQT__)
+        #define wxHAS_NATIVE_CALENDARCTRL
+        #include "wx/qt/calctrl.h"
     #endif
 #endif // !__WXUNIVERSAL__
 

Externals/wxWidgets3/include/wx/chartype.h

@@ -26,10 +26,6 @@
         #endif
     #elif defined(__GNUWIN32__) && !defined(__MINGW32__)
         #define wxUSE_WCHAR_T 0
-    #elif defined(__WATCOMC__)
-        #define wxUSE_WCHAR_T 0
-    #elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
-        #define wxUSE_WCHAR_T 0
     #else
         /* add additional compiler checks if this fails */
         #define wxUSE_WCHAR_T 1
@@ -47,7 +43,7 @@
 
    Actually MinGW has tchar.h, but it does not include wchar.h
  */
-#if defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
+#if defined(__MINGW32__)
     #ifndef HAVE_WCHAR_H
         #define HAVE_WCHAR_H
     #endif
@@ -71,10 +67,27 @@
         }
     #endif /* Cygwin and C++ */
 
+    /* the current (as of Mar 2014) version of Android (up to api level 19) */
+    /* doesn't include some declarations (wscdup, wcslen, wcscasecmp, etc.) */
+    /* (moved out from __CYGWIN__ block) */
+    #if defined(__WXQT__) && !defined(wcsdup) && defined(__ANDROID__)
+        #ifdef __cplusplus
+            extern "C" {
+        #endif
+            extern wchar_t *wcsdup(const wchar_t *);
+            extern size_t wcslen (const wchar_t *);
+            extern size_t wcsnlen (const wchar_t *, size_t );
+            extern int wcscasecmp (const wchar_t *, const wchar_t *);
+            extern int wcsncasecmp (const wchar_t *, const wchar_t *, size_t);
+        #ifdef __cplusplus
+            }
+        #endif
+    #endif /* Android */
+
 #elif defined(HAVE_WCSTR_H)
     /* old compilers have relevant declarations here */
     #include <wcstr.h>
-#elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
+#elif defined(__FreeBSD__) || defined(__DARWIN__)
     /* include stdlib.h for wchar_t */
     #include <stdlib.h>
 #endif /* HAVE_WCHAR_H */
@@ -95,24 +108,11 @@
 #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
     #define wxHAVE_TCHAR_SUPPORT
     #include <ctype.h>
-#elif defined(__WATCOMC__)
-    #define wxHAVE_TCHAR_SUPPORT
-#elif defined(__DMC__)
-    #define wxHAVE_TCHAR_SUPPORT
 #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
     #define wxHAVE_TCHAR_SUPPORT
     #include <stddef.h>
     #include <string.h>
     #include <ctype.h>
-#elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
-    /* VZ: the old VisualAge definitions were completely wrong and had no    */
-    /*     chance at all to work in Unicode build anyhow so let's pretend    */
-    /*     that VisualAge does _not_ support TCHAR for the moment (as        */
-    /*     indicated by "0 &&" above) until someone really has time to delve */
-    /*     into Unicode issues under OS/2 */
-
-    /* VisualAge 4.0+ supports TCHAR */
-    #define wxHAVE_TCHAR_SUPPORT
 #endif /* compilers with (good) TCHAR support */
 
 #ifdef wxHAVE_TCHAR_SUPPORT
@@ -140,37 +140,9 @@
     /*     signed/unsigned version of it which (a) makes sense to me (unlike */
     /*     char wchar_t is always unsigned) and (b) was how the previous     */
     /*     definitions worked so keep it like this                           */
-
-    /* Sun's SunPro compiler supports the wchar_t type and wide character    */
-    /* functions, but does not define __WCHAR_TYPE__. Define it here to      */
-    /* allow unicode enabled builds.                                         */
-    #if (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && !defined(__WCHAR_TYPE__)
-        #define __WCHAR_TYPE__ wxchar_t
-    #endif
-
-    /* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */
-    /* comment below */
-    #if !defined(__WCHAR_TYPE__) || \
-        (!defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 96))
-        /* standard case */
     typedef wchar_t wxChar;
     typedef wchar_t wxSChar;
     typedef wchar_t wxUChar;
-    #else /* __WCHAR_TYPE__ and gcc < 2.96 */
-        /* VS: wxWidgets used to define wxChar as __WCHAR_TYPE__ here.       */
-        /*     However, this doesn't work with new GCC 3.x compilers because */
-        /*     wchar_t is C++'s builtin type in the new standard. OTOH, old  */
-        /*     compilers (GCC 2.x) won't accept new definition of            */
-        /*     wx{S,U}CharType, so we have to define wxChar                  */
-        /*     conditionally depending on detected compiler & compiler       */
-        /*     version.                                                      */
-
-        /*     with old definition of wxChar. */
-        #define wchar_t __WCHAR_TYPE__
-        typedef __WCHAR_TYPE__ wxChar;
-        typedef __WCHAR_TYPE__ wxSChar;
-        typedef __WCHAR_TYPE__ wxUChar;
-    #endif /* __WCHAR_TYPE__ */
 #endif /* ASCII/Unicode */
 
 /* ------------------------------------------------------------------------- */

Externals/wxWidgets3/include/wx/checkbox.h

@@ -97,10 +97,10 @@ public:
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
-    virtual bool HasTransparentBackground() { return true; }
+    virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
 
     // wxCheckBox-specific processing after processing the update event
-    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event)
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE
     {
         wxControl::DoUpdateWindowUI(event);
 
@@ -110,7 +110,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
@@ -178,11 +178,8 @@ private:
     #include "wx/gtk1/checkbox.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/checkbox.h"
-#elif defined(__WXCOCOA__)
+#elif defined(__WXQT__)
-    #include "wx/cocoa/checkbox.h"
+    #include "wx/qt/checkbox.h"
-#elif defined(__WXPM__)
-    #undef wxHAS_3STATE_CHECKBOX
-    #include "wx/os2/checkbox.h"
 #endif
 
 #endif // wxUSE_CHECKBOX

Externals/wxWidgets3/include/wx/checklst.h

@@ -21,13 +21,7 @@
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCheckListBoxBase : public
+class WXDLLIMPEXP_CORE wxCheckListBoxBase : public wxListBox
-                                              #ifdef __WXWINCE__
-                                                  // keep virtuals synchronised
-                                                  wxListBoxBase
-                                              #else
-                                                  wxListBox
-                                              #endif
 {
 public:
     wxCheckListBoxBase() { }
@@ -43,8 +37,6 @@ public:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/checklst.h"
-#elif defined(__WXWINCE__)
-    #include "wx/msw/wince/checklst.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/checklst.h"
 #elif defined(__WXMOTIF__)
@@ -55,10 +47,8 @@ public:
     #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/checklst.h"
-#elif defined(__WXCOCOA__)
+#elif defined(__WXQT__)
-    #include "wx/cocoa/checklst.h"
+    #include "wx/qt/checklst.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/checklst.h"
 #endif
 
 #endif // wxUSE_CHECKLISTBOX

Externals/wxWidgets3/include/wx/chkconf.h

@@ -19,12 +19,12 @@
 
     If you get an error saying "wxUSE_FOO must be defined", it means that you
     are not using the correct up-to-date version of setup.h. This happens most
-    often when using svn or daily snapshots and a new symbol was added to
+    often when using git or snapshots and a new symbol was added to setup0.h
-    setup0.h and you haven't updated your local setup.h to reflect it. If
+    and you haven't updated your local setup.h to reflect it. If this is the
-    this is the case, you need to propagate the changes from setup0.h to your
+    case, you need to propagate the changes from setup0.h to your setup.h and,
-    setup.h and, if using makefiles under MSW, also remove setup.h under the
+    if using makefiles under MSW, also remove setup.h under the build directory
-    build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that
+    (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that the new setup.h is
-    the new setup.h is copied there.
+    copied there.
 
     If you get an error of the form "wxFoo requires wxBar", then the settings
     in your setup.h are inconsistent. You have the choice between correcting
@@ -309,6 +309,14 @@
 #   endif
 #endif /* !defined(wxUSE_STD_CONTAINERS) */
 
+#ifndef wxUSE_STD_CONTAINERS_COMPATIBLY
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_STD_CONTAINERS_COMPATIBLY must be defined, please read comment near the top of this file."
+#   else
+#       define wxUSE_STD_CONTAINERS_COMPATIBLY 0
+#   endif
+#endif /* !defined(wxUSE_STD_CONTAINERS_COMPATIBLY) */
+
 #ifndef wxUSE_STD_STRING_CONV_IN_WXSTRING
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_STD_STRING_CONV_IN_WXSTRING must be defined, please read comment near the top of this file."
@@ -417,6 +425,22 @@
 #   endif
 #endif /* !defined(wxUSE_ACCESSIBILITY) */
 
+#ifndef wxUSE_ADDREMOVECTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ADDREMOVECTRL must be defined, please read comment near the top of this file."
+#   else
+#       define wxUSE_ADDREMOVECTRL 0
+#   endif
+#endif /* !defined(wxUSE_ADDREMOVECTRL) */
+
+#ifndef wxUSE_ACTIVITYINDICATOR
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ACTIVITYINDICATOR must be defined, please read comment near the top of this file."
+#   else
+#       define wxUSE_ACTIVITYINDICATOR 0
+#   endif
+#endif /* !defined(wxUSE_ACTIVITYINDICATOR) */
+
 #ifndef wxUSE_ANIMATIONCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ANIMATIONCTRL must be defined, please read comment near the top of this file."
@@ -1216,21 +1240,15 @@
    checks use wxUSE_XXX symbols in #if tests.
  */
 
-#if defined(__WXWINCE__)
+#if defined(__WINDOWS__)
-#  include "wx/msw/wince/chkconf.h"
-#elif defined(__WINDOWS__)
 #  include "wx/msw/chkconf.h"
 #  if defined(__WXGTK__)
 #      include "wx/gtk/chkconf.h"
 #  endif
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
-#elif defined(__WXCOCOA__)
-#  include "wx/cocoa/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/osx/chkconf.h"
-#elif defined(__OS2__)
-#  include "wx/os2/chkconf.h"
 #elif defined(__WXDFB__)
 #  include "wx/dfb/chkconf.h"
 #elif defined(__WXMOTIF__)
@@ -1257,16 +1275,16 @@
    Section 3a: check consistency of the non-GUI settings.
  */
 
-#if WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_8
-#   if !WXWIN_COMPATIBILITY_2_8
+#   if !WXWIN_COMPATIBILITY_3_0
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "2.6.X compatibility requires 2.8.X compatibility"
+#           error "2.8.X compatibility requires 3.0.X compatibility"
 #       else
-#           undef WXWIN_COMPATIBILITY_2_8
+#           undef WXWIN_COMPATIBILITY_3_0
-#           define WXWIN_COMPATIBILITY_2_8 1
+#           define WXWIN_COMPATIBILITY_3_0 1
 #       endif
 #   endif
-#endif /* WXWIN_COMPATIBILITY_2_6 */
+#endif /* WXWIN_COMPATIBILITY_2_8 */
 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME
@@ -1518,6 +1536,28 @@
 #    endif
 #endif /* controls */
 
+#if wxUSE_ADDREMOVECTRL
+#   if !wxUSE_BMPBUTTON
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_ADDREMOVECTRL requires wxUSE_BMPBUTTON"
+#       else
+#           undef wxUSE_ADDREMOVECTRL
+#           define wxUSE_ADDREMOVECTRL 0
+#       endif
+#   endif
+#endif /* wxUSE_ADDREMOVECTRL */
+
+#if wxUSE_ANIMATIONCTRL
+#   if !wxUSE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_ANIMATIONCTRL requires wxUSE_STREAMS"
+#       else
+#           undef wxUSE_ANIMATIONCTRL
+#           define wxUSE_ANIMATIONCTRL 0
+#       endif
+#   endif
+#endif /* wxUSE_ANIMATIONCTRL */
+
 #if wxUSE_BMPBUTTON
 #    if !wxUSE_BUTTON
 #        ifdef wxABORT_ON_CONFIG_ERROR
@@ -1552,7 +1592,8 @@
 #   endif
 #endif
 
-#define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
+#define wxUSE_BOOKCTRL (wxUSE_AUI || \
+                        wxUSE_NOTEBOOK || \
                         wxUSE_LISTBOOK || \
                         wxUSE_CHOICEBOOK || \
                         wxUSE_TOOLBOOK || \
@@ -1738,6 +1779,20 @@
 #   endif
 #endif /* wxUSE_CALENDARCTRL */
 
+#if wxUSE_DATEPICKCTRL
+    /* Only the generic implementation, not used under MSW and OSX, needs
+     * wxComboCtrl. */
+#   if !wxUSE_COMBOCTRL && (defined(__WXUNIVERSAL__) || \
+            !(defined(__WXMSW__) || defined(__WXOSX_COCOA__)))
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxDatePickerCtrl requires wxUSE_COMBOCTRL"
+#       else
+#           undef wxUSE_COMBOCTRL
+#           define wxUSE_COMBOCTRL 1
+#       endif
+#   endif
+#endif /* wxUSE_DATEPICKCTRL */
+
 #if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL
 #   if !wxUSE_DATETIME
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -2226,6 +2281,47 @@
 #   endif
 #endif /* wxUSE_PREFERENCES_EDITOR */
 
+#if wxUSE_MEDIACTRL
+#   if !wxUSE_LONGLONG
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxMediaCtrl requires wxUSE_LONLONG"
+#       else
+#           undef wxUSE_LONLONG
+#           define wxUSE_LONLONG 1
+#       endif
+#   endif
+#endif /* wxUSE_MEDIACTRL */
+
+#if wxUSE_STC
+#   if !wxUSE_STOPWATCH
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxStyledTextCtrl requires wxUSE_STOPWATCH"
+#       else
+#           undef wxUSE_STC
+#           define wxUSE_STC 0
+#       endif
+#   endif
+#endif /* wxUSE_STC */
+
+#if wxUSE_RICHTEXT
+#   if !wxUSE_HTML
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxRichTextCtrl requires wxUSE_HTML"
+#       else
+#           undef wxUSE_RICHTEXT
+#           define wxUSE_RICHTEXT 0
+#       endif
+#   endif
+#   if !wxUSE_LONGLONG
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxRichTextCtrl requires wxUSE_LONLONG"
+#       else
+#           undef wxUSE_LONLONG
+#           define wxUSE_LONLONG 1
+#       endif
+#   endif
+#endif /* wxUSE_RICHTEXT */
+
 #endif /* wxUSE_GUI */
 
 #endif /* _WX_CHKCONF_H_ */

Externals/wxWidgets3/include/wx/choice.h

@@ -52,17 +52,17 @@ public:
     virtual int GetColumns() const { return 1 ; }
 
     // emulate selecting the item event.GetInt()
-    void Command(wxCommandEvent& event);
+    void Command(wxCommandEvent& event) wxOVERRIDE;
 
     // override wxItemContainer::IsSorted
-    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
+    virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); }
 
 protected:
     // The generic implementation doesn't determine the height correctly and
     // doesn't account for the width of the arrow but does take into account
     // the string widths, so the derived classes should override it and set the
     // height and add the arrow width to the size returned by this version.
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxChoiceBase);
@@ -74,8 +74,6 @@ private:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/choice.h"
-#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
-    #include "wx/msw/wince/choicece.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
@@ -86,10 +84,8 @@ private:
     #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/choice.h"
-#elif defined(__WXCOCOA__)
+#elif defined(__WXQT__)
-    #include "wx/cocoa/choice.h"
+    #include "wx/qt/choice.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/choice.h"
 #endif
 
 #endif // wxUSE_CHOICE

Externals/wxWidgets3/include/wx/choicebk.h

@@ -60,21 +60,21 @@ public:
                 const wxString& name = wxEmptyString);
 
 
-    virtual bool SetPageText(size_t n, const wxString& strText);
+    virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE;
-    virtual wxString GetPageText(size_t n) const;
+    virtual wxString GetPageText(size_t n) 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 bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE);
+                            int imageId = NO_IMAGE) wxOVERRIDE;
-    virtual int SetSelection(size_t n)
+    virtual int SetSelection(size_t n) wxOVERRIDE
         { return DoSetSelection(n, SetSelection_SendEvent); }
-    virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
+    virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); }
-    virtual void SetImageList(wxImageList *imageList);
+    virtual void SetImageList(wxImageList *imageList) wxOVERRIDE;
 
-    virtual bool DeleteAllPages();
+    virtual bool DeleteAllPages() wxOVERRIDE;
 
     // returns the choice control
     wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
@@ -82,28 +82,28 @@ public:
     // Override this to return true because the part of parent window
     // background between our controlling wxChoice and the page area should
     // show through.
-    virtual bool HasTransparentBackground() { return true; }
+    virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
 
 protected:
-    virtual void DoSetWindowVariant(wxWindowVariant variant);
+    virtual void DoSetWindowVariant(wxWindowVariant variant) wxOVERRIDE;
 
-    virtual wxWindow *DoRemovePage(size_t page);
+    virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE;
 
-    void UpdateSelectedPage(size_t newsel)
+    void UpdateSelectedPage(size_t newsel) wxOVERRIDE
     {
         m_selection = static_cast<int>(newsel);
         GetChoiceCtrl()->Select(m_selection);
     }
 
-    wxBookCtrlEvent* CreatePageChangingEvent() const;
+    wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE;
-    void MakeChangedEvent(wxBookCtrlEvent &event);
+    void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE;
 
     // event handlers
     void OnChoiceSelected(wxCommandEvent& event);
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook);
 };
 
 // ----------------------------------------------------------------------------

Externals/wxWidgets3/include/wx/clipbrd.h

@@ -117,7 +117,7 @@ public:
     bool SupportsFormat(const wxDataFormat& format) const;
     void AddFormat(const wxDataFormat& format);
 
-    virtual wxEvent *Clone() const
+    virtual wxEvent *Clone() const wxOVERRIDE
     {
         return new wxClipboardEvent(*this);
     }
@@ -126,7 +126,7 @@ public:
 protected:
     wxVector<wxDataFormat> m_formats;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent);
 };
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
@@ -161,10 +161,8 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
     #include "wx/x11/clipbrd.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/clipbrd.h"
-#elif defined(__WXCOCOA__)
+#elif defined(__WXQT__)
-    #include "wx/cocoa/clipbrd.h"
+    #include "wx/qt/clipbrd.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/clipbrd.h"
 #endif
 
 // ----------------------------------------------------------------------------

Externals/wxWidgets3/include/wx/clrpicker.h

@@ -68,6 +68,7 @@ protected:
 // NOTE: this style is supported just by wxColourButtonGeneric and
 //       thus is not exposed in wxColourPickerCtrl
 #define wxCLRP_SHOW_LABEL             0x0008
+#define wxCLRP_SHOW_ALPHA             0x0010
 
 // map platform-dependent controls which implement the wxColourPickerWidgetBase
 // under the name "wxColourPickerWidget".
@@ -79,6 +80,8 @@ protected:
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/clrpicker.h"
     #define wxColourPickerWidget      wxColourButton
+#elif defined(__WXQT__) && !defined(__WXUNIVERSAL__)
+    #include "wx/qt/clrpicker.h"
 #else
     #include "wx/generic/clrpickerg.h"
     #define wxColourPickerWidget      wxGenericColourButton
@@ -134,20 +137,20 @@ public:         // public API
 public:        // internal functions
 
     // update the button colour to match the text control contents
-    void UpdatePickerFromTextCtrl();
+    void UpdatePickerFromTextCtrl() wxOVERRIDE;
 
     // update the text control to match the button's colour
-    void UpdateTextCtrlFromPicker();
+    void UpdateTextCtrlFromPicker() wxOVERRIDE;
 
     // event handler for our picker
     void OnColourChange(wxColourPickerEvent &);
 
 protected:
-    virtual long GetPickerStyle(long style) const
+    virtual long GetPickerStyle(long style) const wxOVERRIDE
-        { return (style & wxCLRP_SHOW_LABEL); }
+        { return (style & (wxCLRP_SHOW_LABEL | wxCLRP_SHOW_ALPHA)); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColourPickerCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxColourPickerCtrl);
 };
 
 
@@ -173,12 +176,12 @@ public:
 
 
     // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxColourPickerEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxColourPickerEvent(*this); }
 
 private:
     wxColour m_colour;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent);
 };
 
 // ----------------------------------------------------------------------------

Externals/wxWidgets3/include/wx/cmdargs.h

@@ -113,7 +113,7 @@ public:
 
 private:
     template <typename T>
-    void Free(T **args)
+    void Free(T**& args)
     {
         if ( !args )
             return;
@@ -123,6 +123,7 @@ private:
             free(args[n]);
 
         delete [] args;
+        args = NULL;
     }
 
     void FreeArgs()

Externals/wxWidgets3/include/wx/cmdline.h

@@ -27,6 +27,7 @@ enum wxCmdLineSplitType
 
 #if wxUSE_CMDLINE_PARSER
 
+class WXDLLIMPEXP_FWD_BASE wxCmdLineParser;
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 
 // ----------------------------------------------------------------------------
@@ -93,6 +94,90 @@ struct wxCmdLineEntryDesc
 #define wxCMD_LINE_DESC_END \
         { wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0x0 }
 
+// ----------------------------------------------------------------------------
+// wxCmdLineArg contains the value for one command line argument
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxCmdLineArg
+{
+public:
+    virtual ~wxCmdLineArg() {}
+
+    virtual double GetDoubleVal() const = 0;
+    virtual long GetLongVal() const = 0;
+    virtual const wxString& GetStrVal() const = 0;
+#if wxUSE_DATETIME
+    virtual const wxDateTime& GetDateVal() const = 0;
+#endif // wxUSE_DATETIME
+
+    virtual bool IsNegated() const = 0;
+
+    virtual wxCmdLineEntryType GetKind() const = 0;
+    virtual wxString GetShortName() const = 0;
+    virtual wxString GetLongName() const = 0;
+    virtual wxCmdLineParamType GetType() const = 0;
+};
+
+// ----------------------------------------------------------------------------
+// wxCmdLineArgs is a container of command line arguments actually parsed and
+// allows enumerating them using the standard iterator-based approach.
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxCmdLineArgs
+{
+public:
+    class WXDLLIMPEXP_BASE const_iterator
+    {
+    public:
+        typedef int difference_type;
+        typedef wxCmdLineArg value_type;
+        typedef const wxCmdLineArg* pointer;
+        typedef const wxCmdLineArg& reference;
+
+// We avoid dependency on standard library by default but if we do use
+// std::string, then it's ok to use iterator tags as well.
+#if wxUSE_STD_STRING
+        typedef std::bidirectional_iterator_tag iterator_category;
+#endif // wx_USE_STD_STRING
+
+        const_iterator() : m_parser(NULL), m_index(0) {}
+        reference operator *() const;
+        pointer operator ->() const;
+        const_iterator &operator ++ ();
+        const_iterator operator ++ (int);
+        const_iterator &operator -- ();
+        const_iterator operator -- (int);
+
+        bool operator == (const const_iterator &other) const {
+            return m_parser==other.m_parser && m_index==other.m_index;
+        }
+        bool operator != (const const_iterator &other) const {
+            return !operator==(other);
+        }
+
+    private:
+        const_iterator (const wxCmdLineParser& parser, size_t index)
+            : m_parser(&parser), m_index(index) {
+        }
+
+        const wxCmdLineParser* m_parser;
+        size_t m_index;
+
+        friend class wxCmdLineArgs;
+    };
+
+    wxCmdLineArgs (const wxCmdLineParser& parser) : m_parser(parser) {}
+
+    const_iterator begin() const { return const_iterator(m_parser, 0); }
+    const_iterator end() const { return const_iterator(m_parser, size()); }
+
+    size_t size() const;
+
+private:
+    const wxCmdLineParser& m_parser;
+    wxDECLARE_NO_ASSIGN_CLASS(wxCmdLineArgs);
+};
+
 // ----------------------------------------------------------------------------
 // wxCmdLineParser is a class for parsing command line.
 //
@@ -263,6 +348,9 @@ public:
     // gets the value of Nth parameter (as string only for now)
     wxString GetParam(size_t n = 0u) const;
 
+    // returns a reference to the container of all command line arguments
+    wxCmdLineArgs GetArguments() const { return wxCmdLineArgs(*this); }
+
     // Resets switches and options
     void Reset();
 
@@ -277,6 +365,8 @@ private:
 
     struct wxCmdLineParserData *m_data;
 
+    friend class wxCmdLineArgs;
+    friend class wxCmdLineArgs::const_iterator;
     wxDECLARE_NO_COPY_CLASS(wxCmdLineParser);
 };
 

Externals/wxWidgets3/include/wx/cmdproc.h

@@ -41,7 +41,7 @@ protected:
     wxString m_commandName;
 
 private:
-    DECLARE_CLASS(wxCommand)
+    wxDECLARE_CLASS(wxCommand);
 };
 
 // ----------------------------------------------------------------------------
@@ -132,7 +132,7 @@ protected:
     wxString      m_redoAccelerator;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
+    wxDECLARE_DYNAMIC_CLASS(wxCommandProcessor);
     wxDECLARE_NO_COPY_CLASS(wxCommandProcessor);
 };
 

Externals/wxWidgets3/include/wx/cmndata.h

@@ -71,8 +71,7 @@ public:
     bool GetColour() const { return m_colour; }
     wxDuplexMode GetDuplex() const { return m_duplexMode; }
     wxPaperSize GetPaperId() const { return m_paperId; }
-    const wxSize& GetPaperSize() const { return m_paperSize; } // Not used yet: confusable with paper size
+    const wxSize& GetPaperSize() const { return m_paperSize; }
-                                                                      // in wxPageSetupDialogData
     wxPrintQuality GetQuality() const { return m_printQuality; }
     wxPrintBin GetBin() const { return m_bin; }
     wxPrintMode GetPrintMode() const { return m_printMode; }
@@ -138,7 +137,7 @@ private:
     wxPrintNativeDataBase  *m_nativeData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintData);
 };
 
 /*
@@ -213,7 +212,7 @@ private:
     wxPrintData     m_printData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintDialogData);
 };
 
 /*
@@ -302,7 +301,7 @@ private:
     wxPrintData     m_printData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
+    wxDECLARE_DYNAMIC_CLASS(wxPageSetupDialogData);
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE

Externals/wxWidgets3/include/wx/cocoa/NSApplication.h

@@ -1,67 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSApplication.h
-// Purpose:     wxNSApplicationDelegate definition
-// Author:      David Elliott
-// Modified by:
-// Created:     2004/01/26
-// Copyright:   (c) 2003,2004 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COCOA_NSAPPLICATION_H__
-#define _WX_COCOA_NSAPPLICATION_H__
-
-#include "wx/cocoa/objc/objc_uniquifying.h"
-
-// ========================================================================
-// wxNSApplicationDelegate
-// ========================================================================
-/*!
-    @class wxNSApplicationDelegate
-    @discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behaviour.
-
-    wxCocoa will set a singleton instance of this class as the NSApplication delegate upon startup unless wxWidgets is running
-    in a "plugin" manner in which case it would not be appropriate to do this.
-
-    Although Cocoa will send notifications to the delegate it is also possible to register a different object to listen for
-    them.  Because we want to support the plugin case, we use a separate notification observer object when we can.
-*/
-@interface wxNSApplicationDelegate : NSObject
-{
-}
-
-// Delegate methods
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-@end // interface wxNSApplicationDelegate : NSObject
-WX_DECLARE_GET_OBJC_CLASS(wxNSApplicationDelegate,NSObject)
-
-// ========================================================================
-// wxNSApplicationObserver
-// ========================================================================
-/*!
-    @class wxNSApplicationObserver
-    @discussion Observes most notifications sent by the NSApplication singleton.
-
-    wxCocoa will create a singleton instance of this class upon startup and register it with the default notification center to
-    listen for several events sent by the NSApplication singleton.
-
-    Because there can be any number of notification observers, this method allows wxCocoa to function properly even when it is
-    running as a plugin of some other (most likely not wxWidgets) application.
-*/
-@interface wxNSApplicationObserver : NSObject
-{
-}
-
-// Methods defined as (but not used here) as NSApplication delegate methods.
-- (void)applicationWillBecomeActive:(NSNotification *)notification;
-- (void)applicationDidBecomeActive:(NSNotification *)notification;
-- (void)applicationWillResignActive:(NSNotification *)notification;
-- (void)applicationDidResignActive:(NSNotification *)notification;
-- (void)applicationWillUpdate:(NSNotification *)notification;
-
-// Other notifications
-- (void)controlTintChanged:(NSNotification *)notification;
-@end // interface wxNSApplicationObserver : NSObject
-WX_DECLARE_GET_OBJC_CLASS(wxNSApplicationObserver,NSObject)
-
-#endif //ndef _WX_COCOA_NSAPPLICATION_H__

Externals/wxWidgets3/include/wx/cocoa/NSBox.h

@@ -1,25 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSBox.h
-// Purpose:     wxCocoaNSBox class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/03/19
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSBOX_H__
-#define __WX_COCOA_NSBOX_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSBox);
-class wxCocoaNSBox
-{
-    WX_DECLARE_OBJC_INTERFACE(NSBox)
-protected:
-//    virtual void Cocoa_didChangeText(void) = 0;
-};
-
-#endif // _WX_COCOA_NSBOX_H_

Externals/wxWidgets3/include/wx/cocoa/NSButton.h

@@ -1,38 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSButton.h
-// Purpose:     wxCocoaNSButton class
-// Author:      David Elliott
-// Modified by:
-// Created:     2002/12/09
-// Copyright:   (c) 2002-2004 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COCOA_NSBUTTON_H__
-#define _WX_COCOA_NSBUTTON_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-#include "wx/cocoa/ObjcRef.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSButton);
-
-class wxCocoaNSButton
-{
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSButton);
-public:
-    void AssociateNSButton(WX_NSButton cocoaNSButton);
-    void DisassociateNSButton(WX_NSButton cocoaNSButton)
-    {
-        if(cocoaNSButton)
-            sm_cocoaHash.erase(cocoaNSButton);
-    }
-
-    virtual void Cocoa_wxNSButtonAction(void) = 0;
-    virtual ~wxCocoaNSButton() { }
-
-protected:
-    static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
-};
-
-#endif // _WX_COCOA_NSBUTTON_H__

Externals/wxWidgets3/include/wx/cocoa/NSControl.h

@@ -1,31 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSControl.h
-// Purpose:     wxCocoaNSControl class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/02/15
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSCONTROL_H__
-#define __WX_COCOA_NSCONTROL_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSControl);
-class wxCocoaNSControl
-{
-    WX_DECLARE_OBJC_INTERFACE(NSControl)
-public:
-    virtual void CocoaTarget_action() {}
-//    virtual void Cocoa_didChangeText(void) = 0;
-
-    virtual ~wxCocoaNSControl() { }
-
-protected:
-    static struct objc_object *sm_cocoaTarget;
-};
-
-#endif // _WX_COCOA_NSCONTROL_H_

Externals/wxWidgets3/include/wx/cocoa/NSMenu.h

@@ -1,48 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSMenu.h
-// Purpose:     wxCocoaNSMenu class
-// Author:      David Elliott
-// Modified by:
-// Created:     2002/12/09
-// Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSMENU_H__
-#define __WX_COCOA_NSMENU_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSMenu);
-
-// ========================================================================
-// wxCocoaNSMenu
-// ========================================================================
-
-class wxCocoaNSMenu
-{
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSMenu)
-public:
-    void AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags = 0);
-    void DisassociateNSMenu(WX_NSMenu cocoaNSMenu);
-    enum
-    {   OBSERVE_DidAddItem          = 0x01
-    ,   OBSERVE_DidChangeItem       = 0x02
-    ,   OBSERVE_DidRemoveItem       = 0x04
-    ,   OBSERVE_DidSendAction       = 0x08
-    ,   OBSERVE_WillSendAction      = 0x10
-    };
-    virtual void Cocoa_dealloc() {}
-    virtual void CocoaNotification_menuDidAddItem(WX_NSNotification WXUNUSED(notification)) {}
-    virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification WXUNUSED(notification)) {}
-    virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification WXUNUSED(notification)) {}
-    virtual void CocoaNotification_menuDidSendAction(WX_NSNotification WXUNUSED(notification)) {}
-    virtual void CocoaNotification_menuWillSendAction(WX_NSNotification WXUNUSED(notification)) {}
-    virtual ~wxCocoaNSMenu() { }
-
-protected:
-    static struct objc_object *sm_cocoaObserver;
-};
-
-#endif // _WX_COCOA_NSMENU_H_

Externals/wxWidgets3/include/wx/cocoa/NSPanel.h

@@ -1,24 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSPanel.h
-// Purpose:     wxCocoaNSPanel class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/03/16
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSPANEL_H__
-#define __WX_COCOA_NSPANEL_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSPanel);
-
-class wxCocoaNSPanel
-{
-    WX_DECLARE_OBJC_INTERFACE(NSPanel)
-};
-
-#endif // _WX_COCOA_NSPANEL_H_

Externals/wxWidgets3/include/wx/cocoa/NSScroller.h

@@ -1,40 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSScroller.h
-// Purpose:     wxCocoaNSScroller class
-// Author:      David Elliott
-// Modified by:
-// Created:     2004/04/27
-// Copyright:   (c) 2004 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COCOA_NSSCROLLER_H__
-#define _WX_COCOA_NSSCROLLER_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-#include "wx/cocoa/ObjcRef.h"
-
-DECLARE_WXCOCOA_OBJC_CLASS(NSScroller);
-
-WX_DECLARE_OBJC_HASHMAP(NSScroller);
-
-class wxCocoaNSScroller
-{
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSScroller);
-public:
-    void AssociateNSScroller(WX_NSScroller cocoaNSScroller);
-    void DisassociateNSScroller(WX_NSScroller cocoaNSScroller)
-    {
-        if(cocoaNSScroller)
-            sm_cocoaHash.erase(cocoaNSScroller);
-    }
-
-    virtual void Cocoa_wxNSScrollerAction(void) = 0;
-    virtual ~wxCocoaNSScroller() { }
-
-protected:
-    static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
-};
-
-#endif // _WX_COCOA_NSSCROLLER_H__

Externals/wxWidgets3/include/wx/cocoa/NSSlider.h

@@ -1,46 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSSlider.h
-// Purpose:     wxCocoaNSSlider class
-// Author:      Mark Oxenham
-// Modified by: David Elliott
-// Created:     2007/08/10
-// Copyright:   (c) 2007 Software 2000 Ltd. All rights reserved.
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WXNSSLIDER_H_
-#define _WXNSSLIDER_H_
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-#include "wx/cocoa/ObjcRef.h"
-
-DECLARE_WXCOCOA_OBJC_CLASS(NSSlider);
-
-WX_DECLARE_OBJC_HASHMAP(NSSlider);
-
-// For when we're not in Objective-C mode:
-typedef struct objc_selector    *SEL;
-
-class wxCocoaNSSliderLastSelectorChanger;
-
-class wxCocoaNSSlider
-{
-    friend class wxCocoaNSSliderLastSelectorChanger;
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSSlider);
-public:
-    void AssociateNSSlider(WX_NSSlider cocoaNSSlider);
-    void DisassociateNSSlider(WX_NSSlider cocoaNSSlider);
-
-    virtual void CocoaNotification_startTracking(WX_NSNotification notification) = 0;
-    virtual void CocoaNotification_continueTracking(WX_NSNotification notification) = 0;
-    virtual void CocoaNotification_stopTracking(WX_NSNotification notification) = 0;
-
-    static SEL GetLastResponderSelector()
-    {   return sm_lastResponderSelector; }
-protected:
-    virtual ~wxCocoaNSSlider() { }
-    static SEL sm_lastResponderSelector;
-};
-
-#endif

Externals/wxWidgets3/include/wx/cocoa/NSTabView.h

@@ -1,35 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSTabView.h
-// Purpose:     wxCocoaNSTabView class
-// Author:      David Elliott
-// Modified by:
-// Created:     2004/04/08
-// Copyright:   (c) 2004 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COCOA_NSTABVIEW_H__
-#define _WX_COCOA_NSTABVIEW_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-#include "wx/cocoa/ObjcRef.h"
-
-DECLARE_WXCOCOA_OBJC_CLASS(NSTabView);
-DECLARE_WXCOCOA_OBJC_CLASS(NSTabViewItem);
-WX_DECLARE_OBJC_HASHMAP(NSTabView);
-class wxCocoaNSTabView
-{
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSTabView)
-public:
-    void AssociateNSTabView(WX_NSTabView cocoaNSTabView);
-    void DisassociateNSTabView(WX_NSTabView ocoaNSTabView);
-    virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
-    virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
-    virtual ~wxCocoaNSTabView() { }
-
-protected:
-    static wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaDelegate;
-};
-
-#endif // _WX_COCOA_NSTABVIEW_H__

Externals/wxWidgets3/include/wx/cocoa/NSTableDataSource.h

@@ -1,34 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSTableDataSource.h
-// Purpose:     wxCocoaNSTableDataSource Objective-C class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/08/05
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSTABLEDATASOURCE_H__
-#define __WX_COCOA_NSTABLEDATASOURCE_H__
-
-#include "wx/cocoa/objc/objc_uniquifying.h"
-
-#import <Foundation/NSObject.h>
-
-// ============================================================================
-// @class wxCocoaNSTableDataSource
-// ============================================================================
-@interface wxCocoaNSTableDataSource : NSObject
-{
-}
-
-// NSTableDataSource is a loosely defined protocol consisting of the
-// following two message implementations
-- (int)numberOfRowsInTableView: (NSTableView *)tableView;
-- (id)tableView:(NSTableView *)tableView
-    objectValueForTableColumn: (NSTableColumn *)tableColumn
-    row: (int)rowIndex;
-@end // wxCocoaNSTableDataSource
-WX_DECLARE_GET_OBJC_CLASS(wxCocoaNSTableDataSource,NSObject)
-
-#endif // _WX_COCOA_NSTABLEDATASOURCE_H_

Externals/wxWidgets3/include/wx/cocoa/NSTableView.h

@@ -1,29 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSTableView.h
-// Purpose:     wxCocoaNSTableView class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/08/05
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSTABLEVIEW_H__
-#define __WX_COCOA_NSTABLEVIEW_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSTableView);
-
-class wxCocoaNSTableView
-{
-    WX_DECLARE_OBJC_INTERFACE(NSTableView)
-public:
-    virtual int CocoaDataSource_numberOfRows() = 0;
-    virtual struct objc_object* CocoaDataSource_objectForTableColumn(
-        WX_NSTableColumn tableColumn, int rowIndex) = 0;
-    virtual ~wxCocoaNSTableView() { }
-};
-
-#endif // _WX_COCOA_NSTABLEVIEW_H_

Externals/wxWidgets3/include/wx/cocoa/NSTextField.h

@@ -1,26 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSTextField.h
-// Purpose:     wxCocoaNSTextField class
-// Author:      David Elliott
-// Modified by:
-// Created:     2002/12/09
-// Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSTEXTFIELD_H__
-#define __WX_COCOA_NSTEXTFIELD_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSTextField);
-class wxCocoaNSTextField
-{
-    WX_DECLARE_OBJC_INTERFACE(NSTextField)
-protected:
-    virtual void Cocoa_didChangeText(void) = 0;
-    virtual ~wxCocoaNSTextField() { }
-};
-
-#endif // _WX_COCOA_NSTEXTFIELD_H_

Externals/wxWidgets3/include/wx/cocoa/NSView.h

@@ -1,80 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSView.h
-// Purpose:     wxCocoaNSView class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/02/15
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSVIEW_H__
-#define __WX_COCOA_NSVIEW_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
-typedef struct CGRect NSRect;
-#else
-typedef struct _NSRect NSRect;
-#endif
-
-struct objc_object;
-
-class wxWindow;
-
-WX_DECLARE_OBJC_HASHMAP(NSView);
-class wxCocoaNSView
-{
-/* NSView is a rather special case and requires some extra attention */
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSView)
-public:
-    void AssociateNSView(WX_NSView cocoaNSView);
-    void DisassociateNSView(WX_NSView cocoaNSView);
-protected:
-    static struct objc_object *sm_cocoaObserver;
-public:
-    virtual wxWindow* GetWxWindow() const
-    {   return NULL; }
-    virtual void Cocoa_FrameChanged(void) = 0;
-    virtual void Cocoa_synthesizeMouseMoved(void) = 0;
-    virtual bool Cocoa_acceptsFirstMouse(bool &WXUNUSED(acceptsFirstMouse), WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_drawRect(const NSRect &WXUNUSED(rect))
-    {   return false; }
-    virtual bool Cocoa_mouseDown(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_mouseDragged(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_mouseUp(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_mouseMoved(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_mouseEntered(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_mouseExited(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_rightMouseDown(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_rightMouseDragged(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_rightMouseUp(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_otherMouseDown(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_otherMouseDragged(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_otherMouseUp(WX_NSEvent WXUNUSED(theEvent))
-    {   return false; }
-    virtual bool Cocoa_resetCursorRects()
-    {   return false; }
-    virtual bool Cocoa_viewDidMoveToWindow()
-    {   return false; }
-    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow WXUNUSED(newWindow))
-    {   return false; }
-    virtual ~wxCocoaNSView() { }
-};
-
-#endif
-    // __WX_COCOA_NSVIEW_H__

Externals/wxWidgets3/include/wx/cocoa/NSWindow.h

@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/NSWindow.h
-// Purpose:     wxCocoaNSWindow class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/03/16
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_NSWINDOW_H__
-#define __WX_COCOA_NSWINDOW_H__
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-WX_DECLARE_OBJC_HASHMAP(NSWindow);
-
-class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowCocoa;
-
-DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
-DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
-
-class WXDLLIMPEXP_CORE wxCocoaNSWindow
-{
-/* NSWindow is a rather special case and requires some extra attention */
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
-public:
-    void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
-    void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
-    virtual bool Cocoa_canBecomeKeyWindow(bool &WXUNUSED(canBecome))
-    {   return false; }
-    virtual bool Cocoa_canBecomeMainWindow(bool &WXUNUSED(canBecome))
-    {   return false; }
-    virtual bool CocoaDelegate_windowShouldClose(void) = 0;
-    virtual void CocoaDelegate_windowWillClose(void) = 0;
-    virtual void CocoaDelegate_windowDidBecomeKey(void) { }
-    virtual void CocoaDelegate_windowDidResignKey(void) { }
-    virtual void CocoaDelegate_windowDidBecomeMain(void) { }
-    virtual void CocoaDelegate_windowDidResignMain(void) { }
-    virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
-    virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;
-    virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
-    inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa()
-    {   return m_wxTopLevelWindowCocoa; }
-protected:
-    wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL);
-    virtual ~wxCocoaNSWindow();
-    WX_wxNSWindowDelegate m_cocoaDelegate;
-    wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa;
-};
-
-#endif // _WX_COCOA_NSWINDOW_H_

Externals/wxWidgets3/include/wx/cocoa/ObjcAssociate.h

@@ -1,77 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/ObjcAssociate.h
-// Purpose:     Associates an Objective-C class with a C++ class
-// Author:      David Elliott
-// Modified by:
-// Created:     2002/12/03
-// Copyright:   (c) 2002 David Elliott <dfe@cox.net>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_OBJC_ASSOCIATE_H__
-#define __WX_COCOA_OBJC_ASSOCIATE_H__
-
-/*-------------------------------------------------------------------------
-Basic hashmap stuff, used by everything
--------------------------------------------------------------------------*/
-#define WX_DECLARE_OBJC_HASHMAP(ObjcClass) \
-class wxCocoa##ObjcClass; \
-WX_DECLARE_HASH_MAP(WX_##ObjcClass,wxCocoa##ObjcClass*,wxPointerHash,wxPointerEqual,wxCocoa##ObjcClass##Hash)
-
-#define WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
-public: \
-    static inline wxCocoa##ObjcClass* GetFromCocoa(WX_##ObjcClass cocoaObjcClass) \
-    { \
-        wxCocoa##ObjcClass##Hash::iterator iter = sm_cocoaHash.find(cocoaObjcClass); \
-        if(iter!=sm_cocoaHash.end()) \
-        { \
-            return iter->second; \
-        } \
-        return NULL; \
-    } \
-protected: \
-    static wxCocoa##ObjcClass##Hash sm_cocoaHash;
-
-#define WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass) \
-wxCocoa##ObjcClass##Hash wxCocoa##ObjcClass::sm_cocoaHash;
-
-
-/*-------------------------------------------------------------------------
-The entire interface, including some boilerplate stuff
--------------------------------------------------------------------------*/
-#define WX_DECLARE_OBJC_INTERFACE(ObjcClass) \
-WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
-public: \
-    inline void Associate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
-    { \
-        if(cocoaObjcClass) \
-            sm_cocoaHash.insert(wxCocoa##ObjcClass##Hash::value_type(cocoaObjcClass,this)); \
-    } \
-    inline void Disassociate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
-    { \
-        if(cocoaObjcClass) \
-            sm_cocoaHash.erase(cocoaObjcClass); \
-    }
-
-#define WX_IMPLEMENT_OBJC_INTERFACE(ObjcClass) \
-WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass)
-
-/*-------------------------------------------------------------------------
-Stuff to be used by the wxWidgets class (not the Cocoa interface)
--------------------------------------------------------------------------*/
-#define WX_DECLARE_COCOA_OWNER(ObjcClass,ObjcBase,ObjcRoot) \
-public: \
-    inline WX_##ObjcClass Get##ObjcClass() { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
-    inline const WX_##ObjcClass Get##ObjcClass() const { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
-protected: \
-    void Set##ObjcClass(WX_##ObjcClass cocoaObjcClass);
-
-#define WX_IMPLEMENT_COCOA_OWNER(wxClass,ObjcClass,ObjcBase,ObjcRoot) \
-void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
-{ \
-    Disassociate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
-    Set##ObjcBase(cocoaObjcClass); \
-    Associate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
-}
-
-#endif // __WX_COCOA_OBJC_ASSOCIATE_H__

Externals/wxWidgets3/include/wx/cocoa/ObjcRef.h

@@ -1,235 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/ObjcRef.h
-// Purpose:     wxObjcAutoRef template class
-// Author:      David Elliott
-// Modified by:
-// Created:     2004/03/28
-// Copyright:   (c) 2004 David Elliott <dfe@cox.net>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COCOA_OBJCREF_H__
-#define _WX_COCOA_OBJCREF_H__
-
-// Reuse wxCFRef-related code (e.g. wxCFRetain/wxCFRelease)
-#include "wx/osx/core/cfref.h"
-
-// NOTE WELL: We can only know whether or not GC can be used when compiling Objective-C.
-// Therefore we cannot implement these functions except when compiling Objective-C.
-#ifdef __OBJC__
-/*! @function   wxGCSafeRetain
-    @templatefield  Type    (implicit) An Objective-C class type
-    @arg            r       Pointer to Objective-C object.  May be null.
-    @abstract   Retains the Objective-C object, even when using Apple's garbage collector
-    @discussion
-    When Apple's garbage collector is enabled, the usual [obj retain] and [obj release] messages
-    are ignored.  Instead the collector with help from compiler-generated write-barriers tracks
-    reachable objects.  The write-barriers are generated when setting i-vars of C++ classes but
-    they are ignored by the garbage collector unless the C++ object is in GC-managed memory.
-
-    The simple solution is to use CFRetain on the Objective-C object which has been enhanced in
-    GC mode to forcibly retain the object.  In Retain/Release (RR) mode the CFRetain function has
-    the same effect as [obj retain].  Note that GC vs. RR is selected at runtime.
-
-    Take care that wxGCSafeRetain must be balanced with wxGCSafeRelease and that conversely
-    wxGCSafeRelease must only be called on objects to balance wxGCSafeRetain.  In particular when
-    receiving an Objective-C object from an alloc or copy method take care that you must retain
-    it with wxGCSafeRetain and balance the initial alloc with a standard release.
-
-    Example:
-    wxGCSafeRelease(m_obj); // release current object (if any)
-    NSObject *obj = [[NSObject alloc] init];
-    m_obj = wxGCSafeRetain(obj);
-    [obj release];
-
-    Alternatively (same effect, perhaps less clear):
-    wxGCSafeRelease(m_obj); // release current object (if any)
-    m_obj = wxGCSafeRetain([[NSObject alloc] init]);
-    [m_obj release]; // balance alloc
-
-    Consider the effect on the retain count from each statement (alloc, CFRetain, release)
-    In RR mode:     retainCount = 1, +1, -1
-    In GC mode:     strongRetainCount = 0, +1, -0
-
-    This is a template function to ensure it is used on raw pointers and never on pointer-holder
-    objects via implicit conversion operators.
-*/
-template <class Type>
-inline Type * wxGCSafeRetain(Type *r)
-{
-#ifdef __OBJC_GC__
-    return static_cast<Type*>(wxCFRetain(r));
-#else
-    return [r retain];
-#endif
-}
-
-/*! @function   wxGCSafeRelease
-    @templatefield  Type    (implicit) An Objective-C class type
-    @arg            r       Pointer to Objective-C object.  May be null.
-    @abstract   Balances wxGCSafeRetain.  Particularly useful with the Apple Garbage Collector.
-    @discussion
-    See the wxGCSafeRetain documentation for more details.
-
-    Example (from wxGCSafeRetain documentation):
-    wxGCSafeRelease(m_obj); // release current object (if any)
-    m_obj = wxGCSafeRetain([[NSObject alloc] init]);
-    [m_obj release]; // balance alloc
-
-    When viewed from the start, m_obj ought to start as nil. However, the second time through
-    the wxGCSafeRelease call becomes critical as it releases the retain from the first time
-    through.
-
-    In the destructor for this C++ object with the m_obj i-var you ought to do the following:
-    wxGCSafeRelease(m_obj);
-    m_obj = nil; // Not strictly needed, but safer.
-
-    Under no circumstances should you balance an alloc or copy with a wxGCSafeRelease.
-*/
-template <class Type>
-inline void wxGCSafeRelease(Type *r)
-{
-#ifdef __OBJC_GC__
-    wxCFRelease(r);
-#else
-    [r release];
-#endif
-}
-#else
-// NOTE: When not compiling Objective-C, declare these functions such that they can be
-// used by other inline-implemented methods.  Since those methods in turn will not actually
-// be used from non-ObjC code the compiler ought not emit them.  If it emits an out of
-// line copy of those methods then presumably it will have also emitted at least one
-// out of line copy of these functions from at least one Objective-C++ translation unit.
-// That means the out of line implementation will be available at link time.
-
-template <class Type>
-inline Type * wxGCSafeRetain(Type *r);
-
-template <class Type>
-inline void wxGCSafeRelease(Type *r);
-
-#endif //def __OBJC__
-
-/*
-wxObjcAutoRefFromAlloc: construct a reference to an object that was
-[NSObject -alloc]'ed and thus does not need a retain
-wxObjcAutoRef: construct a reference to an object that was
-either autoreleased or is retained by something else.
-*/
-
-struct objc_object;
-
-// We must do any calls to Objective-C from an Objective-C++ source file
-class wxObjcAutoRefBase
-{
-protected:
-    /*! @function   ObjcRetain
-        @abstract   Simply does [p retain].
-     */
-    static struct objc_object* ObjcRetain(struct objc_object*);
-
-    /*! @function   ObjcRelease
-        @abstract   Simply does [p release].
-     */
-    static void ObjcRelease(struct objc_object*);
-};
-
-/*! @class      wxObjcAutoRefFromAlloc
-    @templatefield  T       The type of _pointer_ (e.g. NSString*, NSRunLoop*)
-    @abstract   Pointer-holder for Objective-C objects
-    @discussion
-    When constructing this object from a raw pointer, the pointer is assumed to have
-    come from an alloc-style method.  That is, once you construct this object from
-    the pointer you must not balance your alloc with a call to release.
-
-    This class has been carefully designed to work with both the traditional Retain/Release
-    and the new Garbage Collected modes.  In RR-mode it will prevent the object from being
-    released by managing the reference count using the retain/release semantics.  In GC-mode
-    it will use a method (currently CFRetain/CFRelease) to ensure the object will never be
-    finalized until this object is destroyed.
- */
-
-template <class T>
-class wxObjcAutoRefFromAlloc: wxObjcAutoRefBase
-{
-public:
-    wxObjcAutoRefFromAlloc(T p = 0)
-    :   m_ptr(p)
-    // NOTE: this is from alloc.  Do NOT retain
-    {
-        //  CFRetain
-        //      GC:     Object is strongly retained and prevented from being collected
-        //      non-GC: Simply realizes it's an Objective-C object and calls [p retain]
-        wxGCSafeRetain(p);
-        //  ObjcRelease (e.g. [p release])
-        //      GC:     Objective-C retain/release mean nothing in GC mode
-        //      non-GC: This is a normal release call, balancing the retain
-        ObjcRelease(static_cast<T>(p));
-        //  The overall result:
-        //      GC:     Object is strongly retained
-        //      non-GC: Retain count is the same as it was (retain then release)
-    }
-    wxObjcAutoRefFromAlloc(const wxObjcAutoRefFromAlloc& otherRef)
-    :   m_ptr(otherRef.m_ptr)
-    {   wxGCSafeRetain(m_ptr); }
-    ~wxObjcAutoRefFromAlloc()
-    {   wxGCSafeRelease(m_ptr); }
-    wxObjcAutoRefFromAlloc& operator=(const wxObjcAutoRefFromAlloc& otherRef)
-    {   wxGCSafeRetain(otherRef.m_ptr);
-        wxGCSafeRelease(m_ptr);
-        m_ptr = otherRef.m_ptr;
-        return *this;
-    }
-    operator T() const
-    {   return static_cast<T>(m_ptr); }
-    T operator->() const
-    {   return static_cast<T>(m_ptr); }
-protected:
-    /*! @field      m_ptr       The pointer to the Objective-C object
-        @discussion
-        The pointer to the Objective-C object is typed as void* to avoid compiler-generated write
-        barriers as would be used for implicitly __strong object pointers and to avoid the similar
-        read barriers as would be used for an explicitly __weak object pointer.  The write barriers
-        are useless unless this object is located in GC-managed heap which is highly unlikely.
-
-        Since we guarantee strong reference via CFRetain/CFRelease the write-barriers are not needed
-        at all, even if this object does happen to be allocated in GC-managed heap.
-     */
-    void *m_ptr;
-};
-
-/*!
-    @class      wxObjcAutoRef
-    @description
-    A pointer holder that does retain its argument.
-    NOTE: It is suggest that you instead use wxObjcAutoRefFromAlloc<T> foo([aRawPointer retain])
- */
-template <class T>
-class wxObjcAutoRef: public wxObjcAutoRefFromAlloc<T>
-{
-public:
-    /*! @method     wxObjcAutoRef
-        @description
-        Uses the underlying wxObjcAutoRefFromAlloc and simply does a typical [p retain] such that
-        in RR-mode the object is in effectively the same retain-count state as it would have been
-        coming straight from an alloc method.
-     */
-    wxObjcAutoRef(T p = 0)
-    :   wxObjcAutoRefFromAlloc<T>(p)
-    {   // NOTE: ObjcRetain is correct because in GC-mode it balances ObjcRelease in our superclass constructor
-        // In RR mode it does retain and the superclass does retain/release thus resulting in an overall retain.
-        ObjcRetain(static_cast<T>(wxObjcAutoRefFromAlloc<T>::m_ptr));
-    }
-    ~wxObjcAutoRef() {}
-    wxObjcAutoRef(const wxObjcAutoRef& otherRef)
-    :   wxObjcAutoRefFromAlloc<T>(otherRef)
-    {}
-    wxObjcAutoRef(const wxObjcAutoRefFromAlloc<T>& otherRef)
-    :   wxObjcAutoRefFromAlloc<T>(otherRef)
-    {}
-    wxObjcAutoRef& operator=(const wxObjcAutoRef& otherRef)
-    {   return wxObjcAutoRefFromAlloc<T>::operator=(otherRef); }
-};
-
-#endif //ndef _WX_COCOA_OBJCREF_H__

Externals/wxWidgets3/include/wx/cocoa/app.h

@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/app.h
-// Purpose:     wxApp class
-// Author:      David Elliott
-// Modified by:
-// Created:     2002/11/27
-// Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COCOA_APP_H_
-#define _WX_COCOA_APP_H_
-
-typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
-typedef const struct __CFString * CFStringRef;
-
-#include "wx/osx/core/cfref.h"
-
-// ========================================================================
-// wxApp
-// ========================================================================
-// Represents the application. Derive OnInit and declare
-// a new App object to start application
-class WXDLLIMPEXP_CORE wxApp: public wxAppBase
-{
-    DECLARE_DYNAMIC_CLASS(wxApp)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    wxApp();
-    virtual ~wxApp();
-
-// ------------------------------------------------------------------------
-// Cocoa specifics
-// ------------------------------------------------------------------------
-public:
-    inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }
-    virtual void CocoaDelegate_applicationWillBecomeActive();
-    virtual void CocoaDelegate_applicationDidBecomeActive();
-    virtual void CocoaDelegate_applicationWillResignActive();
-    virtual void CocoaDelegate_applicationDidResignActive();
-    virtual void CocoaDelegate_applicationWillUpdate();
-    virtual void CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, int activity);
-protected:
-    WX_NSApplication m_cocoaApp;
-    struct objc_object *m_cocoaAppDelegate;
-    WX_NSThread m_cocoaMainThread;
-    wxCFRef<CFRunLoopObserverRef> m_cfRunLoopIdleObserver;
-    wxCFRef<CFStringRef> m_cfObservedRunLoopMode;
-
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    // Implement wxAppBase pure virtuals
-    virtual void Exit();
-
-    virtual void WakeUpIdle();
-
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp();
-    virtual bool CallOnInit();
-
-
-    virtual bool OnInit();
-    virtual bool OnInitGui();
-
-    // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.)
-    static bool sm_isEmbedded;
-};
-
-#endif // _WX_COCOA_APP_H_

Externals/wxWidgets3/include/wx/cocoa/autorelease.h

@@ -1,31 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/autorelease.h
-// Purpose:     Automatic NSAutoreleasePool functionality
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/07/11
-// Copyright:   (c) 2003 David Elliott <dfe@cox.net>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_AUTORELEASE_H__
-#define __WX_COCOA_AUTORELEASE_H__
-
-#import <Foundation/NSAutoreleasePool.h>
-
-class wxAutoNSAutoreleasePool
-{
-public:
-    wxAutoNSAutoreleasePool()
-    {
-        m_pool = [[NSAutoreleasePool alloc] init];
-    }
-    ~wxAutoNSAutoreleasePool()
-    {
-        [m_pool release];
-    }
-protected:
-    NSAutoreleasePool *m_pool;
-};
-
-#endif //__WX_COCOA_AUTORELEASE_H__

Externals/wxWidgets3/include/wx/cocoa/bitmap.h

@@ -1,164 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/bitmap.h
-// Purpose:     wxBitmap class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/07/19
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_BITMAP_H__
-#define __WX_COCOA_BITMAP_H__
-
-#include "wx/palette.h"
-
-// Bitmap
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLIMPEXP_FWD_CORE wxImage;
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
-
-// ========================================================================
-// wxMask
-// ========================================================================
-
-// A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently.
-class WXDLLIMPEXP_CORE wxMask: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxMask)
-public:
-    wxMask();
-
-    // Construct a mask from a bitmap and a colour indicating
-    // the transparent area
-    wxMask(const wxBitmap& bitmap, const wxColour& colour);
-
-    // Construct a mask from a bitmap and a palette index indicating
-    // the transparent area
-    wxMask(const wxBitmap& bitmap, int paletteIndex);
-
-    // Construct a mask from a mono bitmap (copies the bitmap).
-    wxMask(const wxBitmap& bitmap);
-
-    // Copy constructor
-    wxMask(const wxMask& src);
-
-    virtual ~wxMask();
-
-    bool Create(const wxBitmap& bitmap, const wxColour& colour);
-    bool Create(const wxBitmap& bitmap, int paletteIndex);
-    bool Create(const wxBitmap& bitmap);
-
-    // wxCocoa
-    inline WX_NSBitmapImageRep GetNSBitmapImageRep()
-    {   return m_cocoaNSBitmapImageRep; }
-protected:
-    WX_NSBitmapImageRep m_cocoaNSBitmapImageRep;
-};
-
-
-// ========================================================================
-// wxBitmap
-// ========================================================================
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject,
-                                 public wxBitmapHelpers
-{
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    // Platform-specific default constructor
-    wxBitmap();
-    // Initialize with raw data.
-    wxBitmap(const char bits[], int width, int height, int depth = 1);
-    // Initialize with XPM data
-    wxBitmap(const char* const* bits);
-    // Load a file or resource
-    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-    // Construct from Cocoa's NSImage
-    wxBitmap(NSImage* cocoaNSImage);
-    // Construct from Cocoa's NSBitmapImageRep
-    wxBitmap(NSBitmapImageRep* cocoaNSBitmapImageRep);
-    // Constructor for generalised creation from data
-    wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
-    // If depth is omitted, will create a bitmap compatible with the display
-    wxBitmap(int width, int height, int depth = -1)
-        { (void)Create(width, height, depth); }
-    wxBitmap(const wxSize& sz, int depth = -1)
-        { (void)Create(sz, depth); }
-    // Convert from wxImage:
-    wxBitmap(const wxImage& image, int depth = -1)
-        { CreateFromImage(image, depth); }
-    // Convert from wxIcon
-    wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
-
-    // destructor
-    virtual ~wxBitmap();
-
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    // Initialize from wxImage
-    bool CreateFromImage(const wxImage& image, int depth=-1);
-
-    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
-    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
-        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
-
-    bool Create(NSImage* cocoaNSImage);
-    bool Create(NSBitmapImageRep* cocoaNSBitmapImageRep);
-    virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
-    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-    virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
-
-    // copies the contents and mask of the given (colour) icon to the bitmap
-    virtual bool CopyFromIcon(const wxIcon& icon);
-
-    wxImage ConvertToImage() const;
-
-    // get the given part of bitmap
-    wxBitmap GetSubBitmap( const wxRect& rect ) const;
-
-    int GetWidth() const;
-    int GetHeight() const;
-    int GetDepth() const;
-    int GetQuality() const;
-    void SetWidth(int w);
-    void SetHeight(int h);
-    void SetDepth(int d);
-    void SetQuality(int q);
-    void SetOk(bool isOk);
-
-    // raw bitmap access support functions
-    void *GetRawData(wxPixelDataBase& data, int bpp);
-    void UngetRawData(wxPixelDataBase& data);
-
-    wxPalette* GetPalette() const;
-    void SetPalette(const wxPalette& palette);
-
-    wxMask *GetMask() const;
-    void SetMask(wxMask *mask) ;
-
-    wxBitmapType GetBitmapType() const;
-
-    // wxCocoa
-    WX_NSBitmapImageRep GetNSBitmapImageRep();
-    void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep);
-    WX_NSImage GetNSImage(bool useMask) const;
-
-    static void InitStandardHandlers() { }
-    static void CleanUpHandlers() { }
-
-protected:
-    wxGDIRefData *CreateGDIRefData() const;
-    wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
-};
-
-
-#endif // __WX_COCOA_BITMAP_H__

Externals/wxWidgets3/include/wx/cocoa/bmpbuttn.h

@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/bmpbuttn.h
-// Purpose:     wxBitmapButton class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/03/16
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_BMPBUTTN_H__
-#define __WX_COCOA_BMPBUTTN_H__
-
-#include "wx/cocoa/NSButton.h"
-
-// ========================================================================
-// wxBitmapButton
-// ========================================================================
-class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-   wxBitmapButton() { }
-   wxBitmapButton(wxWindow *parent, wxWindowID winid,
-             const wxBitmap& bitmap,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize, long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, winid, bitmap, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxBitmap& bitmap,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxButtonNameStr);
-    virtual ~wxBitmapButton();
-
-// ------------------------------------------------------------------------
-// Cocoa callbacks
-// ------------------------------------------------------------------------
-protected:
-    virtual void Cocoa_wxNSButtonAction(void);
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    // The wxButton::DoGetBestSize is not correct for bitmap buttons
-    wxSize DoGetBestSize() const
-    {   return wxButtonBase::DoGetBestSize(); }
-};
-
-#endif // __WX_COCOA_BMPBUTTN_H__

Externals/wxWidgets3/include/wx/cocoa/brush.h

@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/brush.h
-// Purpose:     wxBrush class
-// Author:      David Elliott <dfe@cox.net>
-// Modified by:
-// Created:     2003/07/03
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_BRUSH_H__
-#define __WX_COCOA_BRUSH_H__
-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-class WXDLLIMPEXP_FWD_CORE wxBrush;
-
-// ========================================================================
-// wxBrush
-// ========================================================================
-class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
-{
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    wxBrush();
-    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
-#endif
-    wxBrush(const wxBitmap& stipple);
-    virtual ~wxBrush();
-
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-    virtual void SetColour(const wxColour& col) ;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
-    virtual void SetStyle(wxBrushStyle style) ;
-    virtual void SetStipple(const wxBitmap& stipple) ;
-
-    // comparison
-    bool operator == (const wxBrush& brush) const
-    {   return m_refData == brush.m_refData; }
-    bool operator != (const wxBrush& brush) const
-    {   return m_refData != brush.m_refData; }
-
-    // accessors
-    wxColour GetColour() const;
-    virtual wxBrushStyle GetStyle() const;
-    wxBitmap *GetStipple() const;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif
-
-    // wxCocoa
-    WX_NSColor GetNSColor();
-
-protected:
-    wxGDIRefData *CreateGDIRefData() const;
-    wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-};
-
-#endif // __WX_COCOA_BRUSH_H__

Externals/wxWidgets3/include/wx/cocoa/button.h

@@ -1,64 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/button.h
-// Purpose:     wxButton class
-// Author:      David Elliott
-// Modified by:
-// Created:     2002/12/29
-// Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_BUTTON_H__
-#define __WX_COCOA_BUTTON_H__
-
-#include "wx/cocoa/NSButton.h"
-
-// ========================================================================
-// wxButton
-// ========================================================================
-class WXDLLIMPEXP_CORE wxButton : public wxButtonBase, protected wxCocoaNSButton
-{
-    DECLARE_DYNAMIC_CLASS(wxButton)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-   wxButton() { }
-   wxButton(wxWindow *parent, wxWindowID winid,
-             const wxString& label = wxEmptyString,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize, long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, winid, label, pos, size, style, validator, name);
-    }
-
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxString& label = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxButtonNameStr);
-
-    virtual ~wxButton();
-
-// ------------------------------------------------------------------------
-// Cocoa callbacks
-// ------------------------------------------------------------------------
-protected:
-    virtual void Cocoa_wxNSButtonAction(void);
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    wxString GetLabel() const;
-    void SetLabel(const wxString& label);
-    wxSize DoGetBestSize() const;
-};
-
-#endif
-    // __WX_COCOA_BUTTON_H__

Externals/wxWidgets3/include/wx/cocoa/checkbox.h

@@ -1,68 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/checkbox.h
-// Purpose:     wxCheckBox class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/03/16
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_CHECKBOX_H__
-#define __WX_COCOA_CHECKBOX_H__
-
-#include "wx/cocoa/NSButton.h"
-
-// ========================================================================
-// wxCheckBox
-// ========================================================================
-class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase , protected wxCocoaNSButton
-{
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    wxCheckBox() { }
-    wxCheckBox(wxWindow *parent, wxWindowID winid,
-            const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, winid, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr);
-    virtual ~wxCheckBox();
-
-// ------------------------------------------------------------------------
-// Cocoa callbacks
-// ------------------------------------------------------------------------
-protected:
-    virtual void Cocoa_wxNSButtonAction(void);
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    virtual void SetValue(bool);
-    virtual bool GetValue() const;
-    virtual void SetLabel(const wxString& label);
-    virtual wxString GetLabel() const;
-
-protected:
-    virtual void DoSet3StateValue(wxCheckBoxState state);
-    virtual wxCheckBoxState DoGet3StateValue() const;
-};
-
-#endif // __WX_COCOA_CHECKBOX_H__

Externals/wxWidgets3/include/wx/cocoa/checklst.h

@@ -1,79 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/checklst.h
-// Purpose:     wxCheckListBox class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/03/16
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_CHECKLST_H__
-#define __WX_COCOA_CHECKLST_H__
-
-//#include "wx/cocoa/NSTableView.h"
-
-// ========================================================================
-// wxCheckListBox
-// ========================================================================
-class WXDLLIMPEXP_CORE wxCheckListBox: public wxCheckListBoxBase //, protected wxCocoaNSTableView
-{
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_COCOA_OWNER(NSTableView,NSControl,NSView)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    wxCheckListBox() { }
-    wxCheckListBox(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr)
-    {
-        Create(parent, winid,  pos, size, n, choices, style, validator, name);
-    }
-    wxCheckListBox(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr)
-    {
-        Create(parent, winid,  pos, size, choices, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr);
-    virtual ~wxCheckListBox();
-
-// ------------------------------------------------------------------------
-// Cocoa callbacks
-// ------------------------------------------------------------------------
-protected:
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    // check list box specific methods
-    virtual bool IsChecked(unsigned int item) const;
-    virtual void Check(unsigned int item, bool check = true);
-};
-
-#endif // __WX_COCOA_CHECKLST_H__

Externals/wxWidgets3/include/wx/cocoa/chkconf.h

@@ -1,21 +0,0 @@
-/*
- * Name:        wx/cocoa/chkconf.h
- * Purpose:     wxCocoa-specific config settings checks
- * Author:      Vadim Zeitlin
- * Created:     2008-09-11
- * Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#ifndef _WX_COCOA_CHKCONF_H_
-#define _WX_COCOA_CHKCONF_H_
-
-/*
-    wxLogDialog doesn't currently work correctly in wxCocoa.
- */
-#undef wxUSE_LOG_DIALOG
-#define wxUSE_LOG_DIALOG 0
-
-#endif /* _WX_COCOA_CHKCONF_H_ */

Externals/wxWidgets3/include/wx/cocoa/choice.h

@@ -1,100 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/choice.h
-// Purpose:     wxChoice class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/03/16
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_CHOICE_H__
-#define __WX_COCOA_CHOICE_H__
-
-//#include "wx/cocoa/NSPopUpButton.h"
-#include "wx/cocoa/NSMenu.h"
-
-class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
-
-// ========================================================================
-// wxChoice
-// ========================================================================
-class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu
-{
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-    DECLARE_EVENT_TABLE()
-//    WX_DECLARE_COCOA_OWNER(NSTableView,NSControl,NSView)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    wxChoice() { Init(); }
-    wxChoice(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr)
-    {
-        Init();
-        Create(parent, winid,  pos, size, n, choices, style, validator, name);
-    }
-    wxChoice(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr)
-    {
-        Init();
-        Create(parent, winid,  pos, size, choices, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr);
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr);
-    virtual ~wxChoice();
-protected:
-    void Init();
-
-// ------------------------------------------------------------------------
-// Cocoa callbacks
-// ------------------------------------------------------------------------
-protected:
-    void CocoaNotification_menuDidSendAction(WX_NSNotification notification);
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    virtual void DoClear();
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int) const;
-    virtual void SetString(unsigned int pos, const wxString&);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual int GetSelection() const;
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-    virtual void DoDeleteOneItem(unsigned int pos);
-    virtual void DoSetItemClientData(unsigned int, void*);
-    virtual void* DoGetItemClientData(unsigned int) const;
-    virtual void SetSelection(int pos);
-protected:
-    wxSortedArrayString *m_sortedStrings;
-    wxArrayPtrVoid m_itemsClientData;
-};
-
-#endif // __WX_COCOA_CHOICE_H__

Externals/wxWidgets3/include/wx/cocoa/clipbrd.h

@@ -1,51 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/clipbrd.h
-// Purpose:     wxClipboard
-// Author:      David Elliott <dfe@cox.net>
-// Modified by:
-// Created:     2003/07/23
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_CLIPBRD_H__
-#define __WX_COCOA_CLIPBRD_H__
-
-#include "wx/dataobj.h"
-
-//=========================================================================
-// wxClipboard
-//=========================================================================
-class wxClipboard : public wxClipboardBase
-{
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-public:
-    wxClipboard();
-    virtual ~wxClipboard();
-
-    // open the clipboard before SetData() and GetData()
-    virtual bool Open();
-
-    // close the clipboard after SetData() and GetData()
-    virtual void Close();
-
-    // query whether the clipboard is opened
-    virtual bool IsOpened() const;
-
-    // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data );
-
-    // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data );
-
-    // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format );
-
-    // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
-
-    // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
-};
-
-#endif //__WX_COCOA_CLIPBRD_H__

Externals/wxWidgets3/include/wx/cocoa/colordlg.h

@@ -1 +0,0 @@
-

Externals/wxWidgets3/include/wx/cocoa/colour.h

@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/colour.h
-// Purpose:     wxColour class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/06/17
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_COLOUR_H__
-#define __WX_COCOA_COLOUR_H__
-
-#include "wx/object.h"
-#include "wx/string.h"
-
-// ========================================================================
-// wxColour
-// ========================================================================
-
-class WXDLLIMPEXP_CORE wxColour : public wxColourBase
-{
-public:
-    // constructors
-    // ------------
-    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
-
-    // initialization using existing NSColor
-    wxColour( WX_NSColor aColor );
-
-    // copy ctors and assignment operators
-    wxColour( const wxColour& col );
-    wxColour& operator = ( const wxColour& col );
-
-    virtual ~wxColour();
-
-    // accessors
-    virtual bool IsOk() const { return m_cocoaNSColor; }
-    WX_NSColor GetNSColor() { return m_cocoaNSColor; }
-    WX_NSColor GetNSColor() const { return m_cocoaNSColor; }
-
-    unsigned char Red() const { return m_red; }
-    unsigned char Green() const { return m_green; }
-    unsigned char Blue() const { return m_blue; }
-    unsigned char Alpha() const { return m_alpha; }
-
-    // comparison
-    bool operator == (const wxColour& colour) const
-    {
-        return m_cocoaNSColor == colour.m_cocoaNSColor ||
-               (m_red == colour.m_red &&
-                m_green == colour.m_green &&
-                m_blue == colour.m_blue &&
-                m_alpha == colour.m_alpha);
-    }
-    bool operator != (const wxColour& colour) const
-        { return !(*this == colour); }
-
-    // Set() functions
-    void Set( WX_NSColor aColor );
-
-    // reroute the inherited ones
-    void Set(unsigned char red,
-             unsigned char green,
-             unsigned char blue,
-             unsigned char alpha = wxALPHA_OPAQUE)
-        { wxColourBase::Set(red, green, blue, alpha); }
-
-    bool Set(const wxString &str)
-        { return wxColourBase::Set(str); }
-
-    void Set(unsigned long colRGB)
-        { wxColourBase::Set(colRGB); }
-
-protected:
-    // puts the object in an invalid, uninitialized state
-    void Init();
-
-    virtual void
-    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-private:
-    WX_NSColor m_cocoaNSColor;
-    unsigned char m_red;
-    unsigned char m_green;
-    unsigned char m_blue;
-    unsigned char m_alpha;
-
-    DECLARE_DYNAMIC_CLASS(wxColour)
-};
-
-#endif // __WX_COCOA_COLOUR_H__

Externals/wxWidgets3/include/wx/cocoa/combobox.h

@@ -1,157 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/combobox.h
-// Purpose:     wxComboBox class
-// Author:      Ryan Norton
-// Modified by:
-// Created:     2005/02/16
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_COMBOBOX_H__
-#define __WX_COCOA_COMBOBOX_H__
-
-//Begin NSComboBox.h
-
-#include "wx/hashmap.h"
-#include "wx/cocoa/ObjcAssociate.h"
-
-#include "wx/textctrl.h"
-
-DECLARE_WXCOCOA_OBJC_CLASS(NSComboBox);
-
-WX_DECLARE_OBJC_HASHMAP(NSComboBox);
-class wxCocoaNSComboBox
-{
-    WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSComboBox)
-public:
-    void AssociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
-    void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
-
-    virtual void doWxEvent(int nEvent) = 0;
-    virtual ~wxCocoaNSComboBox() { }
-};
-
-//begin combobox.h
-
-#include "wx/dynarray.h"
-
-// ========================================================================
-// wxComboBox
-// ========================================================================
-class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField
-{
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView)
-    WX_DECLARE_COCOA_OWNER(NSTextField,NSControl,NSView)
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    wxComboBox() { }
-    wxComboBox(wxWindow *parent, wxWindowID winid,
-            const wxString& value = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxComboBoxNameStr)
-    {
-        Create(parent, winid, value, pos, size, n, choices, style, validator, name);
-    }
-    wxComboBox(wxWindow *parent, wxWindowID winid,
-            const wxString& value,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxComboBoxNameStr)
-    {
-        Create(parent, winid, value, pos, size, choices, style,
-               validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxString& value = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxComboBoxNameStr);
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxString& value,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxComboBoxNameStr);
-    virtual ~wxComboBox();
-
-// ------------------------------------------------------------------------
-// Cocoa callbacks
-// ------------------------------------------------------------------------
-protected:
-    wxArrayPtrVoid m_Datas;
-    virtual void doWxEvent(int nEvent);
-
-    virtual void Cocoa_didChangeText()
-    {}
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-    void Clear() // HACK
-    {   wxComboBoxBase::Clear(); }
-
-    // wxCombobox methods
-    virtual void SetSelection(int pos);
-    // Overlapping methods
-    virtual wxString GetStringSelection();
-    // wxItemContainer
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int) const;
-    virtual void SetString(unsigned int pos, const wxString&);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual int GetSelection() const;
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-    virtual void DoSetItemClientData(unsigned int, void*);
-    virtual void* DoGetItemClientData(unsigned int) const;
-    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
-
-// ------------------------------------------------------------------------
-// wxTextEntryBase virtual implementations:
-// ------------------------------------------------------------------------
-    // FIXME: This needs to be moved to some sort of common code.
-    virtual void WriteText(const wxString&);
-    virtual wxString GetValue() const;
-    virtual void Remove(long, long);
-    virtual void Cut();
-    virtual void Copy();
-    virtual void Paste();
-    virtual void Undo();
-    virtual void Redo();
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-    virtual void SetInsertionPoint(long pos);
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-    virtual void SetSelection(long from, long to);
-    virtual void GetSelection(long *from, long *to) const;
-    virtual bool IsEditable() const;
-    virtual void SetEditable(bool editable);
-
-private:
-    // implement wxTextEntry pure virtual method
-    virtual wxWindow *GetEditableWindow() { return this; }
-};
-
-#endif // __WX_COCOA_COMBOBOX_H__

Externals/wxWidgets3/include/wx/cocoa/control.h

@@ -1,77 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/control.h
-// Purpose:     wxControl class
-// Author:      David Elliott
-// Modified by:
-// Created:     2003/02/15
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_CONTROL_H__
-#define __WX_COCOA_CONTROL_H__
-
-#include "wx/cocoa/NSControl.h"
-
-// ========================================================================
-// wxControl
-// ========================================================================
-
-class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxCocoaNSControl
-{
-    DECLARE_ABSTRACT_CLASS(wxControl)
-    WX_DECLARE_COCOA_OWNER(NSControl,NSView,NSView)
-    DECLARE_EVENT_TABLE()
-// ------------------------------------------------------------------------
-// initialization
-// ------------------------------------------------------------------------
-public:
-    wxControl() {}
-    wxControl(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr)
-    {
-        Create(parent, winid, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
-    virtual ~wxControl();
-
-// ------------------------------------------------------------------------
-// Implementation
-// ------------------------------------------------------------------------
-public:
-
-    // implementation from now on
-    // --------------------------
-
-    void OnEraseBackground(wxEraseEvent& event);
-
-    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
-
-    // Calls the callback and appropriate event handlers
-    bool ProcessCommand(wxCommandEvent& event);
-
-    // Enables the control
-    virtual void CocoaSetEnabled(bool enable);
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    // Provides a common implementation of title setting which strips mnemonics
-    // and then calls setTitle: with the stripped string.  May be implemented
-    // to call setTitleWithMnemonic: on OpenStep-compatible systems.  Only
-    // intended for use by views or cells which implement at least setTitle:
-    // and possibly setTitleWithMnemonic: such as NSBox and NSButton or NSCell
-    // classes, for example as used by wxRadioBox.  Not usable with classes like
-    // NSTextField which expect setStringValue:.
-    static void CocoaSetLabelForObject(const wxString& labelWithWxMnemonic, struct objc_object *anObject);
-};
-
-#endif
-    // __WX_COCOA_CONTROL_H__

Externals/wxWidgets3/include/wx/cocoa/cursor.h

@@ -1,64 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/cursor.h
-// Purpose:     wxCursor class
-// Author:      David Elliott <dfe@cox.net>
-// Modified by:
-// Created:     2002/11/27
-// Copyright:   (c) David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COCOA_CURSOR_H_
-#define _WX_COCOA_CURSOR_H_
-
-#include "wx/bitmap.h"
-
-class WXDLLIMPEXP_CORE wxCursorRefData : public wxGDIRefData
-{
-public:
-    wxCursorRefData();
-    virtual ~wxCursorRefData();
-
-protected:
-    int m_width, m_height;
-    WX_NSCursor m_hCursor;
-
-    friend class WXDLLIMPEXP_FWD_CORE wxBitmap;
-    friend class WXDLLIMPEXP_FWD_CORE wxCursor;
-
-    wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
-};
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
-
-// Cursor
-class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
-{
-public:
-    wxCursor();
-
-    wxCursor(const wxString& name, wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
-             int hotSpotX = 0, int hotSpotY = 0);
-
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
-    virtual ~wxCursor();
-
-    // FIXME: operator==() is wrong!
-    bool operator==(const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
-    bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); }
-
-    WX_NSCursor GetNSCursor() const { return M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0; }
-
-private:
-    void InitFromStock(wxStockCursor);
-    DECLARE_DYNAMIC_CLASS(wxCursor)
-};
-
-extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
-
-#endif
-    // _WX_COCOA_CURSOR_H_

Externals/wxWidgets3/include/wx/cocoa/dataform.h

@@ -1,50 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/dataform.h
-// Purpose:     declaration of the wxDataFormat class
-// Author:      David Elliott <dfe@cox.net>
-// Modified by:
-// Created:     2003/07/23
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_DATAFORM_H__
-#define __WX_COCOA_DATAFORM_H__
-
-class wxDataFormat
-{
-public:
-    wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }
-    wxDataFormat(const wxString& zFormat) { SetId(zFormat); }
-
-    wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
-    wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }
-
-    //
-    // Comparison (must have both versions)
-    //
-    bool operator==(wxDataFormatId eFormat) const { return (m_uFormat == (unsigned int)eFormat); }
-    bool operator!=(wxDataFormatId eFormat) const { return (m_uFormat != (unsigned int)eFormat); }
-    bool operator==(const wxDataFormat& rFormat) const { return (m_uFormat == rFormat.m_uFormat); }
-    bool operator!=(const wxDataFormat& rFormat) const { return (m_uFormat != rFormat.m_uFormat); }
-         operator unsigned int(void) const { return m_uFormat; }
-
-    unsigned int GetFormatId(void) const { return (unsigned int)m_uFormat; }
-    unsigned int GetType(void) const { return (unsigned int)m_uFormat; }
-
-    bool IsStandard(void) const;
-
-    void SetType(unsigned int uType){ m_uFormat = uType; }
-
-    //
-    // String ids are used for custom types - this SetId() must be used for
-    // application-specific formats
-    //
-    wxString GetId(void) const;
-    void     SetId(const wxString& WXUNUSED(pId)) { /* TODO */ }
-
-private:
-    unsigned int                    m_uFormat;
-}; // end of CLASS wxDataFormat
-
-#endif // __WX_COCOA_DATAFORM_H__

Externals/wxWidgets3/include/wx/cocoa/dataobj.h

@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cocoa/dataobj.h
-// Purpose:     declaration of the wxDataObject
-// Author:      David Elliott <dfe@cox.net>
-// Modified by:
-// Created:     2003/07/23
-// Copyright:   (c) 2003 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_COCOA_DATAOBJ_H__
-#define __WX_COCOA_DATAOBJ_H__
-
-class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
-{
-public:
-    wxDataObject();
-    virtual ~wxDataObject();
-    virtual bool IsSupportedFormat(const wxDataFormat& format,
-        Direction dir = Get) const;
-};
-
-#endif // __WX_COCOA_DATAOBJ_H__