// Recommended setting: 1
#define wxUSE_MEDIACTRL 1
-// Use GStreamer for Unix (req a lot of dependancies)
+// Use GStreamer for Unix.
//
-// Default is 0
+// Default is 0 as this requires a lot of dependencies which might not be
+// available.
//
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
#define wxUSE_GSTREAMER 0
// Recommended setting: 1
#define wxUSE_AUI 1
+// Use wxPropertyGrid.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_PROPGRID 1
+
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
#define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create fiels in SVG (Scalable Vector Graphics) format.
+// to create files in SVG (Scalable Vector Graphics) format.
#define wxUSE_SVG 1
// ----------------------------------------------------------------------------
#define wxUSE_STD_IOSTREAM 0
#endif
-// things not implemented under Mac
-#undef wxUSE_POPUPWIN
-#define wxUSE_POPUPWIN 0
+#undef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 1
-#undef wxUSE_TIPWINDOW
-#define wxUSE_TIPWINDOW 0
-#undef wxUSE_TOGGLEBTN
-#define wxUSE_TOGGLEBTN 0
+// things not implemented under Mac
#undef wxUSE_STACKWALKER
#define wxUSE_STACKWALKER 0
// wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to
// embed the Safari browser control
// 0 by default because of Jaguar compatibility problems
-#define wxUSE_WEBKIT 0
+#define wxUSE_WEBKIT 1
// Set to 0 for no libmspack
#define wxUSE_LIBMSPACK 0
-// native toolbar does not support embedding controls yet, please test by setting to 1
-#define wxMAC_USE_NATIVE_TOOLBAR 0
+// native toolbar does support embedding controls, but not comples panels, please test
+#define wxOSX_USE_NATIVE_TOOLBAR 1
// make sure we have the proper dispatcher for the console event loop
#define wxUSE_SELECT_DISPATCHER 1
#define wxUSE_EPOLL_DISPATCHER 0
-
#endif
// _WX_SETUP_H_