diff --git a/Externals/wxWidgets3/SConscript b/Externals/wxWidgets3/SConscript
index a2ac5fba0f..4385282e66 100644
--- a/Externals/wxWidgets3/SConscript
+++ b/Externals/wxWidgets3/SConscript
@@ -13,7 +13,7 @@ wxenv = env.Clone()
 wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations', '-Wno-shadow']
 wxenv['CPPDEFINES'] += ['WXBUILDING']
 
-# gtk, msw, osx and shared files as of r67258
+# gtk, msw, osx and shared files as of r67291
 
 aui = [
 	'src/aui/auibar.cpp',
@@ -843,6 +843,7 @@ osx = [
 	'src/osx/cocoa/gauge.mm',
 	'src/osx/cocoa/glcanvas.mm',
 	'src/osx/cocoa/listbox.mm',
+	#'src/osx/cocoa/mediactrl.mm',
 	'src/osx/cocoa/menu.mm',
 	'src/osx/cocoa/menuitem.mm',
 	'src/osx/cocoa/msgdlg.mm',
diff --git a/Externals/wxWidgets3/include/wx/accel.h b/Externals/wxWidgets3/include/wx/accel.h
index b394ad93f3..f4edd93047 100644
--- a/Externals/wxWidgets3/include/wx/accel.h
+++ b/Externals/wxWidgets3/include/wx/accel.h
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     31.05.01 (extracted from other files)
-// RCS-ID:      $Id: accel.h 65497 2010-09-10 11:44:35Z VZ $
+// RCS-ID:      $Id: accel.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -116,7 +116,7 @@ public:
 
     // returns a wxString for the this accelerator.
     // this function formats it using the <flags>-<keycode> format
-    // where <flags> maybe a hyphen-separed list of "shift|alt|ctrl"
+    // where <flags> maybe a hyphen-separated list of "shift|alt|ctrl"
     wxString ToString() const;
 
     // returns true if the given string correctly initialized this object
diff --git a/Externals/wxWidgets3/include/wx/caret.h b/Externals/wxWidgets3/include/wx/caret.h
index 348b97b661..6ba5814b9f 100644
--- a/Externals/wxWidgets3/include/wx/caret.h
+++ b/Externals/wxWidgets3/include/wx/caret.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
-// RCS-ID:      $Id: caret.h 58757 2009-02-08 11:45:59Z VZ $
+// RCS-ID:      $Id: caret.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -147,7 +147,7 @@ public:
     virtual void OnKillFocus() { }
 
 protected:
-    // these functions may be overriden in the derived classes, but they
+    // these functions may be overridden in the derived classes, but they
     // should call the base class version first
     virtual bool DoCreate(wxWindowBase *window, int width, int height)
     {
diff --git a/Externals/wxWidgets3/include/wx/chkconf.h b/Externals/wxWidgets3/include/wx/chkconf.h
index 2883d7e63a..723c71fb67 100644
--- a/Externals/wxWidgets3/include/wx/chkconf.h
+++ b/Externals/wxWidgets3/include/wx/chkconf.h
@@ -4,7 +4,7 @@
  * Author:      Vadim Zeitlin
  * Modified by:
  * Created:     09.08.00
- * RCS-ID:      $Id: chkconf.h 67128 2011-03-05 11:16:55Z VZ $
+ * RCS-ID:      $Id: chkconf.h 67280 2011-03-22 14:17:38Z DS $
  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -21,10 +21,10 @@
     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
-    setup0.h and you haven't updated your local setup.h to to reflect it. If
+    setup0.h and you haven't updated your local setup.h to reflect it. If
     this is the case, you need to propagate the changes from setup0.h to your
     setup.h and, if using makefiles under MSW, also remove setup.h under the
-    build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that it
+    build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that
     the new setup.h is copied there.
 
     If you get an error of the form "wxFoo requires wxBar", then the settings
diff --git a/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h b/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h
index ada270c605..4c3390db5d 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/NSApplication.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/01/26
-// RCS-ID:      $Id: NSApplication.h 46227 2007-05-27 04:52:04Z DE $
+// RCS-ID:      $Id: NSApplication.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003,2004 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,7 +19,7 @@
 // ========================================================================
 /*!
     @class wxNSApplicationDelegate
-    @discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behavior.
+    @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.
diff --git a/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h b/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h
index 510a251511..5c8eead739 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h
@@ -7,7 +7,7 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2007/05/15
-// RCS-ID:      $Id: objc_uniquifying.h 51891 2008-02-18 20:36:16Z DE $
+// RCS-ID:      $Id: objc_uniquifying.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 Software 2000 Ltd.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -205,7 +205,7 @@ struct objc_class* wx_GetObjcClass_ ## ObjcClass();
 // _s_objc_class_ptr_ObjcClass:
 //     .long L_OBJC_CLASS_ObjcClass
 // Once that static symbol is defined, the function implementation is easy for GCC to generate.
-// Do note that return &s_objc_class_data_ObjcClass won't work.  The code is wrong in the case.
+// Do note that return &s_objc_class_data_ObjcClass won't work.  The code is wrong in this case.
 #define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \
 extern "C" objc_class s_objc_class_data_ ## ObjcClass asm("L_OBJC_CLASS_" #ObjcClass); \
 static objc_class * s_objc_class_ptr_ ## ObjcClass = &s_objc_class_data_ ## ObjcClass; \
@@ -278,7 +278,7 @@ inline objc_class * wxObjcCompilerInformation<ObjcClass>::GetCompiledClass() \
 }
 
 // TODO: __x86_64__, __ppc64__
-#else // Can't wrie inline asm to bust into __OBJC segment
+#else // Can't write inline asm to bust into __OBJC segment
 // This won't be used since the generic implementation takes precedence.
 
 #warning "Don't know how to implement wxObjcCompilerInformation<ObjcClass>::GetCompiledClass on this platform"
diff --git a/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h b/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h
index 897943ff48..dcfc64d484 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2008/02/14
-// RCS-ID:      $Id: scrollview.h 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: scrollview.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003- David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@ protected:
     virtual void Cocoa_synthesizeMouseMoved(void) {}
     /*!
         Flag as to whether we're scrolling for a native view or a custom
-        wxWindow.  This controls the scrolling behavior.  When providing
+        wxWindow.  This controls the scrolling behaviour.  When providing
         scrolling for a native view we don't catch scroller action messages
         and thus don't send scroll events and we don't actually scroll the
         window when the application calls ScrollWindow.
diff --git a/Externals/wxWidgets3/include/wx/cocoa/radiobox.h b/Externals/wxWidgets3/include/wx/cocoa/radiobox.h
index bc4fd280dc..cc5fbe545f 100644
--- a/Externals/wxWidgets3/include/wx/cocoa/radiobox.h
+++ b/Externals/wxWidgets3/include/wx/cocoa/radiobox.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id: radiobox.h 52834 2008-03-26 15:06:00Z FM $
+// RCS-ID:      $Id: radiobox.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -110,7 +110,7 @@ public:
     virtual void SetString(unsigned int n, const wxString& label);
     // change the individual radio button state
 protected:
-    // We don't want the typical wxCocoaNSBox behavior because our real
+    // We don't want the typical wxCocoaNSBox behaviour because our real
     // implementation is by using an NSMatrix as the NSBox's contentView.
     WX_NSMatrix GetNSMatrix() const;
     void AssociateNSBox(WX_NSBox theBox);
diff --git a/Externals/wxWidgets3/include/wx/combo.h b/Externals/wxWidgets3/include/wx/combo.h
index 0380f85b6c..98a6094ff7 100644
--- a/Externals/wxWidgets3/include/wx/combo.h
+++ b/Externals/wxWidgets3/include/wx/combo.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combo.h 67256 2011-03-20 11:15:17Z JMS $
+// RCS-ID:      $Id: combo.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ enum
     wxCC_IFLAG_CREATED              = 0x0100,
     // Internal use: really put button outside
     wxCC_IFLAG_BUTTON_OUTSIDE       = 0x0200,
-    // Internal use: SetMargins has been succesfully called
+    // Internal use: SetMargins has been successfully called
     wxCC_IFLAG_LEFT_MARGIN_SET      = 0x0400,
     // Internal use: Set wxTAB_TRAVERSAL to parent when popup is dismissed
     wxCC_IFLAG_PARENT_TAB_TRAVERSAL = 0x0800,
@@ -674,7 +674,7 @@ protected:
     wxRect                  m_tcArea;
     wxRect                  m_btnArea;
 
-    // Colour of the the text area, in case m_text is NULL
+    // Colour of the text area, in case m_text is NULL
     wxColour                m_tcBgCol;
 
     // current button state (uses renderer flags)
diff --git a/Externals/wxWidgets3/include/wx/datetime.h b/Externals/wxWidgets3/include/wx/datetime.h
index cbd3d33078..448f6575d1 100644
--- a/Externals/wxWidgets3/include/wx/datetime.h
+++ b/Externals/wxWidgets3/include/wx/datetime.h
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.02.99
-// RCS-ID:      $Id: datetime.h 65649 2010-09-26 22:11:21Z VZ $
+// RCS-ID:      $Id: datetime.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -173,7 +173,7 @@ public:
         // the time in the current time zone
         Local,
 
-        // zones from GMT (= Greenwhich Mean Time): they're guaranteed to be
+        // zones from GMT (= Greenwich Mean Time): they're guaranteed to be
         // consequent numbers, so writing something like `GMT0 + offset' is
         // safe if abs(offset) <= 12
 
diff --git a/Externals/wxWidgets3/include/wx/debug.h b/Externals/wxWidgets3/include/wx/debug.h
index 2ef00bf2b7..f66cf4681e 100644
--- a/Externals/wxWidgets3/include/wx/debug.h
+++ b/Externals/wxWidgets3/include/wx/debug.h
@@ -3,7 +3,7 @@
 // Purpose:     Misc debug functions and macros
 // Author:      Vadim Zeitlin
 // Created:     29/01/98
-// RCS-ID:      $Id: debug.h 64531 2010-06-09 13:23:13Z FM $
+// RCS-ID:      $Id: debug.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998-2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -312,7 +312,7 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
         wxCHECK_RET( p != NULL, "pointer can't be NULL" )
 */
 
-// the generic macro: takes the condition to check, the statement to be execute
+// the generic macro: takes the condition to check, the statement to be executed
 // in case the condition is false and the message to pass to the assert handler
 #define wxCHECK2_MSG(cond, op, msg)                                       \
     if ( cond )                                                           \
diff --git a/Externals/wxWidgets3/include/wx/docview.h b/Externals/wxWidgets3/include/wx/docview.h
index d9f176bf5e..3f48964a03 100644
--- a/Externals/wxWidgets3/include/wx/docview.h
+++ b/Externals/wxWidgets3/include/wx/docview.h
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: docview.h 66852 2011-02-06 01:01:09Z VZ $
+// RCS-ID:      $Id: docview.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -184,8 +184,8 @@ protected:
     bool                  m_savedYet;
 
     // Called by OnSaveDocument and OnOpenDocument to implement standard
-    // Save/Load behavior. Re-implement in derived class for custom
-    // behavior.
+    // Save/Load behaviour. Re-implement in derived class for custom
+    // behaviour.
     virtual bool DoSaveDocument(const wxString& file);
     virtual bool DoOpenDocument(const wxString& file);
 
diff --git a/Externals/wxWidgets3/include/wx/gauge.h b/Externals/wxWidgets3/include/wx/gauge.h
index 27db3d8913..cec0dc48b0 100644
--- a/Externals/wxWidgets3/include/wx/gauge.h
+++ b/Externals/wxWidgets3/include/wx/gauge.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.02.01
-// RCS-ID:      $Id: gauge.h 58757 2009-02-08 11:45:59Z VZ $
+// RCS-ID:      $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1996-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -84,7 +84,7 @@ public:
     virtual void SetBezelFace(int w);
     virtual int GetBezelFace() const;
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
diff --git a/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h b/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h
index a93a72f636..5b0eca3b5a 100644
--- a/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h
+++ b/Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h
@@ -3,7 +3,7 @@
 // Author:      Robert Roebling
 // Purpose:     GNOME printing support
 // Created:     09/20/04
-// RCS-ID:      $Id: gprint.h 61724 2009-08-21 10:41:26Z VZ $
+// RCS-ID:      $Id: gprint.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   Robert Roebling
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@ protected:
     void SetPrintData(const wxPrintData& data);
     wxPrintData& GetPrintData() { return m_printData; }
 
-    // overriden for wxPrinterDC Impl
+    // overridden for wxPrinterDC Impl
     virtual wxRect GetPaperRect() const;
     virtual int GetResolution() const;
 
diff --git a/Externals/wxWidgets3/include/wx/gtk/print.h b/Externals/wxWidgets3/include/wx/gtk/print.h
index b36b1a222c..3dceebb115 100644
--- a/Externals/wxWidgets3/include/wx/gtk/print.h
+++ b/Externals/wxWidgets3/include/wx/gtk/print.h
@@ -3,7 +3,7 @@
 // Author:      Anthony Bretaudeau
 // Purpose:     GTK printing support
 // Created:     2007-08-25
-// RCS-ID:      $Id: print.h 67232 2011-03-18 15:10:15Z DS $
+// RCS-ID:      $Id: print.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Anthony Bretaudeau
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -249,7 +249,7 @@ public:
     void SetPalette(const wxPalette& WXUNUSED(palette)) { }
     void SetResolution(int ppi);
 
-    // overriden for wxPrinterDC Impl
+    // overridden for wxPrinterDC Impl
     virtual int GetResolution() const;
     virtual wxRect GetPaperRect() const;
 
diff --git a/Externals/wxWidgets3/include/wx/mediactrl.h b/Externals/wxWidgets3/include/wx/mediactrl.h
index f2d223307d..2757cf7641 100644
--- a/Externals/wxWidgets3/include/wx/mediactrl.h
+++ b/Externals/wxWidgets3/include/wx/mediactrl.h
@@ -4,7 +4,7 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrl.h 64533 2010-06-09 14:28:08Z FM $
+// RCS-ID:      $Id: mediactrl.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -58,7 +58,7 @@ enum wxMediaState
 enum wxMediaCtrlPlayerControls
 {
     wxMEDIACTRLPLAYERCONTROLS_NONE           =   0,
-    //Step controls like fastfoward, step one frame etc.
+    //Step controls like fastforward, step one frame etc.
     wxMEDIACTRLPLAYERCONTROLS_STEP           =   1 << 0,
     //Volume controls like the speaker icon, volume slider, etc.
     wxMEDIACTRLPLAYERCONTROLS_VOLUME         =   1 << 1,
diff --git a/Externals/wxWidgets3/include/wx/msw/apptbase.h b/Externals/wxWidgets3/include/wx/msw/apptbase.h
index 57f31804a8..42548e4369 100644
--- a/Externals/wxWidgets3/include/wx/msw/apptbase.h
+++ b/Externals/wxWidgets3/include/wx/msw/apptbase.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.06.2003
-// RCS-ID:      $Id: apptbase.h 67185 2011-03-14 11:54:32Z VZ $
+// RCS-ID:      $Id: apptbase.h 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,6 +31,7 @@ public:
     virtual void AfterChildWaitLoop(void *data) = 0;
 
 
+#if wxUSE_THREADS
     // wxThread helpers
     // ----------------
 
@@ -41,6 +42,7 @@ public:
     // wait for the handle to be signaled, return WAIT_OBJECT_0 if it is or, in
     // the GUI code, WAIT_OBJECT_0 + 1 if a Windows message arrived
     virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) = 0;
+#endif // wxUSE_THREADS
 
 
 #ifndef __WXWINCE__
@@ -60,9 +62,11 @@ public:
 #endif // !__WXWINCE__
 
 protected:
+#if wxUSE_THREADS
     // implementation of WaitForThread() for the console applications which is
-    // also used by the GUI code if it doesn't [yet|already} dispatch events
+    // also used by the GUI code if it doesn't [yet|already] dispatch events
     WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);
+#endif // wxUSE_THREADS
 };
 
 #endif // _WX_MSW_APPTBASE_H_
diff --git a/Externals/wxWidgets3/include/wx/msw/apptrait.h b/Externals/wxWidgets3/include/wx/msw/apptrait.h
index 324b0837cd..2ef84e7cc1 100644
--- a/Externals/wxWidgets3/include/wx/msw/apptrait.h
+++ b/Externals/wxWidgets3/include/wx/msw/apptrait.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
-// RCS-ID:      $Id: apptrait.h 67185 2011-03-14 11:54:32Z VZ $
+// RCS-ID:      $Id: apptrait.h 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -24,9 +24,11 @@ public:
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS
     virtual bool DoMessageFromThreadWait();
     virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
+#endif // wxUSE_THREADS
 #ifndef __WXWINCE__
     virtual bool CanUseStderr() { return true; }
     virtual bool WriteToStderr(const wxString& text);
@@ -43,10 +45,12 @@ public:
     virtual void AfterChildWaitLoop(void *data);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
+#endif // wxUSE_TIMER
+#if wxUSE_THREADS
     virtual bool DoMessageFromThreadWait();
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
     virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
+#endif // wxUSE_THREADS
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
 #ifndef __WXWINCE__
     virtual bool CanUseStderr();
diff --git a/Externals/wxWidgets3/include/wx/msw/combo.h b/Externals/wxWidgets3/include/wx/msw/combo.h
index a701460320..05724ea602 100644
--- a/Externals/wxWidgets3/include/wx/msw/combo.h
+++ b/Externals/wxWidgets3/include/wx/msw/combo.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combo.h 66385 2010-12-16 17:21:49Z JMS $
+// RCS-ID:      $Id: combo.h 67276 2011-03-22 09:56:40Z JMS $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -94,6 +94,8 @@ protected:
     void OnPaintEvent( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
 
+    virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
+
 private:
     void Init();
 
diff --git a/Externals/wxWidgets3/include/wx/msw/gauge.h b/Externals/wxWidgets3/include/wx/msw/gauge.h
index ef4f37fe14..a8632310c2 100644
--- a/Externals/wxWidgets3/include/wx/msw/gauge.h
+++ b/Externals/wxWidgets3/include/wx/msw/gauge.h
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: gauge.h 64648 2010-06-20 17:43:02Z VZ $
+// RCS-ID:      $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -47,7 +47,7 @@ public:
     virtual void SetRange(int range);
     virtual void SetValue(int pos);
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool SetForegroundColour(const wxColour& col);
     virtual bool SetBackgroundColour(const wxColour& col);
 
diff --git a/Externals/wxWidgets3/include/wx/msw/registry.h b/Externals/wxWidgets3/include/wx/msw/registry.h
index 3a53fd9146..5f7c8cc7d8 100644
--- a/Externals/wxWidgets3/include/wx/msw/registry.h
+++ b/Externals/wxWidgets3/include/wx/msw/registry.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.1998
-// RCS-ID:      $Id: registry.h 66851 2011-02-06 01:01:01Z VZ $
+// RCS-ID:      $Id: registry.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -92,7 +92,7 @@ public:
     // get StdKey from root HKEY
   static StdKey GetStdKeyFromHkey(WXHKEY hkey);
 
-  // extacts the std key prefix from the string (return value) and
+  // extracts the std key prefix from the string (return value) and
   // leaves only the part after it (i.e. modifies the string passed!)
   static StdKey ExtractKeyName(wxString& str);
 
diff --git a/Externals/wxWidgets3/include/wx/msw/statline.h b/Externals/wxWidgets3/include/wx/msw/statline.h
index 31c2b0c91b..002f8dc8ce 100644
--- a/Externals/wxWidgets3/include/wx/msw/statline.h
+++ b/Externals/wxWidgets3/include/wx/msw/statline.h
@@ -3,7 +3,7 @@
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.h 67254 2011-03-20 00:14:35Z DS $
+// Version:     $Id: statline.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@ public:
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticLineNameStr );
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
     // usually overridden base class virtuals
diff --git a/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h b/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h
index 0d99d51064..6d378e2d49 100644
--- a/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h
+++ b/Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: statbmp.h 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: statbmp.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
       }
   void  SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
 
-  // overriden base class virtuals
+  // overridden base class virtuals
   virtual bool AcceptsFocus() const { return false; }
 
  protected:
diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h b/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h
index bfb8d46113..4f710f223a 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/cfdataref.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2007/05/10
-// RCS-ID:      $Id: cfdataref.h 67232 2011-03-18 15:10:15Z DS $
+// RCS-ID:      $Id: cfdataref.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 Stefan Csomor
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html
@@ -40,7 +40,7 @@ public:
         @param p        The raw pointer to assume ownership of.  May be NULL.
         @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
                     to transfer ownership of that reference to this ref holder.  If the object comes from
-                    a Create or Copy method then this is the correct behavior.  If the object comes from
+                    a Create or Copy method then this is the correct behaviour.  If the object comes from
                     a Get method then you must CFRetain it yourself before passing it to this constructor.
                     A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
                     This method is templated and takes an otherType *p.  This prevents implicit conversion
diff --git a/Externals/wxWidgets3/include/wx/osx/core/cfref.h b/Externals/wxWidgets3/include/wx/osx/core/cfref.h
index 53c0c8a029..8a9ea13c51 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/cfref.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/cfref.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by: Stefan Csomor
 // Created:     2007/05/10
-// RCS-ID:      $Id: cfref.h 64943 2010-07-13 13:29:58Z VZ $
+// RCS-ID:      $Id: cfref.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 David Elliott <dfe@cox.net>, Stefan Csomor
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
@@ -172,7 +172,7 @@ public:
         @param p        The raw pointer to assume ownership of.  May be NULL.
         @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
                     to transfer ownership of that reference to this ref holder.  If the object comes from
-                    a Create or Copy method then this is the correct behavior.  If the object comes from
+                    a Create or Copy method then this is the correct behaviour.  If the object comes from
                     a Get method then you must CFRetain it yourself before passing it to this constructor.
                     A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
                     This method is templated and takes an otherType *p.  This prevents implicit conversion
@@ -364,7 +364,7 @@ inline wxCFWeakRef<refType> static_cfref_cast(const wxCFRef<otherRefType> &other
 }
 
 /*! @function   CFRelease
-    @abstract   Overloads CFRelease so that the user is warned of bad behavior.
+    @abstract   Overloads CFRelease so that the user is warned of bad behaviour.
     @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
                 must do it he can explicitly get() the raw pointer
                 Normally, this function is unimplemented resulting in a linker error if used.
@@ -373,7 +373,7 @@ template <class T>
 inline void CFRelease(const wxCFRef<T*> & cfref) DEPRECATED_ATTRIBUTE;
 
 /*! @function   CFRetain
-    @abstract   Overloads CFRetain so that the user is warned of bad behavior.
+    @abstract   Overloads CFRetain so that the user is warned of bad behaviour.
     @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
                 must do it he can explicitly get() the raw pointer
                 Normally, this function is unimplemented resulting in a linker error if used.
diff --git a/Externals/wxWidgets3/include/wx/osx/core/dataview.h b/Externals/wxWidgets3/include/wx/osx/core/dataview.h
index a478d83d12..8a24aaefd3 100644
--- a/Externals/wxWidgets3/include/wx/osx/core/dataview.h
+++ b/Externals/wxWidgets3/include/wx/osx/core/dataview.h
@@ -34,7 +34,7 @@ wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wx
 // for the carbon and cocoa environment.
 // ATTENTION
 //  All methods assume that the passed column pointers are
-//  valid (unless a NULL pointer is explicitely allowed
+//  valid (unless a NULL pointer is explicitly allowed
 //  to be passed)!
 // ATTENTION
 // ---------------------------------------------------------
diff --git a/Externals/wxWidgets3/include/wx/osx/window.h b/Externals/wxWidgets3/include/wx/osx/window.h
index 1ff8fc96fc..49aa250906 100644
--- a/Externals/wxWidgets3/include/wx/osx/window.h
+++ b/Externals/wxWidgets3/include/wx/osx/window.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: window.h 67243 2011-03-19 08:36:23Z SC $
+// RCS-ID:      $Id: window.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -164,7 +164,7 @@ public:
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     virtual void        TriggerScrollEvent( wxEventType scrollEvent ) ;
-    // this should not be overriden in classes above wxWindowMac
+    // this should not be overridden in classes above wxWindowMac
     // because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );
 
diff --git a/Externals/wxWidgets3/include/wx/protocol/ftp.h b/Externals/wxWidgets3/include/wx/protocol/ftp.h
index 10c918b6d8..cb03a70639 100644
--- a/Externals/wxWidgets3/include/wx/protocol/ftp.h
+++ b/Externals/wxWidgets3/include/wx/protocol/ftp.h
@@ -5,7 +5,7 @@
 // Modified by: Mark Johnson, wxWindows@mj10777.de
 //              20000917 : RmDir, GetLastResult, GetList
 // Created:     07/07/1997
-// RCS-ID:      $Id: ftp.h 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: ftp.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public:
     // this function tries its best to deliver the size in bytes using BINARY
     // (the SIZE command reports different sizes depending on whether
     // type is set to ASCII or BINARY)
-    // returns -1 if file is non-existant or size could not be found
+    // returns -1 if file is non-existent or size could not be found
     int GetFileSize(const wxString& fileName);
 
        // Check to see if a file exists in the current dir
diff --git a/Externals/wxWidgets3/include/wx/statbmp.h b/Externals/wxWidgets3/include/wx/statbmp.h
index 83b1f764c6..d42ea8d804 100644
--- a/Externals/wxWidgets3/include/wx/statbmp.h
+++ b/Externals/wxWidgets3/include/wx/statbmp.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
-// RCS-ID:      $Id: statbmp.h 58757 2009-02-08 11:45:59Z VZ $
+// RCS-ID:      $Id: statbmp.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@ public:
         return wxIcon();
     }
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
diff --git a/Externals/wxWidgets3/include/wx/statbox.h b/Externals/wxWidgets3/include/wx/statbox.h
index f1e9709d6a..c49a70ef31 100644
--- a/Externals/wxWidgets3/include/wx/statbox.h
+++ b/Externals/wxWidgets3/include/wx/statbox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: statbox.h 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: statbox.h 67280 2011-03-22 14:17:38Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl
 public:
     wxStaticBoxBase() { }
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
diff --git a/Externals/wxWidgets3/include/wx/statline.h b/Externals/wxWidgets3/include/wx/statline.h
index 2062344486..148b96af48 100644
--- a/Externals/wxWidgets3/include/wx/statline.h
+++ b/Externals/wxWidgets3/include/wx/statline.h
@@ -3,7 +3,7 @@
 // Purpose:     wxStaticLine class interface
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id: statline.h 58757 2009-02-08 11:45:59Z VZ $
+// Version:     $Id: statline.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@ public:
     // get the default size for the "lesser" dimension of the static line
     static int GetDefaultSize() { return 2; }
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
diff --git a/Externals/wxWidgets3/include/wx/stattext.h b/Externals/wxWidgets3/include/wx/stattext.h
index 23bb7f3ced..f9ca7a0e82 100644
--- a/Externals/wxWidgets3/include/wx/stattext.h
+++ b/Externals/wxWidgets3/include/wx/stattext.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id: stattext.h 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: stattext.h 67280 2011-03-22 14:17:38Z DS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -39,7 +39,7 @@ public:
     // This function will modify the value returned by GetLabel()!
     void Wrap(int width);
 
-    // overriden base virtuals
+    // overridden base virtuals
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
diff --git a/Externals/wxWidgets3/include/wx/strvararg.h b/Externals/wxWidgets3/include/wx/strvararg.h
index 23c6eec196..13409da707 100644
--- a/Externals/wxWidgets3/include/wx/strvararg.h
+++ b/Externals/wxWidgets3/include/wx/strvararg.h
@@ -3,7 +3,7 @@
 // Purpose:     macros for implementing type-safe vararg passing of strings
 // Author:      Vaclav Slavik
 // Created:     2007-02-19
-// RCS-ID:      $Id: strvararg.h 65046 2010-07-22 13:42:49Z VZ $
+// RCS-ID:      $Id: strvararg.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -207,7 +207,7 @@ public:
         { return const_cast<wxFormatString*>(this)->AsChar(); }
 private:
     // InputAsChar() returns the value passed to ctor, only converted
-    // to char, while AsChar() takes the the string returned by InputAsChar()
+    // to char, while AsChar() takes the string returned by InputAsChar()
     // and does format string conversion on it as well (and similarly for
     // ..AsWChar() below)
     const char* InputAsChar();
diff --git a/Externals/wxWidgets3/include/wx/txtstrm.h b/Externals/wxWidgets3/include/wx/txtstrm.h
index c1b98bb8d8..c7376c818e 100644
--- a/Externals/wxWidgets3/include/wx/txtstrm.h
+++ b/Externals/wxWidgets3/include/wx/txtstrm.h
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/1998
-// RCS-ID:      $Id: txtstrm.h 58757 2009-02-08 11:45:59Z VZ $
+// RCS-ID:      $Id: txtstrm.h 67286 2011-03-22 17:15:45Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -45,6 +45,8 @@ public:
 #endif
     ~wxTextInputStream();
 
+    const wxInputStream& GetInputStream() const { return m_input; }
+
     wxUint32 Read32(int base = 10); // base may be between 2 and 36, inclusive, or the special 0 (= C format)
     wxUint16 Read16(int base = 10);
     wxUint8  Read8(int base = 10);
@@ -116,6 +118,8 @@ public:
 #endif
     virtual ~wxTextOutputStream();
 
+    const wxOutputStream& GetOutputStream() const { return m_output; }
+
     void SetMode( wxEOL mode = wxEOL_NATIVE );
     wxEOL GetMode() { return m_mode; }
 
diff --git a/Externals/wxWidgets3/include/wx/weakref.h b/Externals/wxWidgets3/include/wx/weakref.h
index 2e9c435280..496d90cb29 100644
--- a/Externals/wxWidgets3/include/wx/weakref.h
+++ b/Externals/wxWidgets3/include/wx/weakref.h
@@ -3,7 +3,7 @@
 // Purpose:     wxWeakRef - Generic weak references for wxWidgets
 // Author:      Arne Steinarson
 // Created:     27 Dec 07
-// RCS-ID:      $Id: weakref.h 66780 2011-01-27 11:00:26Z SC $
+// RCS-ID:      $Id: weakref.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@
 // Some compilers (VC6, Borland, g++ < 3.3) have problem with template specialization.
 // However, this is only used for optimization purposes (a smaller wxWeakRef pointer)
 // (and the corner case of wxWeakRef<wxObject>). So for those compilers, we can fall
-// back to the non-optimal case, where we use a the same type of weak ref (static one)
+// back to the non-optimal case, where we use the same type of weak ref (static one)
 // in all cases. See defs.h for various setting these defines depending on compiler.
 
 #if !defined(HAVE_PARTIAL_SPECIALIZATION) || \
diff --git a/Externals/wxWidgets3/include/wx/window.h b/Externals/wxWidgets3/include/wx/window.h
index d1d2b5155b..e108fac563 100644
--- a/Externals/wxWidgets3/include/wx/window.h
+++ b/Externals/wxWidgets3/include/wx/window.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Ron Lee
 // Created:     01/02/97
-// RCS-ID:      $Id: window.h 66862 2011-02-08 13:36:13Z VZ $
+// RCS-ID:      $Id: window.h 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -408,7 +408,7 @@ public:
     void Centre(int dir = wxBOTH) { DoCentre(dir); }
     void Center(int dir = wxBOTH) { DoCentre(dir); }
 
-        // centre with respect to the the parent window
+        // centre with respect to the parent window
     void CentreOnParent(int dir = wxBOTH) { DoCentre(dir); }
     void CenterOnParent(int dir = wxBOTH) { CentreOnParent(dir); }
 
@@ -446,7 +446,7 @@ public:
 
 
         // Call these to override what GetBestSize() returns. This
-        // method is only virtual because it is overriden in wxTLW
+        // method is only virtual because it is overridden in wxTLW
         // as a different API for SetSizeHints().
     virtual void SetMinSize(const wxSize& minSize);
     virtual void SetMaxSize(const wxSize& maxSize);
@@ -1658,7 +1658,7 @@ protected:
     // (GetBorderSize() will be used to add them)
     virtual wxSize DoGetBestClientSize() const { return wxDefaultSize; }
 
-    // this is the virtual function to be overriden in any derived class which
+    // this is the virtual function to be overridden in any derived class which
     // wants to change how SetSize() or Move() works - it is called by all
     // versions of these functions in the base class
     virtual void DoSetSize(int x, int y,
diff --git a/Externals/wxWidgets3/src/aui/auibook.cpp b/Externals/wxWidgets3/src/aui/auibook.cpp
index bc109ddec5..5e6ef680ed 100644
--- a/Externals/wxWidgets3/src/aui/auibook.cpp
+++ b/Externals/wxWidgets3/src/aui/auibook.cpp
@@ -2931,7 +2931,7 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art)
 // specified tab ctrl height, overriding all other considerations,
 // such as text or bitmap height.  It overrides any call to
 // SetUniformBitmapSize().  Specifying a height of -1 reverts
-// any previous call and returns to the default behavior
+// any previous call and returns to the default behaviour
 
 void wxAuiNotebook::SetTabCtrlHeight(int height)
 {
diff --git a/Externals/wxWidgets3/src/aui/framemanager.cpp b/Externals/wxWidgets3/src/aui/framemanager.cpp
index 6ad1ed8171..a44db9ccd0 100644
--- a/Externals/wxWidgets3/src/aui/framemanager.cpp
+++ b/Externals/wxWidgets3/src/aui/framemanager.cpp
@@ -4,7 +4,7 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      $Id: framemanager.cpp 66796 2011-01-28 02:21:42Z BP $
+// RCS-ID:      $Id: framemanager.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -801,7 +801,7 @@ wxAuiManager* wxAuiManager::GetManager(wxWindow* window)
 
 void wxAuiManager::UpdateHintWindowConfig()
 {
-    // find out if the the system can do transparent frames
+    // find out if the system can do transparent frames
     bool can_do_transparent = false;
 
     wxWindow* w = m_frame;
@@ -3401,7 +3401,7 @@ void wxAuiManager::OnHintActivate(wxActivateEvent& WXUNUSED(event))
     // Do nothing so this event isn't handled in the base handlers.
 
     // Letting the hint window activate without this handler can lead to
-    // weird behavior on Mac where the menu is switched out to the top
+    // weird behaviour on Mac where the menu is switched out to the top
     // window's menu in MDI applications when it shouldn't be. So since
     // we don't want user interaction with the hint window anyway, we just
     // prevent it from activating here.
@@ -3434,7 +3434,7 @@ void wxAuiManager::StartPaneDrag(wxWindow* pane_window,
 // CalculateHintRect() calculates the drop hint rectangle.  The method
 // first calls DoDrop() to determine the exact position the pane would
 // be at were if dropped.  If the pane would indeed become docked at the
-// specified drop point, the the rectangle hint will be returned in
+// specified drop point, the rectangle hint will be returned in
 // screen coordinates.  Otherwise, an empty rectangle is returned.
 // |pane_window| is the window pointer of the pane being dragged, |pt| is
 // the mouse position, in client coordinates.  |offset| describes the offset
@@ -3851,7 +3851,7 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
 // Render() fire a render event, which is normally handled by
 // wxAuiManager::OnRender().  This allows the render function to
 // be overridden via the render event.  This can be useful for paintin
-// custom graphics in the main window. Default behavior can be
+// custom graphics in the main window. Default behaviour can be
 // invoked in the overridden function by calling OnRender()
 
 void wxAuiManager::Render(wxDC* dc)
diff --git a/Externals/wxWidgets3/src/common/any.cpp b/Externals/wxWidgets3/src/common/any.cpp
index dc6d60bcd0..f391a5f98a 100644
--- a/Externals/wxWidgets3/src/common/any.cpp
+++ b/Externals/wxWidgets3/src/common/any.cpp
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     07/05/2009
-// RCS-ID:      $Id: any.cpp 66630 2011-01-07 17:49:18Z SC $
+// RCS-ID:      $Id: any.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -152,7 +152,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
         if ( any.GetAs(&ll) )
         {
             // NB: Do not use LONG_MAX here. Explicitly using 32-bit
-            //     integer constraint yields more consistent behavior across
+            //     integer constraint yields more consistent behaviour across
             //     builds.
             if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
                 *variant = wxLongLong(ll);
diff --git a/Externals/wxWidgets3/src/common/combocmn.cpp b/Externals/wxWidgets3/src/common/combocmn.cpp
index 67f9506c37..70564bfbf3 100644
--- a/Externals/wxWidgets3/src/common/combocmn.cpp
+++ b/Externals/wxWidgets3/src/common/combocmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combocmn.cpp 67256 2011-03-20 11:15:17Z JMS $
+// RCS-ID:      $Id: combocmn.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -160,7 +160,7 @@ wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
 #endif
 
 // NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a
-//     'perfect' popup, as it can succesfully host child controls even in
+//     'perfect' popup, as it can successfully host child controls even in
 //     popups that are shown in modal dialogs.
 
 #define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
@@ -1647,28 +1647,29 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
     if ( !enabled )
         drawState |= wxCONTROL_DISABLED;
 
+    // Need to clear button background even if m_btn is present
+    // and also when using custom bitmap for the button
+    if ( (flags & Button_PaintBackground) &&
+            (!HasTransparentBackground() ||
+             !(m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE)) )
+    {
+        wxColour bgCol;
+
+        if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
+            bgCol = GetParent()->GetBackgroundColour();
+        else
+            bgCol = GetBackgroundColour();
+
+        dc.SetBrush(bgCol);
+        dc.SetPen(bgCol);
+        dc.DrawRectangle(rect);
+    }
+
     if ( !m_bmpNormal.Ok() )
     {
         if ( flags & Button_BitmapOnly )
             return;
 
-        // Need to clear button background even if m_btn is present
-        if ( (flags & Button_PaintBackground) &&
-                (!HasTransparentBackground() ||
-                 !(m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE)) )
-        {
-            wxColour bgCol;
-
-            if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
-                bgCol = GetParent()->GetBackgroundColour();
-            else
-                bgCol = GetBackgroundColour();
-
-            dc.SetBrush(bgCol);
-            dc.SetPen(bgCol);
-            dc.DrawRectangle(rect);
-        }
-
         // Draw standard button
         wxRendererNative::Get().DrawComboBoxDropButton(this,
                                                        dc,
@@ -1692,17 +1693,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
 
         if ( m_blankButtonBg )
         {
-            // If using blank button background, we need to clear its background
-            // with button face colour instead of colour for rest of the control.
-            if ( flags & Button_PaintBackground )
-            {
-                wxColour bgCol = GetParent()->GetBackgroundColour(); //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
-                //wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-                dc.SetPen(bgCol);
-                dc.SetBrush(bgCol);
-                dc.DrawRectangle(rect);
-            }
-
             if ( !(flags & Button_BitmapOnly) )
             {
                 wxRendererNative::Get().DrawPushButton(this,
@@ -1711,14 +1701,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
                                                        drawState);
             }
         }
-        else
-
-        {
-            // Need to clear button background even if m_btn is present
-            // (assume non-button background was cleared just before this call so brushes are good)
-            if ( flags & Button_PaintBackground )
-                dc.DrawRectangle(rect);
-        }
 
         // Draw bitmap centered in drawRect
         dc.DrawBitmap(*pBmp,
@@ -2663,7 +2645,7 @@ void wxComboCtrlBase::OnSetValue(const wxString& value)
         bool found = true;
         wxString trueValue = value;
 
-        // Conform to wxComboBox behavior: read-only control can only accept
+        // Conform to wxComboBox behaviour: read-only control can only accept
         // valid list items and empty string
         if ( m_popupInterface && HasFlag(wxCB_READONLY) && value.length() )
         {
diff --git a/Externals/wxWidgets3/src/common/dcgraph.cpp b/Externals/wxWidgets3/src/common/dcgraph.cpp
index 7ea53732e6..6d65764510 100644
--- a/Externals/wxWidgets3/src/common/dcgraph.cpp
+++ b/Externals/wxWidgets3/src/common/dcgraph.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:
-// RCS-ID:      $Id: dcgraph.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: dcgraph.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -341,7 +341,7 @@ void wxGCDCImpl::DestroyClippingRegion()
 {
     m_graphicContext->ResetClip();
     // currently the clip eg of a window extends to the area between the scrollbars
-    // so we must explicitely make sure it only covers the area we want it to draw
+    // so we must explicitly make sure it only covers the area we want it to draw
     int width, height ;
     GetOwner()->GetSize( &width , &height ) ;
     m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
diff --git a/Externals/wxWidgets3/src/common/descrip.mms b/Externals/wxWidgets3/src/common/descrip.mms
index d5ae55630d..b1141822d7 100644
--- a/Externals/wxWidgets3/src/common/descrip.mms
+++ b/Externals/wxWidgets3/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 28 January 2011                                                     *
+# Date : 21 March 2011                                                       *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -222,7 +222,7 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
 		statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\
 		statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\
 		spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\
-		valnum.obj,numformatter.obj
+		valnum.obj,numformatter.obj,markupparser.obj
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
@@ -699,3 +699,4 @@ colourdata.obj : colourdata.cpp
 fontdata.obj : fontdata.cpp
 valnum.obj : valnum.cpp
 numformatter.obj : numformatter.cpp
+markupparser.obj : markupparser.cpp
diff --git a/Externals/wxWidgets3/src/common/docview.cpp b/Externals/wxWidgets3/src/common/docview.cpp
index 898e0fa5e8..168cba6422 100644
--- a/Externals/wxWidgets3/src/common/docview.cpp
+++ b/Externals/wxWidgets3/src/common/docview.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin
 // Created:     01/02/97
-// RCS-ID:      $Id: docview.cpp 66852 2011-02-06 01:01:09Z VZ $
+// RCS-ID:      $Id: docview.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -425,7 +425,7 @@ bool wxDocument::Revert()
 #if WXWIN_COMPATIBILITY_2_8
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
-    // this function can not only be overridden by the user code but also
+    // this function cannot only be overridden by the user code but also
     // called by it so we need to ensure that we return the same thing as
     // GetUserReadableName() but we can't call it because this would result in
     // an infinite recursion, hence we use the helper DoGetUserReadableName()
diff --git a/Externals/wxWidgets3/src/common/event.cpp b/Externals/wxWidgets3/src/common/event.cpp
index 8a723dea60..496e2caa85 100644
--- a/Externals/wxWidgets3/src/common/event.cpp
+++ b/Externals/wxWidgets3/src/common/event.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: event.cpp 65521 2010-09-11 10:18:41Z VZ $
+// RCS-ID:      $Id: event.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -959,7 +959,7 @@ void wxEventHashTable::InitHashTable()
         table = table->baseTable;
     }
 
-    // Lets free some memory.
+    // Let's free some memory.
     size_t i;
     for(i = 0; i < m_size; i++)
     {
diff --git a/Externals/wxWidgets3/src/common/fileconf.cpp b/Externals/wxWidgets3/src/common/fileconf.cpp
index f663b3601d..1ad679ce70 100644
--- a/Externals/wxWidgets3/src/common/fileconf.cpp
+++ b/Externals/wxWidgets3/src/common/fileconf.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.cpp)
-// RCS-ID:      $Id: fileconf.cpp 65209 2010-08-08 11:35:49Z VZ $
+// RCS-ID:      $Id: fileconf.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1997 Karsten Ballueder  &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
@@ -146,7 +146,7 @@ private:
 
   wxString      m_strName,      // entry name
                 m_strValue;     //       value
-  bool          m_bImmutable:1, // can be overriden locally?
+  bool          m_bImmutable:1, // can be overridden locally?
                 m_bHasValue:1;  // set after first call to SetValue()
 
   int           m_nLine;        // used if m_pLine == NULL only
diff --git a/Externals/wxWidgets3/src/common/filefn.cpp b/Externals/wxWidgets3/src/common/filefn.cpp
index 93bf902c0d..eb4b401eb8 100644
--- a/Externals/wxWidgets3/src/common/filefn.cpp
+++ b/Externals/wxWidgets3/src/common/filefn.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: filefn.cpp 66996 2011-02-22 13:26:06Z VZ $
+// RCS-ID:      $Id: filefn.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1345,7 +1345,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags)
 
     if ( !gs_dir->IsOpened() )
     {
-        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        wxLogSysError(_("Cannot enumerate files '%s'"), spec);
         return wxEmptyString;
     }
 
diff --git a/Externals/wxWidgets3/src/common/fontcmn.cpp b/Externals/wxWidgets3/src/common/fontcmn.cpp
index 7791069dbc..df3b3e8db0 100644
--- a/Externals/wxWidgets3/src/common/fontcmn.cpp
+++ b/Externals/wxWidgets3/src/common/fontcmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99
-// RCS-ID:      $Id: fontcmn.cpp 67052 2011-02-27 12:47:05Z VZ $
+// RCS-ID:      $Id: fontcmn.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1020,7 +1020,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
                 SetFamily(family);
             }
             // NB: the check on the facename is implemented in wxFontBase::SetFaceName
-            //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
+            //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitly
             //     call here wxFontEnumerator::IsValidFacename
             else if (
 #if wxUSE_FONTENUM
@@ -1039,7 +1039,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
     if ( !face.empty() )
     {
         // NB: the check on the facename is implemented in wxFontBase::SetFaceName
-        //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
+        //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitly
         //     call here wxFontEnumerator::IsValidFacename
         if (
 #if wxUSE_FONTENUM
diff --git a/Externals/wxWidgets3/src/common/ftp.cpp b/Externals/wxWidgets3/src/common/ftp.cpp
index ad434ce884..8bd4cb21eb 100644
--- a/Externals/wxWidgets3/src/common/ftp.cpp
+++ b/Externals/wxWidgets3/src/common/ftp.cpp
@@ -9,7 +9,7 @@
 //              robust Abort(), support for arbitrary FTP commands, ...)
 //              Randall Fox (support for active mode)
 // Created:     07/07/1997
-// RCS-ID:      $Id: ftp.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: ftp.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 //              (c) 1998-2004 wxWidgets team
 // Licence:     wxWindows licence
@@ -686,7 +686,7 @@ public:
 
         // when checking the result, the stream will
         // almost always show an error, even if the file was
-        // properly transfered, thus, lets just grab the result
+        // properly transfered, thus, let's just grab the result
 
         // we are looking for "226 transfer completed"
         char code = m_ftp->GetResult();
diff --git a/Externals/wxWidgets3/src/common/imagpng.cpp b/Externals/wxWidgets3/src/common/imagpng.cpp
index 2dc8a51067..6a0c86b224 100644
--- a/Externals/wxWidgets3/src/common/imagpng.cpp
+++ b/Externals/wxWidgets3/src/common/imagpng.cpp
@@ -2,7 +2,7 @@
 // Name:        src/common/imagpng.cpp
 // Purpose:     wxImage PNG handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id: imagpng.cpp 67219 2011-03-16 12:46:03Z DS $
+// RCS-ID:      $Id: imagpng.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -43,7 +43,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
-// image can not have any transparent pixels at all, have only 100% opaque
+// image cannot have any transparent pixels at all, have only 100% opaque
 // and/or 100% transparent pixels in which case a simple mask is enough to
 // store this information in wxImage or have a real alpha channel in which case
 // we need to have it in wxImage as well
diff --git a/Externals/wxWidgets3/src/common/imagtiff.cpp b/Externals/wxWidgets3/src/common/imagtiff.cpp
index 70122ad7db..3f62a07948 100644
--- a/Externals/wxWidgets3/src/common/imagtiff.cpp
+++ b/Externals/wxWidgets3/src/common/imagtiff.cpp
@@ -2,7 +2,7 @@
 // Name:        src/common/imagtiff.cpp
 // Purpose:     wxImage TIFF handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id: imagtiff.cpp 66717 2011-01-19 13:47:18Z DS $
+// RCS-ID:      $Id: imagtiff.cpp 67264 2011-03-20 19:48:03Z DS $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -402,42 +402,78 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
             alpha -= 2*w;
     }
 
-    // set the image resolution if it's available
-    uint16 tiffRes;
-    if ( TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT, &tiffRes) )
+
+    uint16 spp, bpp, compression;
+    /*
+    Read some baseline TIFF tags which helps when re-saving a TIFF
+    to be similar to the original image.
+    */
+    if ( TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &spp) )
     {
-        wxImageResolution res;
-        switch ( tiffRes )
+        image->SetOption(wxIMAGE_OPTION_SAMPLESPERPIXEL, spp);
+    }
+
+    if ( TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bpp) )
+    {
+        image->SetOption(wxIMAGE_OPTION_BITSPERSAMPLE, bpp);
+    }
+
+    if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) )
+    {
+        image->SetOption(wxIMAGE_OPTION_COMPRESSION, compression);
+    }
+
+    // Set the resolution unit.
+    wxImageResolution resUnit = wxIMAGE_RESOLUTION_NONE;
+    uint16 tiffRes;
+    if ( TIFFGetFieldDefaulted(tif, TIFFTAG_RESOLUTIONUNIT, &tiffRes) )
+    {
+        switch (tiffRes)
         {
             default:
                 wxLogWarning(_("Unknown TIFF resolution unit %d ignored"),
-                             tiffRes);
+                    tiffRes);
                 // fall through
 
             case RESUNIT_NONE:
-                res = wxIMAGE_RESOLUTION_NONE;
+                resUnit = wxIMAGE_RESOLUTION_NONE;
                 break;
 
             case RESUNIT_INCH:
-                res = wxIMAGE_RESOLUTION_INCHES;
+                resUnit = wxIMAGE_RESOLUTION_INCHES;
                 break;
 
             case RESUNIT_CENTIMETER:
-                res = wxIMAGE_RESOLUTION_CM;
+                resUnit = wxIMAGE_RESOLUTION_CM;
                 break;
         }
-
-        if ( res != wxIMAGE_RESOLUTION_NONE )
-        {
-            float xres, yres;
-            if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres) )
-                image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, wxRound(xres));
-
-            if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres) )
-                image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, wxRound(yres));
-        }
     }
 
+    image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, resUnit);
+
+    /*
+    Set the image resolution if it's available. Resolution tag is not
+    dependant on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
+    */
+    float resX, resY;
+
+    if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &resX) )
+    {
+        /*
+        Use a string value to not lose precision.
+        rounding to int as cm and then converting to inch may
+        result in whole integer rounding error, eg. 201 instead of 200 dpi.
+        If an app wants an int, GetOptionInt will convert and round down.
+        */
+        image->SetOption(wxIMAGE_OPTION_RESOLUTIONX,
+            wxString::FromCDouble((double) resX));
+    }
+
+    if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &resY) )
+    {
+        image->SetOption(wxIMAGE_OPTION_RESOLUTIONY,
+            wxString::FromCDouble((double) resY));
+    }
 
     _TIFFfree( raster );
 
diff --git a/Externals/wxWidgets3/src/common/intl.cpp b/Externals/wxWidgets3/src/common/intl.cpp
index 58eae5ab79..dc3d1ca154 100644
--- a/Externals/wxWidgets3/src/common/intl.cpp
+++ b/Externals/wxWidgets3/src/common/intl.cpp
@@ -5,7 +5,7 @@
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - PluralForms support)
 // Created:     29/01/98
-// RCS-ID:      $Id: intl.cpp 66002 2010-11-03 16:29:13Z VZ $
+// RCS-ID:      $Id: intl.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -293,7 +293,7 @@ bool wxLocale::DoInit(const wxString& name,
 
     if ( m_pszOldLocale == NULL )
     {
-        wxLogError(_("locale '%s' can not be set."), szLocale);
+        wxLogError(_("locale '%s' cannot be set."), szLocale);
     }
 
     // the short name will be used to look for catalog files as well,
diff --git a/Externals/wxWidgets3/src/common/log.cpp b/Externals/wxWidgets3/src/common/log.cpp
index 039cbeaedc..0a3ae3d03a 100644
--- a/Externals/wxWidgets3/src/common/log.cpp
+++ b/Externals/wxWidgets3/src/common/log.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: log.cpp 65956 2010-10-30 23:50:28Z VZ $
+// RCS-ID:      $Id: log.cpp 67268 2011-03-21 10:59:59Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -676,16 +676,8 @@ void wxLog::TimeStamp(wxString *str)
 #if wxUSE_DATETIME
     if ( !ms_timestamp.empty() )
     {
-        wxChar buf[256];
-        time_t timeNow;
-        (void)time(&timeNow);
-
-        struct tm tm;
-        wxStrftime(buf, WXSIZEOF(buf),
-                    ms_timestamp, wxLocaltime_r(&timeNow, &tm));
-
-        str->Empty();
-        *str << buf << wxS(": ");
+        *str = wxDateTime::UNow().Format(ms_timestamp);
+        *str += wxS(": ");
     }
 #endif // wxUSE_DATETIME
 }
diff --git a/Externals/wxWidgets3/src/common/sizer.cpp b/Externals/wxWidgets3/src/common/sizer.cpp
index 0a40e199d9..5858c1218f 100644
--- a/Externals/wxWidgets3/src/common/sizer.cpp
+++ b/Externals/wxWidgets3/src/common/sizer.cpp
@@ -5,7 +5,7 @@
 //              Dirk Holtwick, Ron Lee
 // Modified by: Ron Lee
 // Created:
-// RCS-ID:      $Id: sizer.cpp 67029 2011-02-26 15:44:14Z SC $
+// RCS-ID:      $Id: sizer.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Robin Dunn, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -2093,7 +2093,7 @@ void wxBoxSizer::RecalcSizes()
 
     // Check for the degenerated case when we don't have enough space for even
     // the min sizes of all the items: in this case we really can't do much
-    // more than to to allocate the min size to as many of fixed size items as
+    // more than to allocate the min size to as many of fixed size items as
     // possible (on the assumption that variable size items such as text zones
     // or list boxes may use scrollbars to show their content even if their
     // size is less than min size but that fixed size items such as buttons
diff --git a/Externals/wxWidgets3/src/common/string.cpp b/Externals/wxWidgets3/src/common/string.cpp
index 833e1c13dd..f232d4aff4 100644
--- a/Externals/wxWidgets3/src/common/string.cpp
+++ b/Externals/wxWidgets3/src/common/string.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin, Ryan Norton
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id: string.cpp 67181 2011-03-13 13:53:54Z VZ $
+// RCS-ID:      $Id: string.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //              (c) 2004 Ryan Norton <wxprojects@comcast.net>
 // Licence:     wxWindows licence
@@ -2008,16 +2008,16 @@ int wxString::DoPrintfUtf8(const char *format, ...)
     Since EILSEQ and EINVAL are rather common but EOVERFLOW is not and since
     EILSEQ and EINVAL are specifically defined to mean the error is other than
     an undersized buffer and no other errno are defined we treat those two
-    as meaning hard errors and everything else gets the old behavior which
+    as meaning hard errors and everything else gets the old behaviour which
     is to keep looping and increasing buffer size until the function succeeds.
 
-    In practice it's impossible to determine before compilation which behavior
-    may be used.  The vswprintf function may have vsnprintf-like behavior or
-    vice-versa.  Behavior detected on one release can theoretically change
+    In practice it's impossible to determine before compilation which behaviour
+    may be used.  The vswprintf function may have vsnprintf-like behaviour or
+    vice-versa.  Behaviour detected on one release can theoretically change
     with an updated release.  Not to mention that configure testing for it
     would require the test to be run on the host system, not the build system
     which makes cross compilation difficult. Therefore, we make no assumptions
-    about behavior and try our best to handle every known case, including the
+    about behaviour and try our best to handle every known case, including the
     case where wxVsnprintf returns a negative number and fails to set errno.
 
     There is yet one more non-standard implementation and that is our own.
@@ -2028,9 +2028,9 @@ int wxString::DoPrintfUtf8(const char *format, ...)
     at the given buffer size minus 1.  It is supposed to do this even if it
     turns out that the buffer is sized too small.
 
-    Darwin (tested on 10.5) follows the C99 behavior exactly.
+    Darwin (tested on 10.5) follows the C99 behaviour exactly.
 
-    Glibc 2.6 almost follows the C99 behavior except vswprintf never sets
+    Glibc 2.6 almost follows the C99 behaviour except vswprintf never sets
     errno even when it fails.  However, it only seems to ever fail due
     to an undersized buffer.
 */
diff --git a/Externals/wxWidgets3/src/common/sysopt.cpp b/Externals/wxWidgets3/src/common/sysopt.cpp
index 3b947b9a74..b7f14a1659 100644
--- a/Externals/wxWidgets3/src/common/sysopt.cpp
+++ b/Externals/wxWidgets3/src/common/sysopt.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-07-10
-// RCS-ID:      $Id: sysopt.cpp 64651 2010-06-20 17:43:15Z VZ $
+// RCS-ID:      $Id: sysopt.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ wxString wxSystemOptions::GetOption(const wxString& name)
     {
         val = gs_optionValues[idx];
     }
-    else // not set explicitely
+    else // not set explicitly
     {
         // look in the environment: first for a variable named "wx_appname_name"
         // which can be set to affect the behaviour or just this application
diff --git a/Externals/wxWidgets3/src/common/translation.cpp b/Externals/wxWidgets3/src/common/translation.cpp
index 3c4150e42b..a278f8aa3e 100644
--- a/Externals/wxWidgets3/src/common/translation.cpp
+++ b/Externals/wxWidgets3/src/common/translation.cpp
@@ -5,7 +5,7 @@
 //              Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - PluralForms support)
 // Created:     2010-04-23
-// RCS-ID:      $Id: translation.cpp 66728 2011-01-22 14:38:36Z DS $
+// RCS-ID:      $Id: translation.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -904,7 +904,7 @@ bool wxMsgCatalogFile::LoadFile(const wxString& filename,
     if ( !fileMsg.IsOpened() )
         return false;
 
-    // get the file size (assume it is less than 4Gb...)
+    // get the file size (assume it is less than 4GB...)
     wxFileOffset lenFile = fileMsg.Length();
     if ( lenFile == wxInvalidOffset )
         return false;
diff --git a/Externals/wxWidgets3/src/common/wincmn.cpp b/Externals/wxWidgets3/src/common/wincmn.cpp
index 8714550a7a..693af6563b 100644
--- a/Externals/wxWidgets3/src/common/wincmn.cpp
+++ b/Externals/wxWidgets3/src/common/wincmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     13/07/98
-// RCS-ID:      $Id: wincmn.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: wincmn.cpp 67285 2011-03-22 17:15:38Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1064,7 +1064,7 @@ void wxWindowBase::SendSizeEvent(int flags)
     wxSizeEvent event(GetSize(), GetId());
     event.SetEventObject(this);
     if ( flags & wxSEND_EVENT_POST )
-        wxPostEvent(this, event);
+        wxPostEvent(GetEventHandler(), event);
     else
         HandleWindowEvent(event);
 }
diff --git a/Externals/wxWidgets3/src/common/zipstrm.cpp b/Externals/wxWidgets3/src/common/zipstrm.cpp
index 7d95ec9fcf..a42686d6f8 100644
--- a/Externals/wxWidgets3/src/common/zipstrm.cpp
+++ b/Externals/wxWidgets3/src/common/zipstrm.cpp
@@ -2,7 +2,7 @@
 // Name:        src/common/zipstrm.cpp
 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
-// RCS-ID:      $Id: zipstrm.cpp 61508 2009-07-23 20:30:22Z VZ $
+// RCS-ID:      $Id: zipstrm.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1773,7 +1773,7 @@ bool wxZipInputStream::OpenDecompressor(bool raw /*=false*/)
     return IsOk();
 }
 
-// Can be overriden to add support for additional decompression methods
+// Can be overridden to add support for additional decompression methods
 //
 wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream)
 {
@@ -2128,7 +2128,7 @@ bool wxZipOutputStream::DoCreate(wxZipEntry *entry, bool raw /*=false*/)
     return true;
 }
 
-// Can be overriden to add support for additional compression methods
+// Can be overridden to add support for additional compression methods
 //
 wxOutputStream *wxZipOutputStream::OpenCompressor(
     wxOutputStream& stream,
diff --git a/Externals/wxWidgets3/src/generic/animateg.cpp b/Externals/wxWidgets3/src/generic/animateg.cpp
index 55ccde1778..da8256b384 100644
--- a/Externals/wxWidgets3/src/generic/animateg.cpp
+++ b/Externals/wxWidgets3/src/generic/animateg.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart and Guillermo Rodriguez Garcia
 // Modified by: Francesco Montorsi
 // Created:     13/8/99
-// RCS-ID:      $Id: animateg.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: animateg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -504,7 +504,7 @@ void wxAnimationCtrl::IncrementalUpdateBackingStore()
 
         case wxANIM_TOPREVIOUS:
             // this disposal should never be used too often.
-            // E.g. GIF specification explicitely say to keep the usage of this
+            // E.g. GIF specification explicitly say to keep the usage of this
             //      disposal limited to the minimum.
             // In fact it may require a lot of time to restore
             if (m_currentFrame == 1)
@@ -627,7 +627,7 @@ void wxAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     if ( m_backingStore.IsOk() )
     {
-        // NOTE: we draw the bitmap explicitely ignoring the mask (if any);
+        // NOTE: we draw the bitmap explicitly ignoring the mask (if any);
         //       i.e. we don't want to combine the backing store with the
         //       possibly wrong preexisting contents of the window!
         dc.DrawBitmap(m_backingStore, 0, 0, false /* no mask */);
diff --git a/Externals/wxWidgets3/src/generic/clrpickerg.cpp b/Externals/wxWidgets3/src/generic/clrpickerg.cpp
index 5fb706672a..a37b213f73 100644
--- a/Externals/wxWidgets3/src/generic/clrpickerg.cpp
+++ b/Externals/wxWidgets3/src/generic/clrpickerg.cpp
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: clrpickerg.cpp 52836 2008-03-26 15:49:31Z JS $
+// RCS-ID:      $Id: clrpickerg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ void wxGenericColourButton::InitColourData()
 
 void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
-    // update the wxColouData to be shown in the the dialog
+    // update the wxColouData to be shown in the dialog
     ms_data.SetColour(m_colour);
 
     // create the colour dialog and display it
diff --git a/Externals/wxWidgets3/src/generic/collpaneg.cpp b/Externals/wxWidgets3/src/generic/collpaneg.cpp
index a463d27090..f3ea4135f5 100644
--- a/Externals/wxWidgets3/src/generic/collpaneg.cpp
+++ b/Externals/wxWidgets3/src/generic/collpaneg.cpp
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     8/10/2006
-// Id:          $Id: collpaneg.cpp 62431 2009-10-16 16:25:43Z VZ $
+// Id:          $Id: collpaneg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -168,7 +168,7 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 
     if (this->HasFlag(wxCP_NO_TLW_RESIZE))
     {
-        // the user asked to explicitely handle the resizing itself...
+        // the user asked to explicitly handle the resizing itself...
         return;
     }
 
diff --git a/Externals/wxWidgets3/src/generic/descrip.mms b/Externals/wxWidgets3/src/generic/descrip.mms
index 0dfdda9a51..b8365be853 100644
--- a/Externals/wxWidgets3/src/generic/descrip.mms
+++ b/Externals/wxWidgets3/src/generic/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 15 December 2010                                                    *
+# Date : 21 March 2011                                                       *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -94,7 +94,8 @@ OBJECTS = \
 		filectrlg.obj,srchctlg.obj,notifmsgg.obj,headerctrlg.obj,\
 		grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
 		editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
-		richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj
+		richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\
+		markuptext.obj
 
 SOURCES = \
 		aboutdlgg.cpp,\
@@ -166,7 +167,7 @@ SOURCES = \
 		icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp\
 		,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
 		datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
-		commandlinkbuttong.cpp,spinctlg.cpp
+		commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp
 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
@@ -302,3 +303,4 @@ dragimgg.obj : dragimgg.cpp
 richmsgdlgg.obj : richmsgdlgg.cpp
 commandlinkbuttong.obj : commandlinkbuttong.cpp
 spinctlg.obj : spinctlg.cpp
+markuptext.obj : markuptext.cpp
diff --git a/Externals/wxWidgets3/src/generic/fontpickerg.cpp b/Externals/wxWidgets3/src/generic/fontpickerg.cpp
index e9e7fa2324..a1a61c0062 100644
--- a/Externals/wxWidgets3/src/generic/fontpickerg.cpp
+++ b/Externals/wxWidgets3/src/generic/fontpickerg.cpp
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id: fontpickerg.cpp 63945 2010-04-12 00:37:02Z VZ $
+// RCS-ID:      $Id: fontpickerg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -79,7 +79,7 @@ void wxGenericFontButton::InitFontData()
 
 void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
-    // update the wxFontData to be shown in the the dialog
+    // update the wxFontData to be shown in the dialog
     m_data.SetInitialFont(m_selectedFont);
 
     // create the font dialog and display it
diff --git a/Externals/wxWidgets3/src/generic/grid.cpp b/Externals/wxWidgets3/src/generic/grid.cpp
index 7f34e916ad..b335b1f755 100644
--- a/Externals/wxWidgets3/src/generic/grid.cpp
+++ b/Externals/wxWidgets3/src/generic/grid.cpp
@@ -4,7 +4,7 @@
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
 // Created:     1/08/1999
-// RCS-ID:      $Id: grid.cpp 66792 2011-01-27 18:35:01Z SC $
+// RCS-ID:      $Id: grid.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Michael Bedward (mbedward@ozemail.com.au)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -6918,7 +6918,7 @@ void wxGrid::SetCellHighlightPenWidth(int width)
         m_cellHighlightPenWidth = width;
 
         // Just redrawing the cell highlight is not enough since that won't
-        // make any visible change if the the thickness is getting smaller.
+        // make any visible change if the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
         if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
@@ -6936,7 +6936,7 @@ void wxGrid::SetCellHighlightROPenWidth(int width)
         m_cellHighlightROPenWidth = width;
 
         // Just redrawing the cell highlight is not enough since that won't
-        // make any visible change if the the thickness is getting smaller.
+        // make any visible change if the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
         if ( row == -1 || col == -1 ||
diff --git a/Externals/wxWidgets3/src/generic/imaglist.cpp b/Externals/wxWidgets3/src/generic/imaglist.cpp
index 7cd568a700..60fd71eae2 100644
--- a/Externals/wxWidgets3/src/generic/imaglist.cpp
+++ b/Externals/wxWidgets3/src/generic/imaglist.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: imaglist.cpp 61508 2009-07-23 20:30:22Z VZ $
+// Id:          $Id: imaglist.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
     }
     else
     {
-        // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
+        // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added
         // bitmap into sub-images of the correct size
         if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
         {
diff --git a/Externals/wxWidgets3/src/generic/listctrl.cpp b/Externals/wxWidgets3/src/generic/listctrl.cpp
index 2e66a25fa5..97cb983eb9 100644
--- a/Externals/wxWidgets3/src/generic/listctrl.cpp
+++ b/Externals/wxWidgets3/src/generic/listctrl.cpp
@@ -3,7 +3,7 @@
 // Purpose:     generic implementation of wxListCtrl
 // Author:      Robert Roebling
 //              Vadim Zeitlin (virtual list control support)
-// Id:          $Id: listctrl.cpp 67018 2011-02-25 09:38:35Z JS $
+// Id:          $Id: listctrl.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1046,7 +1046,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
 // NB: The code below is not really Mac-specific, but since we are close
 // to 2.8 release and I don't have time to test on other platforms, I
-// defined this only for wxMac. If this behavior is desired on
+// defined this only for wxMac. If this behaviour is desired on
 // other platforms, please go ahead and revise or remove the #ifdef.
 #ifdef __WXMAC__
         if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) &&
diff --git a/Externals/wxWidgets3/src/generic/splitter.cpp b/Externals/wxWidgets3/src/generic/splitter.cpp
index 5a501deb8a..9af2f66b4e 100644
--- a/Externals/wxWidgets3/src/generic/splitter.cpp
+++ b/Externals/wxWidgets3/src/generic/splitter.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: splitter.cpp 66232 2010-11-22 01:23:16Z VZ $
+// RCS-ID:      $Id: splitter.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -741,7 +741,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
         return false;
 
     wxCHECK_MSG( window1 && window2, false,
-                 wxT("can not split with NULL window(s)") );
+                 wxT("cannot split with NULL window(s)") );
 
     wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false,
                   wxT("windows in the splitter should have it as parent!") );
diff --git a/Externals/wxWidgets3/src/generic/statusbr.cpp b/Externals/wxWidgets3/src/generic/statusbr.cpp
index 90eaf4b7a3..7031967e24 100644
--- a/Externals/wxWidgets3/src/generic/statusbr.cpp
+++ b/Externals/wxWidgets3/src/generic/statusbr.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:     01/02/97
-// RCS-ID:      $Id: statusbr.cpp 62432 2009-10-16 21:32:51Z VZ $
+// RCS-ID:      $Id: statusbr.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -345,7 +345,7 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const
     if (m_widthsAbs.IsEmpty())
         return wxNOT_FOUND;
 
-    // NOTE: we explicitely don't take in count the borders since they are only
+    // NOTE: we explicitly don't take in count the borders since they are only
     //       useful when rendering the status text, not for hit-test computations
 
     if (pt.y <= 0 || pt.y >= m_lastClientHeight)
diff --git a/Externals/wxWidgets3/src/generic/timer.cpp b/Externals/wxWidgets3/src/generic/timer.cpp
index b19e261d36..e7d67f9942 100644
--- a/Externals/wxWidgets3/src/generic/timer.cpp
+++ b/Externals/wxWidgets3/src/generic/timer.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
-// Id:          $Id: timer.cpp 64656 2010-06-20 18:18:23Z VZ $
+// Id:          $Id: timer.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -49,7 +49,7 @@
 
     #ifdef __DOS__
         // Under DOS the MGL timer has a 24hr period, so consider the 12 hours
-        // before y to be 'less' and the the 12 hours after 'greater' modulo
+        // before y to be 'less' and the 12 hours after 'greater' modulo
         // 24 hours.
         inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
         {
diff --git a/Externals/wxWidgets3/src/generic/treectlg.cpp b/Externals/wxWidgets3/src/generic/treectlg.cpp
index 96dc4a8960..72a6b5b8d0 100644
--- a/Externals/wxWidgets3/src/generic/treectlg.cpp
+++ b/Externals/wxWidgets3/src/generic/treectlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)
-// Id:          $Id: treectlg.cpp 67214 2011-03-16 07:22:56Z SC $
+// Id:          $Id: treectlg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -3699,7 +3699,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             event.Skip(!GetEventHandler()->ProcessEvent(nevent));
 
             // Consistent with MSW (for now), send the ITEM_MENU *after*
-            // the RIGHT_CLICK event. TODO: This behavior may change.
+            // the RIGHT_CLICK event. TODO: This behaviour may change.
             wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU,  this, item);
             nevent2.m_pointDrag = CalcScrolledPosition(pt);
             GetEventHandler()->ProcessEvent(nevent2);
diff --git a/Externals/wxWidgets3/src/generic/vscroll.cpp b/Externals/wxWidgets3/src/generic/vscroll.cpp
index 21c74fecd3..363e06b31c 100644
--- a/Externals/wxWidgets3/src/generic/vscroll.cpp
+++ b/Externals/wxWidgets3/src/generic/vscroll.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Brad Anderson, David Warkentin
 // Created:     30.05.03
-// RCS-ID:      $Id: vscroll.cpp 63761 2010-03-28 14:37:30Z VS $
+// RCS-ID:      $Id: vscroll.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -822,7 +822,7 @@ void wxVarHVScrollHelper::RefreshRowColumn(size_t row, size_t column)
         h_rect.x += OnGetColumnWidth(n);
     }
 
-    // refresh but specialize the behavior if we have a single target window
+    // refresh but specialize the behaviour if we have a single target window
     if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() )
     {
         v_rect.x = h_rect.x;
@@ -889,7 +889,7 @@ void wxVarHVScrollHelper::RefreshRowsColumns(size_t fromRow, size_t toRow,
         h_rect.width += OnGetColumnWidth(nBetween);
     }
 
-    // refresh but specialize the behavior if we have a single target window
+    // refresh but specialize the behaviour if we have a single target window
     if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() )
     {
         v_rect.x = h_rect.x;
diff --git a/Externals/wxWidgets3/src/generic/wizard.cpp b/Externals/wxWidgets3/src/generic/wizard.cpp
index 485a9b9c43..e4c8191d13 100644
--- a/Externals/wxWidgets3/src/generic/wizard.cpp
+++ b/Externals/wxWidgets3/src/generic/wizard.cpp
@@ -8,7 +8,7 @@
 //              3) Fixed ShowPage() bug on displaying bitmaps
 //              Robert Vazan (sizers)
 // Created:     15.08.99
-// RCS-ID:      $Id: wizard.cpp 66985 2011-02-20 18:18:51Z VS $
+// RCS-ID:      $Id: wizard.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -316,7 +316,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
     mainColumn->Add(
         m_sizerBmpAndPage,
         1, // Vertically stretchable
-        wxEXPAND // Horizonal stretching, no border
+        wxEXPAND // Horizontal stretching, no border
     );
     mainColumn->Add(0,5,
         0, // No vertical stretching
diff --git a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp b/Externals/wxWidgets3/src/gtk/aboutdlg.cpp
index 946bda6249..155ecf7859 100644
--- a/Externals/wxWidgets3/src/gtk/aboutdlg.cpp
+++ b/Externals/wxWidgets3/src/gtk/aboutdlg.cpp
@@ -3,7 +3,7 @@
 // Purpose:     native GTK+ wxAboutBox() implementation
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// RCS-ID:      $Id: aboutdlg.cpp 61508 2009-07-23 20:30:22Z VZ $
+// RCS-ID:      $Id: aboutdlg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -192,7 +192,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
                 transCredits << translators[n] << wxT('\n');
             }
         }
-        else // no translators explicitely specified
+        else // no translators explicitly specified
         {
             // maybe we have translator credits in the message catalog?
             wxString translator = _("translator-credits");
diff --git a/Externals/wxWidgets3/src/gtk/app.cpp b/Externals/wxWidgets3/src/gtk/app.cpp
index bd54ab4b54..6601f01bdb 100644
--- a/Externals/wxWidgets3/src/gtk/app.cpp
+++ b/Externals/wxWidgets3/src/gtk/app.cpp
@@ -2,7 +2,7 @@
 // Name:        src/gtk/app.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id: app.cpp 66120 2010-11-11 12:09:30Z VZ $
+// Id:          $Id: app.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -86,7 +86,7 @@ static void wx_add_idle_hooks()
         }
     }
     // "size_allocate" hook
-    // Needed to match the behavior of the old idle system,
+    // Needed to match the behaviour of the old idle system,
     // but probably not necessary.
     {
         static bool hook_installed;
@@ -125,7 +125,7 @@ bool wxApp::DoIdle()
 
 #if wxDEBUG_LEVEL
         // don't generate the idle events while the assert modal dialog is shown,
-        // this matches the behavior of wxMSW
+        // this matches the behaviour of wxMSW
         if (m_isInAssert)
             return false;
 #endif
@@ -439,7 +439,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         return false;
     }
 
-    // we can not enter threads before gtk_init is done
+    // we cannot enter threads before gtk_init is done
     gdk_threads_enter();
 
 #if wxUSE_INTL
diff --git a/Externals/wxWidgets3/src/gtk/collpane.cpp b/Externals/wxWidgets3/src/gtk/collpane.cpp
index d3e51c58f7..d3b31dc144 100644
--- a/Externals/wxWidgets3/src/gtk/collpane.cpp
+++ b/Externals/wxWidgets3/src/gtk/collpane.cpp
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     8/10/2006
-// Id:          $Id: collpane.cpp 65680 2010-09-30 11:44:45Z VZ $
+// Id:          $Id: collpane.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -104,7 +104,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
         wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
         p->HandleWindowEvent(ev);
 
-        // the user asked to explicitely handle the resizing itself...
+        // the user asked to explicitly handle the resizing itself...
         return;
     }
 
@@ -272,7 +272,7 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
     // is expanded or shrunk, the pane window won't be updated!
     m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y);
 
-    // we need to explicitely call m_pPane->Layout() or else it won't correctly relayout
+    // we need to explicitly call m_pPane->Layout() or else it won't correctly relayout
     // (even if SetAutoLayout(true) has been called on it!)
     m_pPane->Layout();
 }
diff --git a/Externals/wxWidgets3/src/gtk/print.cpp b/Externals/wxWidgets3/src/gtk/print.cpp
index ccdbbdfde3..7fada93d7f 100644
--- a/Externals/wxWidgets3/src/gtk/print.cpp
+++ b/Externals/wxWidgets3/src/gtk/print.cpp
@@ -3,7 +3,7 @@
 // Author:      Anthony Bretaudeau
 // Purpose:     GTK printing support
 // Created:     2007-08-25
-// RCS-ID:      $Id: print.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: print.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2007 wxWidgets development team
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -2213,7 +2213,7 @@ void wxGtkPrinterDCImpl::SetPrintData(const wxPrintData& data)
     m_printData = data;
 }
 
-// overriden for wxPrinterDC Impl
+// overridden for wxPrinterDC Impl
 
 wxRect wxGtkPrinterDCImpl::GetPaperRect() const
 {
diff --git a/Externals/wxWidgets3/src/gtk/renderer.cpp b/Externals/wxWidgets3/src/gtk/renderer.cpp
index 949b0437ec..a233bc14dc 100644
--- a/Externals/wxWidgets3/src/gtk/renderer.cpp
+++ b/Externals/wxWidgets3/src/gtk/renderer.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id: renderer.cpp 65947 2010-10-30 15:57:32Z VS $
+// RCS-ID:      $Id: renderer.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -632,7 +632,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
   );
 }
 
-// Draw the equivallent of a wxComboBox
+// Draw the equivalent of a wxComboBox
 void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
 {
     GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
diff --git a/Externals/wxWidgets3/src/gtk/window.cpp b/Externals/wxWidgets3/src/gtk/window.cpp
index 711d74791d..cc7ce677b6 100644
--- a/Externals/wxWidgets3/src/gtk/window.cpp
+++ b/Externals/wxWidgets3/src/gtk/window.cpp
@@ -2,7 +2,7 @@
 // Name:        src/gtk/window.cpp
 // Purpose:     wxWindowGTK implementation
 // Author:      Robert Roebling
-// Id:          $Id: window.cpp 67191 2011-03-14 11:55:01Z VZ $
+// Id:          $Id: window.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -3162,7 +3162,7 @@ void wxWindowGTK::SetFocus()
     // within its toplevel", i.e. returns true for one widget per TLW, not
     // globally) returns true immediately after grabbing focus,
     // GTK_WIDGET_HAS_FOCUS (which returns true only for the one widget that
-    // has focus at the moment) takes affect only after the window is shown
+    // has focus at the moment) takes effect only after the window is shown
     // (if it was hidden at the moment of the call) or at the next event loop
     // iteration.
     //
diff --git a/Externals/wxWidgets3/src/msw/app.cpp b/Externals/wxWidgets3/src/msw/app.cpp
index 53c8ce5344..fb9c474994 100644
--- a/Externals/wxWidgets3/src/msw/app.cpp
+++ b/Externals/wxWidgets3/src/msw/app.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: app.cpp 67185 2011-03-14 11:54:32Z VZ $
+// RCS-ID:      $Id: app.cpp 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -219,6 +219,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
     delete data;
 }
 
+#if wxUSE_THREADS
 bool wxGUIAppTraits::DoMessageFromThreadWait()
 {
     // we should return false only if the app should exit, i.e. only if
@@ -258,6 +259,7 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags)
                QS_ALLPOSTMESSAGE
              );
 }
+#endif // wxUSE_THREADS
 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
 {
diff --git a/Externals/wxWidgets3/src/msw/basemsw.cpp b/Externals/wxWidgets3/src/msw/basemsw.cpp
index 476ff17752..4de6b51c89 100644
--- a/Externals/wxWidgets3/src/msw/basemsw.cpp
+++ b/Externals/wxWidgets3/src/msw/basemsw.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.06.2003
-// RCS-ID:      $Id: basemsw.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: basemsw.cpp 67288 2011-03-22 17:15:56Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -43,10 +43,12 @@
 // wxAppTraits implementation
 // ============================================================================
 
+#if wxUSE_THREADS
 WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 {
     return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
 }
+#endif // wxUSE_THREADS
 
 // ============================================================================
 // wxConsoleAppTraits implementation
@@ -63,12 +65,19 @@ void wxConsoleAppTraits::AfterChildWaitLoop(void * WXUNUSED(data))
     // nothing to do here
 }
 
+#if wxUSE_THREADS
 bool wxConsoleAppTraits::DoMessageFromThreadWait()
 {
     // nothing to process here
     return true;
 }
 
+WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
+{
+    return DoSimpleWaitForThread(hThread);
+}
+#endif // wxUSE_THREADS
+
 #if wxUSE_TIMER
 
 wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
@@ -88,11 +97,6 @@ wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
 }
 
 
-WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
-{
-    return DoSimpleWaitForThread(hThread);
-}
-
 bool wxConsoleAppTraits::WriteToStderr(const wxString& text)
 {
     return wxFprintf(stderr, "%s", text) != -1;
diff --git a/Externals/wxWidgets3/src/msw/button.cpp b/Externals/wxWidgets3/src/msw/button.cpp
index 0cf149d867..fa3bc61418 100644
--- a/Externals/wxWidgets3/src/msw/button.cpp
+++ b/Externals/wxWidgets3/src/msw/button.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: button.cpp 67187 2011-03-14 11:54:39Z VZ $
+// RCS-ID:      $Id: button.cpp 67284 2011-03-22 17:15:34Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -115,6 +115,10 @@ using namespace wxMSWImpl;
     #define BCM_SETSHIELD       0x160c
 #endif
 
+#if wxUSE_UXTHEME
+extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp
+#endif // wxUSE_UXTHEME
+
 // ----------------------------------------------------------------------------
 // button image data
 // ----------------------------------------------------------------------------
@@ -153,6 +157,7 @@ public:
     wxODButtonImageData(wxButton *btn, const wxBitmap& bitmap)
     {
         SetBitmap(bitmap, wxButton::State_Normal);
+        SetBitmap(bitmap.ConvertToDisabled(), wxButton::State_Disabled);
 
         m_dir = wxLEFT;
 
@@ -221,10 +226,11 @@ public:
                 wxButton::State_Max),
           m_hwndBtn(GetHwndOf(btn))
     {
-        // initialize all bitmaps to normal state
+        // initialize all bitmaps except for the disabled one to normal state
         for ( int n = 0; n < wxButton::State_Max; n++ )
         {
-            m_iml.Add(bitmap);
+            m_iml.Add(n == wxButton::State_Disabled ? bitmap.ConvertToDisabled()
+                                                    : bitmap);
         }
 
         m_data.himl = GetHimagelistOf(&m_iml);
@@ -1315,7 +1321,20 @@ void DrawXPBackground(wxButton *button, HDC hdc, RECT& rectBtn, UINT state)
                     iState
                  ) )
     {
+        // Set this button as the one whose background is being erased: this
+        // allows our WM_ERASEBKGND handler used by DrawThemeParentBackground()
+        // to correctly align the background brush with this window instead of
+        // the parent window to which WM_ERASEBKGND is sent. Notice that this
+        // doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers
+        // as they won't be aligned but unfortunately all the attempts to fix
+        // it by shifting DC origin before calling DrawThemeParentBackground()
+        // failed to work so we at least do this, even though this is far from
+        // being the perfect solution.
+        wxWindowBeingErased = button;
+
         engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
+
+        wxWindowBeingErased = NULL;
     }
 
     // draw background
diff --git a/Externals/wxWidgets3/src/msw/checklst.cpp b/Externals/wxWidgets3/src/msw/checklst.cpp
index a913e76fea..58982c47d8 100644
--- a/Externals/wxWidgets3/src/msw/checklst.cpp
+++ b/Externals/wxWidgets3/src/msw/checklst.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.11.97
-// RCS-ID:      $Id: checklst.cpp 66557 2011-01-04 09:13:49Z SC $
+// RCS-ID:      $Id: checklst.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -410,7 +410,7 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
     }
     else
     {
-        // implement default behavior on click outside of client zone
+        // implement default behaviour on click outside of client zone
         event.Skip();
     }
 }
diff --git a/Externals/wxWidgets3/src/msw/choice.cpp b/Externals/wxWidgets3/src/msw/choice.cpp
index d7a1adc3b5..eac398a30c 100644
--- a/Externals/wxWidgets3/src/msw/choice.cpp
+++ b/Externals/wxWidgets3/src/msw/choice.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // Created:     04/01/98
-// RCS-ID:      $Id: choice.cpp 66555 2011-01-04 08:31:53Z SC $
+// RCS-ID:      $Id: choice.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -556,7 +556,7 @@ void wxChoice::DoSetSize(int x, int y,
     // make the control itself of the requested height: notice that this
     // must be done after changing its size or it has no effect (apparently
     // the height is reset to default during the control layout) and that it's
-    // useless to to do it when using the deferred sizing -- in this case it
+    // useless to do it when using the deferred sizing -- in this case it
     // will be done from MSWEndDeferWindowPos()
 #if wxUSE_DEFERRED_SIZING
     if ( m_pendingSize == wxDefaultSize )
diff --git a/Externals/wxWidgets3/src/msw/clipbrd.cpp b/Externals/wxWidgets3/src/msw/clipbrd.cpp
index aee70798b2..e64b118fa3 100644
--- a/Externals/wxWidgets3/src/msw/clipbrd.cpp
+++ b/Externals/wxWidgets3/src/msw/clipbrd.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: clipbrd.cpp 61475 2009-07-20 16:47:54Z VZ $
+// RCS-ID:      $Id: clipbrd.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -98,7 +98,7 @@ bool wxOpenClipboard()
     }
     else
     {
-        wxLogDebug(wxT("Can not open clipboard without a main window."));
+        wxLogDebug(wxT("Cannot open clipboard without a main window."));
 
         return false;
     }
diff --git a/Externals/wxWidgets3/src/msw/combo.cpp b/Externals/wxWidgets3/src/msw/combo.cpp
index bf1463a1f6..5181f117a2 100644
--- a/Externals/wxWidgets3/src/msw/combo.cpp
+++ b/Externals/wxWidgets3/src/msw/combo.cpp
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id: combo.cpp 66385 2010-12-16 17:21:49Z JMS $
+// RCS-ID:      $Id: combo.cpp 67276 2011-03-22 09:56:40Z JMS $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -202,15 +202,18 @@ bool wxComboCtrl::Create(wxWindow *parent,
     if ( style & wxCC_STD_BUTTON )
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
 
+    // Prepare background for double-buffering or better background theme
+    // support, whichever is possible.
+    SetDoubleBuffered(true);
+    if ( !IsDoubleBuffered() )
+        SetBackgroundStyle( wxBG_STYLE_PAINT );
+
     // Create textctrl, if necessary
     CreateTextCtrl( wxNO_BORDER );
 
     // Add keyboard input handlers for main control and textctrl
     InstallInputHandlers();
 
-    // Prepare background for double-buffering
-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-
     // SetInitialSize should be called last
     SetInitialSize(size);
 
@@ -434,7 +437,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
     // TODO: Convert drawing in this function to Windows API Code
 
     wxSize sz = GetClientSize();
-    wxAutoBufferedPaintDC dc(this);
+    wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this);
+    wxDC& dc = *dcPtr;
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
@@ -640,6 +644,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         else
             wxComboPopup::DefaultPaintComboControl(this,dc,rectTextField);
     }
+
+    delete dcPtr;
 }
 
 void wxComboCtrl::OnMouseEvent( wxMouseEvent& event )
diff --git a/Externals/wxWidgets3/src/msw/dib.cpp b/Externals/wxWidgets3/src/msw/dib.cpp
index fc7f8d4020..c9b5ab43dc 100644
--- a/Externals/wxWidgets3/src/msw/dib.cpp
+++ b/Externals/wxWidgets3/src/msw/dib.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
-// RCS-ID:      $Id: dib.cpp 66157 2010-11-15 00:22:01Z VZ $
+// RCS-ID:      $Id: dib.cpp 67287 2011-03-22 17:15:49Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -760,7 +760,14 @@ wxImage wxDIB::ConvertToImage() const
     }
 
     const int bpp = GetDepth();
+
+    // Remember if we have any "real" transparency, i.e. either any partially
+    // transparent pixels or not all pixels are fully opaque or fully
+    // transparent.
     bool hasAlpha = false;
+    bool hasOpaque = false;
+    bool hasTransparent = false;
+
     if ( bpp == 32 )
     {
         // 32 bit bitmaps may be either 0RGB or ARGB and we don't know in
@@ -793,13 +800,30 @@ wxImage wxDIB::ConvertToImage() const
                 // premultiplication done in Create() above
                 const unsigned char a = *src;
                 *alpha++ = a;
+
+                // Check what kind of alpha do we have.
+                switch ( a )
+                {
+                    case 0:
+                        hasTransparent = true;
+                        break;
+
+                    default:
+                        // Anything in between means we have real transparency
+                        // and must use alpha channel.
+                        hasAlpha = true;
+                        break;
+
+                    case 255:
+                        hasOpaque = true;
+                        break;
+                }
+
                 if ( a > 0 )
                 {
                     dst[0] = (dst[0] * 255) / a;
                     dst[1] = (dst[1] * 255) / a;
                     dst[2] = (dst[2] * 255) / a;
-
-                    hasAlpha = true;
                 }
 
                 src++;
@@ -817,6 +841,9 @@ wxImage wxDIB::ConvertToImage() const
         srcLineStart += srcBytesPerLine;
     }
 
+    if ( hasOpaque && hasTransparent )
+        hasAlpha = true;
+
     if ( !hasAlpha && image.HasAlpha() )
         image.ClearAlpha();
 
diff --git a/Externals/wxWidgets3/src/msw/dir.cpp b/Externals/wxWidgets3/src/msw/dir.cpp
index a1dacfd857..264b307761 100644
--- a/Externals/wxWidgets3/src/msw/dir.cpp
+++ b/Externals/wxWidgets3/src/msw/dir.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
-// RCS-ID:      $Id: dir.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: dir.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -208,7 +208,7 @@ bool wxDirData::Read(wxString *filename)
 
         if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
         {
-            wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
+            wxLogSysError(err, _("Cannot enumerate files in directory '%s'"),
                           m_dirname.c_str());
         }
 #endif // __WIN32__
diff --git a/Externals/wxWidgets3/src/msw/display.cpp b/Externals/wxWidgets3/src/msw/display.cpp
index d2de18714c..cc99063f5c 100644
--- a/Externals/wxWidgets3/src/msw/display.cpp
+++ b/Externals/wxWidgets3/src/msw/display.cpp
@@ -4,7 +4,7 @@
 // Author:      Royce Mitchell III, Vadim Zeitlin
 // Modified by: Ryan Norton (IsPrimary override)
 // Created:     06/21/02
-// RCS-ID:      $Id: display.cpp 65557 2010-09-16 11:05:46Z VZ $
+// RCS-ID:      $Id: display.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) wxWidgets team
 // Copyright:   (c) 2002-2006 wxWidgets team
 // Licence:     wxWindows licence
@@ -417,7 +417,7 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
             // ok
             {
                 // If we have a top-level, full-screen frame, emulate
-                // the DirectX behavior and resize it.  This makes this
+                // the DirectX behaviour and resize it.  This makes this
                 // API quite a bit easier to use.
                 wxWindow *winTop = wxTheApp->GetTopWindow();
                 wxFrame *frameTop = wxDynamicCast(winTop, wxFrame);
diff --git a/Externals/wxWidgets3/src/msw/fdrepdlg.cpp b/Externals/wxWidgets3/src/msw/fdrepdlg.cpp
index a16114372c..bd445fe614 100644
--- a/Externals/wxWidgets3/src/msw/fdrepdlg.cpp
+++ b/Externals/wxWidgets3/src/msw/fdrepdlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
-// RCS-ID:      $Id: fdrepdlg.cpp 64656 2010-06-20 18:18:23Z VZ $
+// RCS-ID:      $Id: fdrepdlg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -217,7 +217,7 @@ wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
 #if wxUSE_UNICODE_MSLU
     // This is a hack for a MSLU problem: Versions up to 1.0.4011
     // of UNICOWS.DLL send the correct UNICODE item after button press
-    // and a bogus ANSI mode item right after this, so lets ignore
+    // and a bogus ANSI mode item right after this, so let's ignore
     // the second bogus message
     if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )
     {
diff --git a/Externals/wxWidgets3/src/msw/filedlg.cpp b/Externals/wxWidgets3/src/msw/filedlg.cpp
index 0237601cc7..897cf1452e 100644
--- a/Externals/wxWidgets3/src/msw/filedlg.cpp
+++ b/Externals/wxWidgets3/src/msw/filedlg.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: filedlg.cpp 62722 2009-11-26 16:17:00Z VZ $
+// RCS-ID:      $Id: filedlg.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -225,7 +225,7 @@ void wxFileDialog::DoCentre(int dir)
 
 void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
 {
-    // note the the dialog is the parent window: hDlg is a child of it when
+    // note the dialog is the parent window: hDlg is a child of it when
     // OFN_EXPLORER is used
     HWND hFileDlg = ::GetParent((HWND)hDlg);
 
diff --git a/Externals/wxWidgets3/src/msw/mdi.cpp b/Externals/wxWidgets3/src/msw/mdi.cpp
index 2b8c099853..d4d82e65a9 100644
--- a/Externals/wxWidgets3/src/msw/mdi.cpp
+++ b/Externals/wxWidgets3/src/msw/mdi.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin on 2008-11-04 to use the base classes
 // Created:     04/01/98
-// RCS-ID:      $Id: mdi.cpp 64656 2010-06-20 18:18:23Z VZ $
+// RCS-ID:      $Id: mdi.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Julian Smart
 //              (c) 2008-2009 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -1111,7 +1111,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 
         WXHMENU hMenuParent = parent->m_hMenu;
 
-        // activate the the parent menu only when there is no other child
+        // activate the parent menu only when there is no other child
         // that has been activated
         if ( hMenuParent && !hwndAct )
             hMenuToSet = hMenuParent;
diff --git a/Externals/wxWidgets3/src/msw/mediactrl_am.cpp b/Externals/wxWidgets3/src/msw/mediactrl_am.cpp
index b1ae8105a3..1c2feeca16 100644
--- a/Externals/wxWidgets3/src/msw/mediactrl_am.cpp
+++ b/Externals/wxWidgets3/src/msw/mediactrl_am.cpp
@@ -4,7 +4,7 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     01/29/05
-// RCS-ID:      $Id: mediactrl_am.cpp 65845 2010-10-18 23:43:14Z VZ $
+// RCS-ID:      $Id: mediactrl_am.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1823,8 +1823,8 @@ void wxAMMediaBackend::FinishLoad()
 bool wxAMMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 {
     // Note that IMediaPlayer doesn't have a statusbar by
-    // default but IActiveMovie does - so lets try to keep
-    // the interface consistant
+    // default but IActiveMovie does - so let's try to keep
+    // the interface consistent.
     if(!flags)
     {
         GetAM()->put_Enabled(VARIANT_FALSE);
diff --git a/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp b/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp
index 768bf78cee..aca1e3cc3a 100644
--- a/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp
+++ b/Externals/wxWidgets3/src/msw/mediactrl_qt.cpp
@@ -5,7 +5,7 @@
 // Modified by: Robin Dunn (moved QT code from mediactrl.cpp)
 //
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrl_qt.cpp 65486 2010-09-09 20:33:56Z VZ $
+// RCS-ID:      $Id: mediactrl_qt.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1162,7 +1162,7 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::MCFilterProc (static)
 //
-// Callback for when the movie controller recieves a message
+// Callback for when the movie controller receives a message
 //---------------------------------------------------------------------------
 Boolean wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
                                short action,
diff --git a/Externals/wxWidgets3/src/msw/panel.cpp b/Externals/wxWidgets3/src/msw/panel.cpp
index 18ac2267ec..34296ec254 100644
--- a/Externals/wxWidgets3/src/msw/panel.cpp
+++ b/Externals/wxWidgets3/src/msw/panel.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Implementation of wxMSW-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18
-// RCS-ID:      $Id: panel.cpp 67253 2011-03-20 00:00:49Z VZ $
+// RCS-ID:      $Id: panel.cpp 67269 2011-03-21 11:00:03Z VZ $
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -24,6 +24,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
 #endif // WX_PRECOMP
diff --git a/Externals/wxWidgets3/src/msw/regconf.cpp b/Externals/wxWidgets3/src/msw/regconf.cpp
index 5dd06d8607..44db08657c 100644
--- a/Externals/wxWidgets3/src/msw/regconf.cpp
+++ b/Externals/wxWidgets3/src/msw/regconf.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.04.98
-// RCS-ID:      $Id: regconf.cpp 61508 2009-07-23 20:30:22Z VZ $
+// RCS-ID:      $Id: regconf.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -79,7 +79,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0;
 
   // the convention is to put the programs keys under <vendor>\<appname>
-  // (but it can be overriden by specifying the pathes explicitly in strLocal
+  // (but it can be overridden by specifying the pathes explicitly in strLocal
   // and/or strGlobal)
   if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) )
   {
@@ -563,7 +563,7 @@ bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
-  // overriden by the local key with the same name
+  // overridden by the local key with the same name
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
@@ -600,7 +600,7 @@ bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
-  // overriden by the local key with the same name
+  // overridden by the local key with the same name
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), plResult) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
@@ -634,7 +634,7 @@ bool wxRegConfig::DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
-  // overriden by the local key with the same name
+  // overridden by the local key with the same name
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), *buf) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
diff --git a/Externals/wxWidgets3/src/msw/thread.cpp b/Externals/wxWidgets3/src/msw/thread.cpp
index 239337db99..050aabd280 100644
--- a/Externals/wxWidgets3/src/msw/thread.cpp
+++ b/Externals/wxWidgets3/src/msw/thread.cpp
@@ -4,7 +4,7 @@
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by: Vadim Zeitlin to make it work :-)
 // Created:     04/22/98
-// RCS-ID:      $Id: thread.cpp 67185 2011-03-14 11:54:32Z VZ $
+// RCS-ID:      $Id: thread.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Wolfram Gloger (1996, 1997), Guilhem Lavaux (1998);
 //                  Vadim Zeitlin (1999-2002)
 // Licence:     wxWindows licence
@@ -546,7 +546,7 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
         // store the thread object in the TLS
         if ( !::TlsSetValue(gs_tlsThisThread, thread) )
         {
-            wxLogSysError(_("Can not start thread: error writing TLS."));
+            wxLogSysError(_("Cannot start thread: error writing TLS."));
 
             return THREAD_ERROR_EXIT;
         }
@@ -806,7 +806,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
         {
             case 0xFFFFFFFF:
                 // error
-                wxLogSysError(_("Can not wait for thread termination"));
+                wxLogSysError(_("Cannot wait for thread termination"));
                 Kill();
                 return wxTHREAD_KILLED;
 
@@ -883,7 +883,7 @@ bool wxThreadInternal::Suspend()
     DWORD nSuspendCount = ::SuspendThread(m_hThread);
     if ( nSuspendCount == (DWORD)-1 )
     {
-        wxLogSysError(_("Can not suspend thread %x"), m_hThread);
+        wxLogSysError(_("Cannot suspend thread %x"), m_hThread);
 
         return false;
     }
@@ -898,7 +898,7 @@ bool wxThreadInternal::Resume()
     DWORD nSuspendCount = ::ResumeThread(m_hThread);
     if ( nSuspendCount == (DWORD)-1 )
     {
-        wxLogSysError(_("Can not resume thread %x"), m_hThread);
+        wxLogSysError(_("Cannot resume thread %x"), m_hThread);
 
         return false;
     }
@@ -1264,7 +1264,7 @@ bool wxThreadModule::OnInit()
         ::TlsFree(gs_tlsThisThread);
         gs_tlsThisThread = 0xFFFFFFFF;
 
-        wxLogSysError(_("Thread module initialization failed: can not store value in thread local storage"));
+        wxLogSysError(_("Thread module initialization failed: cannot store value in thread local storage"));
 
         return false;
     }
diff --git a/Externals/wxWidgets3/src/msw/toolbar.cpp b/Externals/wxWidgets3/src/msw/toolbar.cpp
index 02e341ff05..42a4355845 100644
--- a/Externals/wxWidgets3/src/msw/toolbar.cpp
+++ b/Externals/wxWidgets3/src/msw/toolbar.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: toolbar.cpp 67074 2011-02-27 15:09:13Z DS $
+// RCS-ID:      $Id: toolbar.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1296,7 +1296,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
     // Without the two lines of code below, if the toolbar was repainted during
     // OnLeftClick(), then it could end up without the tool bitmap temporarily
     // (see http://lists.nongnu.org/archive/html/lmi/2008-10/msg00014.html).
-    // The Update() call bellow ensures that this won't happen, by repainting
+    // The Update() call below ensures that this won't happen, by repainting
     // invalidated areas of the toolbar immediately.
     //
     // To complicate matters, the tool would be drawn in depressed state (this
@@ -1323,7 +1323,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
     ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0));
 
     // OnLeftClick() can veto the button state change - for buttons which
-    // may be toggled only, of couse
+    // may be toggled only, of course.
     if ( !allowLeftClick && tool->CanBeToggled() )
     {
         // revert back
diff --git a/Externals/wxWidgets3/src/msw/treectrl.cpp b/Externals/wxWidgets3/src/msw/treectrl.cpp
index d43356a4b2..e7d9555276 100644
--- a/Externals/wxWidgets3/src/msw/treectrl.cpp
+++ b/Externals/wxWidgets3/src/msw/treectrl.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
 // Created:     1997
-// RCS-ID:      $Id: treectrl.cpp 66850 2011-02-06 01:00:48Z VZ $
+// RCS-ID:      $Id: treectrl.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -77,7 +77,7 @@ typedef struct tagNMTVITEMCHANGE
 // The vista tree control includes some new code that originally broke the
 // multi-selection tree, causing seemingly spurious item selection state changes
 // during Shift or Ctrl-click item selection. (To witness the original broken
-// behavior, simply make IsLocked() below always return false). This problem was
+// behaviour, simply make IsLocked() below always return false). This problem was
 // solved by using the following class to 'unlock' an item's selection state.
 
 class TreeItemUnlocker
@@ -3371,7 +3371,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         // the wrong items are deselected.
 
         // Fortunately, Vista provides a new notification, TVN_ITEMCHANGING
-        // that can be used to regulate this incorrect behavior.  The
+        // that can be used to regulate this incorrect behaviour.  The
         // following messages will allow only the unlocked item's selection
         // state to change
 
diff --git a/Externals/wxWidgets3/src/msw/utils.cpp b/Externals/wxWidgets3/src/msw/utils.cpp
index 53cb610b2d..dde88bba4c 100644
--- a/Externals/wxWidgets3/src/msw/utils.cpp
+++ b/Externals/wxWidgets3/src/msw/utils.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: utils.cpp 65746 2010-10-03 17:16:09Z VZ $
+// RCS-ID:      $Id: utils.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -303,7 +303,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
     // Get the computer name of a DC for the domain.
     if ( NetGetDCName( NULL, wszDomain, &ComputerName ) != NERR_Success )
     {
-        wxLogError(wxT("Can not find domain controller"));
+        wxLogError(wxT("Cannot find domain controller"));
 
         goto error;
     }
diff --git a/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp b/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp
index ce776117fc..6b21f3ab69 100644
--- a/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/tbarwce.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
-// RCS-ID:      $Id: tbarwce.cpp 61724 2009-08-21 10:41:26Z VZ $
+// RCS-ID:      $Id: tbarwce.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -525,7 +525,7 @@ bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
     if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
     {
         // OnLeftClick() can veto the button state change - for buttons which
-        // may be toggled only, of couse
+        // may be toggled only, of course.
         if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
         {
             // revert back
diff --git a/Externals/wxWidgets3/src/msw/wince/time.cpp b/Externals/wxWidgets3/src/msw/wince/time.cpp
index fc05d33a83..d7f1e90a84 100644
--- a/Externals/wxWidgets3/src/msw/wince/time.cpp
+++ b/Externals/wxWidgets3/src/msw/wince/time.cpp
@@ -4,7 +4,7 @@
 // Author:      Marco Cavallini (MCK) - wx@koansoftware.com
 // Modified by: Vadim Zeitlin for VC8 support
 // Created:     31-08-2003
-// RCS-ID:      $Id: time.cpp 43076 2006-11-04 23:27:15Z VZ $
+// RCS-ID:      $Id: time.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Marco Cavallini
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,13 +60,13 @@ time_t __cdecl mktime(struct tm *t)
 //                                                                                         //
 /////////////////////////////////////////////////////////////////////////////////////////////
 
-#define IN_NONE	0
-#define IN_SOME	1
-#define IN_THIS	2
-#define IN_ALL	3
+#define IN_NONE 0
+#define IN_SOME 1
+#define IN_THIS 2
+#define IN_ALL  3
 #define CHAR_BIT      8
 
-#define TYPE_BIT(type)	(sizeof (type) * CHAR_BIT)
+#define TYPE_BIT(type) (sizeof (type) * CHAR_BIT)
 #define TYPE_SIGNED(type) (((type) -1) < 0)
 
 #define INT_STRLEN_MAXIMUM(type) \
@@ -74,448 +74,448 @@ time_t __cdecl mktime(struct tm *t)
 
 #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
 
-#define MONSPERYEAR	12
-#define DAYSPERWEEK	7
-#define TM_YEAR_BASE	1900
-#define HOURSPERDAY	24
-#define DAYSPERNYEAR	365
-#define DAYSPERLYEAR	366
+#define MONSPERYEAR 12
+#define DAYSPERWEEK 7
+#define TM_YEAR_BASE 1900
+#define HOURSPERDAY 24
+#define DAYSPERNYEAR 365
+#define DAYSPERLYEAR 366
 
-static char		wildabbr[] = "WILDABBR";
+static char     wildabbr[] = "WILDABBR";
 
-char *			tzname[2] = {
-	wildabbr,
-	wildabbr
+char *          tzname[2] = {
+    wildabbr,
+    wildabbr
 };
 
 
-#define Locale	(&C_time_locale)
+#define Locale  (&C_time_locale)
 
 struct lc_time_T {
-	const char *	mon[MONSPERYEAR];
-	const char *	month[MONSPERYEAR];
-	const char *	wday[DAYSPERWEEK];
-	const char *	weekday[DAYSPERWEEK];
-	const char *	X_fmt;
-	const char *	x_fmt;
-	const char *	c_fmt;
-	const char *	am;
-	const char *	pm;
-	const char *	date_fmt;
+    const char *    mon[MONSPERYEAR];
+    const char *    month[MONSPERYEAR];
+    const char *    wday[DAYSPERWEEK];
+    const char *    weekday[DAYSPERWEEK];
+    const char *    X_fmt;
+    const char *    x_fmt;
+    const char *    c_fmt;
+    const char *    am;
+    const char *    pm;
+    const char *    date_fmt;
 };
 
-static const struct lc_time_T	C_time_locale = {
-	{
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	}, {
-		"January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"
-	}, {
-		"Sun", "Mon", "Tue", "Wed",
-		"Thu", "Fri", "Sat"
-	}, {
-		"Sunday", "Monday", "Tuesday", "Wednesday",
-		"Thursday", "Friday", "Saturday"
-	},
+static const struct lc_time_T   C_time_locale = {
+    {
+        "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+    }, {
+        "January", "February", "March", "April", "May", "June",
+        "July", "August", "September", "October", "November", "December"
+    }, {
+        "Sun", "Mon", "Tue", "Wed",
+        "Thu", "Fri", "Sat"
+    }, {
+        "Sunday", "Monday", "Tuesday", "Wednesday",
+        "Thursday", "Friday", "Saturday"
+    },
 
-	/* X_fmt */
-	"%H:%M:%S",
+    /* X_fmt */
+    "%H:%M:%S",
 
-	/*
-	** x_fmt
-	** C99 requires this format.
-	** Using just numbers (as here) makes Quakers happier;
-	** it's also compatible with SVR4.
-	*/
-	"%m/%d/%y",
+    /*
+    ** x_fmt
+    ** C99 requires this format.
+    ** Using just numbers (as here) makes Quakers happier;
+    ** it's also compatible with SVR4.
+    */
+    "%m/%d/%y",
 
-	/*
-	** c_fmt
-	** C99 requires this format.
-	** Previously this code used "%D %X", but we now conform to C99.
-	** Note that
-	**      "%a %b %d %H:%M:%S %Y"
-	** is used by Solaris 2.3.
-	*/
-	"%a %b %e %T %Y",
+    /*
+    ** c_fmt
+    ** C99 requires this format.
+    ** Previously this code used "%D %X", but we now conform to C99.
+    ** Note that
+    **      "%a %b %d %H:%M:%S %Y"
+    ** is used by Solaris 2.3.
+    */
+    "%a %b %e %T %Y",
 
-	/* am */
-	"AM",
+    /* am */
+    "AM",
 
-	/* pm */
-	"PM",
+    /* pm */
+    "PM",
 
-	/* date_fmt */
-	"%a %b %e %H:%M:%S %Z %Y"
+    /* date_fmt */
+    "%a %b %e %H:%M:%S %Z %Y"
 };
 
 
 static char *
 _add(const char * str, char * pt, const char * const ptlim)
 {
-	while (pt < ptlim && (*pt = *str++) != '\0')
-		++pt;
-	return pt;
+    while (pt < ptlim && (*pt = *str++) != '\0')
+        ++pt;
+    return pt;
 }
 
 
 static char *
 _conv(const int n, const char * const format, char * const pt, const char * const ptlim)
 {
-	char	buf[INT_STRLEN_MAXIMUM(int) + 1];
+    char    buf[INT_STRLEN_MAXIMUM(int) + 1];
 
-	(void) _snprintf(buf, sizeof buf, format, n);
-	return _add(buf, pt, ptlim);
+    (void) _snprintf(buf, sizeof buf, format, n);
+    return _add(buf, pt, ptlim);
 }
 
 
 static char *
 _fmt(const char * format, const struct tm * const t, char * pt, const char * const ptlim, int * warnp)
 {
-	for ( ; *format; ++format) {
-		if (*format == '%') {
+    for ( ; *format; ++format) {
+        if (*format == '%') {
 label:
-			switch (*++format) {
-			case '\0':
-				--format;
-				break;
-			case 'A':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : Locale->weekday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'a':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : Locale->wday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'B':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : Locale->month[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'b':
-			case 'h':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : Locale->mon[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'C':
-				/*
-				** %C used to do a...
-				**	_fmt("%a %b %e %X %Y", t);
-				** ...whereas now POSIX 1003.2 calls for
-				** something completely different.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
-					"%02d", pt, ptlim);
-				continue;
-			case 'c':
-				{
-				int warn2 = IN_SOME;
+            switch (*++format) {
+            case '\0':
+                --format;
+                break;
+            case 'A':
+                pt = _add((t->tm_wday < 0 ||
+                    t->tm_wday >= DAYSPERWEEK) ?
+                    "?" : Locale->weekday[t->tm_wday],
+                    pt, ptlim);
+                continue;
+            case 'a':
+                pt = _add((t->tm_wday < 0 ||
+                    t->tm_wday >= DAYSPERWEEK) ?
+                    "?" : Locale->wday[t->tm_wday],
+                    pt, ptlim);
+                continue;
+            case 'B':
+                pt = _add((t->tm_mon < 0 ||
+                    t->tm_mon >= MONSPERYEAR) ?
+                    "?" : Locale->month[t->tm_mon],
+                    pt, ptlim);
+                continue;
+            case 'b':
+            case 'h':
+                pt = _add((t->tm_mon < 0 ||
+                    t->tm_mon >= MONSPERYEAR) ?
+                    "?" : Locale->mon[t->tm_mon],
+                    pt, ptlim);
+                continue;
+            case 'C':
+                /*
+                ** %C used to do a...
+                **  _fmt("%a %b %e %X %Y", t);
+                ** ...whereas now POSIX 1003.2 calls for
+                ** something completely different.
+                ** (ado, 1993-05-24)
+                */
+                pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
+                    "%02d", pt, ptlim);
+                continue;
+            case 'c':
+                {
+                int warn2 = IN_SOME;
 
-				pt = _fmt(Locale->c_fmt, t, pt, ptlim, warnp);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'D':
-				pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp);
-				continue;
-			case 'd':
-				pt = _conv(t->tm_mday, "%02d", pt, ptlim);
-				continue;
-			case 'E':
-			case 'O':
-				/*
-				** C99 locale modifiers.
-				** The sequences
-				**	%Ec %EC %Ex %EX %Ey %EY
-				**	%Od %oe %OH %OI %Om %OM
-				**	%OS %Ou %OU %OV %Ow %OW %Oy
-				** are supposed to provide alternate
-				** representations.
-				*/
-				goto label;
-			case 'e':
-				pt = _conv(t->tm_mday, "%2d", pt, ptlim);
-				continue;
-			case 'F':
-				pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp);
-				continue;
-			case 'H':
-				pt = _conv(t->tm_hour, "%02d", pt, ptlim);
-				continue;
-			case 'I':
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					"%02d", pt, ptlim);
-				continue;
-			case 'j':
-				pt = _conv(t->tm_yday + 1, "%03d", pt, ptlim);
-				continue;
-			case 'k':
-				/*
-				** This used to be...
-				**	_conv(t->tm_hour % 12 ?
-				**		t->tm_hour % 12 : 12, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbins'
-				** strftime version 3.0.  That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv(t->tm_hour, "%2d", pt, ptlim);
-				continue;
+                pt = _fmt(Locale->c_fmt, t, pt, ptlim, warnp);
+                if (warn2 == IN_ALL)
+                    warn2 = IN_THIS;
+                if (warn2 > *warnp)
+                    *warnp = warn2;
+                }
+                continue;
+            case 'D':
+                pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp);
+                continue;
+            case 'd':
+                pt = _conv(t->tm_mday, "%02d", pt, ptlim);
+                continue;
+            case 'E':
+            case 'O':
+                /*
+                ** C99 locale modifiers.
+                ** The sequences
+                **  %Ec %EC %Ex %EX %Ey %EY
+                **  %Od %oe %OH %OI %Om %OM
+                **  %OS %Ou %OU %OV %Ow %OW %Oy
+                ** are supposed to provide alternate
+                ** representations.
+                */
+                goto label;
+            case 'e':
+                pt = _conv(t->tm_mday, "%2d", pt, ptlim);
+                continue;
+            case 'F':
+                pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp);
+                continue;
+            case 'H':
+                pt = _conv(t->tm_hour, "%02d", pt, ptlim);
+                continue;
+            case 'I':
+                pt = _conv((t->tm_hour % 12) ?
+                    (t->tm_hour % 12) : 12,
+                    "%02d", pt, ptlim);
+                continue;
+            case 'j':
+                pt = _conv(t->tm_yday + 1, "%03d", pt, ptlim);
+                continue;
+            case 'k':
+                /*
+                ** This used to be...
+                **    _conv(t->tm_hour % 12 ?
+                **        t->tm_hour % 12 : 12, 2, ' ');
+                ** ...and has been changed to the below to
+                ** match SunOS 4.1.1 and Arnold Robbins'
+                ** strftime version 3.0.  That is, "%k" and
+                ** "%l" have been swapped.
+                ** (ado, 1993-05-24)
+                */
+                pt = _conv(t->tm_hour, "%2d", pt, ptlim);
+                continue;
 #ifdef KITCHEN_SINK
-			case 'K':
-				/*
-				** After all this time, still unclaimed!
-				*/
-				pt = _add("kitchen sink", pt, ptlim);
-				continue;
+            case 'K':
+                /*
+                ** After all this time, still unclaimed!
+                */
+                pt = _add("kitchen sink", pt, ptlim);
+                continue;
 #endif /* defined KITCHEN_SINK */
-			case 'l':
-				/*
-				** This used to be...
-				**	_conv(t->tm_hour, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbin's
-				** strftime version 3.0.  That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					"%2d", pt, ptlim);
-				continue;
-			case 'M':
-				pt = _conv(t->tm_min, "%02d", pt, ptlim);
-				continue;
-			case 'm':
-				pt = _conv(t->tm_mon + 1, "%02d", pt, ptlim);
-				continue;
-			case 'n':
-				pt = _add("\n", pt, ptlim);
-				continue;
-			case 'p':
-				pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
-					Locale->pm :
-					Locale->am,
-					pt, ptlim);
-				continue;
-			case 'R':
-				pt = _fmt("%H:%M", t, pt, ptlim, warnp);
-				continue;
-			case 'r':
-				pt = _fmt("%I:%M:%S %p", t, pt, ptlim, warnp);
-				continue;
-			case 'S':
-				pt = _conv(t->tm_sec, "%02d", pt, ptlim);
-				continue;
-			case 's':
-				{
-					struct tm	tm;
-					char		buf[INT_STRLEN_MAXIMUM(
-								time_t) + 1];
-					time_t		mkt;
+            case 'l':
+                /*
+                ** This used to be...
+                **    _conv(t->tm_hour, 2, ' ');
+                ** ...and has been changed to the below to
+                ** match SunOS 4.1.1 and Arnold Robbin's
+                ** strftime version 3.0.  That is, "%k" and
+                ** "%l" have been swapped.
+                ** (ado, 1993-05-24)
+                */
+                pt = _conv((t->tm_hour % 12) ?
+                    (t->tm_hour % 12) : 12,
+                    "%2d", pt, ptlim);
+                continue;
+            case 'M':
+                pt = _conv(t->tm_min, "%02d", pt, ptlim);
+                continue;
+            case 'm':
+                pt = _conv(t->tm_mon + 1, "%02d", pt, ptlim);
+                continue;
+            case 'n':
+                pt = _add("\n", pt, ptlim);
+                continue;
+            case 'p':
+                pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
+                    Locale->pm :
+                    Locale->am,
+                    pt, ptlim);
+                continue;
+            case 'R':
+                pt = _fmt("%H:%M", t, pt, ptlim, warnp);
+                continue;
+            case 'r':
+                pt = _fmt("%I:%M:%S %p", t, pt, ptlim, warnp);
+                continue;
+            case 'S':
+                pt = _conv(t->tm_sec, "%02d", pt, ptlim);
+                continue;
+            case 's':
+                {
+                    struct tm    tm;
+                    char        buf[INT_STRLEN_MAXIMUM(
+                                time_t) + 1];
+                    time_t        mkt;
 
-					tm = *t;
-					mkt = mktime(&tm);
-					if (TYPE_SIGNED(time_t))
-						(void) _snprintf(buf, sizeof buf,
-						    "%ld", (long) mkt);
-					else	(void) _snprintf(buf, sizeof buf,
-						    "%lu", (unsigned long) mkt);
-					pt = _add(buf, pt, ptlim);
-				}
-				continue;
-			case 'T':
-				pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp);
-				continue;
-			case 't':
-				pt = _add("\t", pt, ptlim);
-				continue;
-			case 'U':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					t->tm_wday) / DAYSPERWEEK,
-					"%02d", pt, ptlim);
-				continue;
-			case 'u':
-				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "ISO 8601: Weekday as a decimal number
-				** [1 (Monday) - 7]"
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_wday == 0) ?
-					DAYSPERWEEK : t->tm_wday,
-					"%d", pt, ptlim);
-				continue;
-			case 'V':	/* ISO 8601 week number */
-			case 'G':	/* ISO 8601 year (four digits) */
-			case 'g':	/* ISO 8601 year (two digits) */
-				{
-					int	year;
-					int	yday;
-					int	wday;
-					int	w;
+                    tm = *t;
+                    mkt = mktime(&tm);
+                    if (TYPE_SIGNED(time_t))
+                        (void) _snprintf(buf, sizeof buf,
+                            "%ld", (long) mkt);
+                    else    (void) _snprintf(buf, sizeof buf,
+                            "%lu", (unsigned long) mkt);
+                    pt = _add(buf, pt, ptlim);
+                }
+                continue;
+            case 'T':
+                pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp);
+                continue;
+            case 't':
+                pt = _add("\t", pt, ptlim);
+                continue;
+            case 'U':
+                pt = _conv((t->tm_yday + DAYSPERWEEK -
+                    t->tm_wday) / DAYSPERWEEK,
+                    "%02d", pt, ptlim);
+                continue;
+            case 'u':
+                /*
+                ** From Arnold Robbins' strftime version 3.0:
+                ** "ISO 8601: Weekday as a decimal number
+                ** [1 (Monday) - 7]"
+                ** (ado, 1993-05-24)
+                */
+                pt = _conv((t->tm_wday == 0) ?
+                    DAYSPERWEEK : t->tm_wday,
+                    "%d", pt, ptlim);
+                continue;
+            case 'V':    /* ISO 8601 week number */
+            case 'G':    /* ISO 8601 year (four digits) */
+            case 'g':    /* ISO 8601 year (two digits) */
+                {
+                    int    year;
+                    int    yday;
+                    int    wday;
+                    int    w;
 
-					year = t->tm_year + TM_YEAR_BASE;
-					yday = t->tm_yday;
-					wday = t->tm_wday;
-					for ( ; ; ) {
-						int	len;
-						int	bot;
-						int	top;
+                    year = t->tm_year + TM_YEAR_BASE;
+                    yday = t->tm_yday;
+                    wday = t->tm_wday;
+                    for ( ; ; ) {
+                        int    len;
+                        int    bot;
+                        int    top;
 
-						len = isleap(year) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-						/*
-						** What yday (-3 ... 3) does
-						** the ISO year begin on?
-						*/
-						bot = ((yday + 11 - wday) %
-							DAYSPERWEEK) - 3;
-						/*
-						** What yday does the NEXT
-						** ISO year begin on?
-						*/
-						top = bot -
-							(len % DAYSPERWEEK);
-						if (top < -3)
-							top += DAYSPERWEEK;
-						top += len;
-						if (yday >= top) {
-							++year;
-							w = 1;
-							break;
-						}
-						if (yday >= bot) {
-							w = 1 + ((yday - bot) /
-								DAYSPERWEEK);
-							break;
-						}
-						--year;
-						yday += isleap(year) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-					}
-					if (*format == 'V')
-						pt = _conv(w, "%02d",
-							pt, ptlim);
-					else if (*format == 'g') {
-						*warnp = IN_ALL;
-						pt = _conv(year % 100, "%02d",
-							pt, ptlim);
-					} else	pt = _conv(year, "%04d",
-							pt, ptlim);
-				}
-				continue;
-			case 'v':
-				pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp);
-				continue;
-			case 'W':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					(t->tm_wday ?
-					(t->tm_wday - 1) :
-					(DAYSPERWEEK - 1))) / DAYSPERWEEK,
-					"%02d", pt, ptlim);
-				continue;
-			case 'w':
-				pt = _conv(t->tm_wday, "%d", pt, ptlim);
-				continue;
-			case 'X':
-				pt = _fmt(Locale->X_fmt, t, pt, ptlim, warnp);
-				continue;
-			case 'x':
-				{
-				int	warn2 = IN_SOME;
+                        len = isleap(year) ?
+                            DAYSPERLYEAR :
+                            DAYSPERNYEAR;
+                        /*
+                        ** What yday (-3 ... 3) does
+                        ** the ISO year begin on?
+                        */
+                        bot = ((yday + 11 - wday) %
+                            DAYSPERWEEK) - 3;
+                        /*
+                        ** What yday does the NEXT
+                        ** ISO year begin on?
+                        */
+                        top = bot -
+                            (len % DAYSPERWEEK);
+                        if (top < -3)
+                            top += DAYSPERWEEK;
+                        top += len;
+                        if (yday >= top) {
+                            ++year;
+                            w = 1;
+                            break;
+                        }
+                        if (yday >= bot) {
+                            w = 1 + ((yday - bot) /
+                                DAYSPERWEEK);
+                            break;
+                        }
+                        --year;
+                        yday += isleap(year) ?
+                            DAYSPERLYEAR :
+                            DAYSPERNYEAR;
+                    }
+                    if (*format == 'V')
+                        pt = _conv(w, "%02d",
+                            pt, ptlim);
+                    else if (*format == 'g') {
+                        *warnp = IN_ALL;
+                        pt = _conv(year % 100, "%02d",
+                            pt, ptlim);
+                    } else    pt = _conv(year, "%04d",
+                            pt, ptlim);
+                }
+                continue;
+            case 'v':
+                pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp);
+                continue;
+            case 'W':
+                pt = _conv((t->tm_yday + DAYSPERWEEK -
+                    (t->tm_wday ?
+                    (t->tm_wday - 1) :
+                    (DAYSPERWEEK - 1))) / DAYSPERWEEK,
+                    "%02d", pt, ptlim);
+                continue;
+            case 'w':
+                pt = _conv(t->tm_wday, "%d", pt, ptlim);
+                continue;
+            case 'X':
+                pt = _fmt(Locale->X_fmt, t, pt, ptlim, warnp);
+                continue;
+            case 'x':
+                {
+                int    warn2 = IN_SOME;
 
-				pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'y':
-				*warnp = IN_ALL;
-				pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
-					"%02d", pt, ptlim);
-				continue;
-			case 'Y':
-				pt = _conv(t->tm_year + TM_YEAR_BASE, "%04d",
-					pt, ptlim);
-				continue;
-			case 'Z':
-				if (t->tm_isdst >= 0)
-					pt = _add(tzname[t->tm_isdst != 0],
-						pt, ptlim);
-				/*
-				** C99 says that %Z must be replaced by the
-				** empty string if the time zone is not
-				** determinable.
-				*/
-				continue;
-			case 'z':
-				{
-				int		diff = -timezone;
-				char const *	sign;
+                pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2);
+                if (warn2 == IN_ALL)
+                    warn2 = IN_THIS;
+                if (warn2 > *warnp)
+                    *warnp = warn2;
+                }
+                continue;
+            case 'y':
+                *warnp = IN_ALL;
+                pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
+                    "%02d", pt, ptlim);
+                continue;
+            case 'Y':
+                pt = _conv(t->tm_year + TM_YEAR_BASE, "%04d",
+                    pt, ptlim);
+                continue;
+            case 'Z':
+                if (t->tm_isdst >= 0)
+                    pt = _add(tzname[t->tm_isdst != 0],
+                        pt, ptlim);
+                /*
+                ** C99 says that %Z must be replaced by the
+                ** empty string if the time zone is not
+                ** determinable.
+                */
+                continue;
+            case 'z':
+                {
+                int        diff = -timezone;
+                char const *    sign;
 
-				if (diff < 0) {
-					sign = "-";
-					diff = -diff;
-				} else	sign = "+";
-				pt = _add(sign, pt, ptlim);
-				diff /= 60;
-				pt = _conv((diff/60)*100 + diff%60,
-					"%04d", pt, ptlim);
-				}
-				continue;
-			case '+':
-				pt = _fmt(Locale->date_fmt, t, pt, ptlim,
-					warnp);
-				continue;
-			case '%':
-			default:
-				break;
-			}
-		}
-		if (pt == ptlim)
-			break;
-		*pt++ = *format;
-	}
-	return pt;
+                if (diff < 0) {
+                    sign = "-";
+                    diff = -diff;
+                } else    sign = "+";
+                pt = _add(sign, pt, ptlim);
+                diff /= 60;
+                pt = _conv((diff/60)*100 + diff%60,
+                    "%04d", pt, ptlim);
+                }
+                continue;
+            case '+':
+                pt = _fmt(Locale->date_fmt, t, pt, ptlim,
+                    warnp);
+                continue;
+            case '%':
+            default:
+                break;
+            }
+        }
+        if (pt == ptlim)
+            break;
+        *pt++ = *format;
+    }
+    return pt;
 }
 
 size_t
 strftime(char * const s, const size_t maxsize, const char *format, const struct tm * const t)
 {
-	char *	p;
-	int	warn;
+    char *p;
+    int warn;
 
-	//tzset();
+    //tzset();
 
-	warn = IN_NONE;
-	p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
+    warn = IN_NONE;
+    p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
 
-	if (p == s + maxsize) {
-		if (maxsize > 0)
-			s[maxsize - 1] = '\0';
-		return 0;
-	}
-	*p = '\0';
-	return p - s;
+    if (p == s + maxsize) {
+        if (maxsize > 0)
+            s[maxsize - 1] = '\0';
+        return 0;
+    }
+    *p = '\0';
+    return p - s;
 }
 
 extern "C"
@@ -612,7 +612,7 @@ static struct tm * __cdecl common_localtime(const time_t *t, BOOL bLocal)
     res->tm_wday = SystemTime.wDayOfWeek;
     res->tm_yday = __mon_yday[iLeap][res->tm_mon] + SystemTime.wDay - 1; // localtime returns year-day aligned to zero
 
-    // if localtime behavior and daylight saving
+    // if localtime behaviour and daylight saving
     if (bLocal && pTz.DaylightBias != 0)
         res->tm_isdst = 1;
     else
diff --git a/Externals/wxWidgets3/src/msw/window.cpp b/Externals/wxWidgets3/src/msw/window.cpp
index 88fa59f3d5..1f11772d8f 100644
--- a/Externals/wxWidgets3/src/msw/window.cpp
+++ b/Externals/wxWidgets3/src/msw/window.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ on 13.05.99: no more Default(), MSWOnXXX() reorganisation
 // Created:     04/01/98
-// RCS-ID:      $Id: window.cpp 67250 2011-03-20 00:00:29Z VZ $
+// RCS-ID:      $Id: window.cpp 67281 2011-03-22 15:07:20Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -182,6 +182,13 @@
 extern wxMenu *wxCurrentPopupMenu;
 #endif
 
+#if wxUSE_UXTHEME
+// This is a hack used by the owner-drawn wxButton implementation to ensure
+// that the brush used for erasing its background is correctly aligned with the
+// control.
+extern wxWindowMSW *wxWindowBeingErased = NULL;
+#endif // wxUSE_UXTHEME
+
 namespace
 {
 
@@ -4921,9 +4928,17 @@ wxWindowMSW::MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child)
 
 WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
 {
+    // Use the special wxWindowBeingErased variable if it is set as the child
+    // being erased.
+    wxWindowMSW * const child =
+#if wxUSE_UXTHEME
+                                wxWindowBeingErased ? wxWindowBeingErased :
+#endif
+                                this;
+
     for ( wxWindowMSW *win = this; win; win = win->GetParent() )
     {
-        WXHBRUSH hBrush = win->MSWGetBgBrushForChild(hDC, this);
+        WXHBRUSH hBrush = win->MSWGetBgBrushForChild(hDC, child);
         if ( hBrush )
             return hBrush;
 
diff --git a/Externals/wxWidgets3/src/osx/button_osx.cpp b/Externals/wxWidgets3/src/osx/button_osx.cpp
index 13fdd15cdb..4dd712c0e7 100644
--- a/Externals/wxWidgets3/src/osx/button_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/button_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: button_osx.cpp 67243 2011-03-19 08:36:23Z SC $
+// RCS-ID:      $Id: button_osx.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -211,7 +211,7 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
     SetPeer(wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
-    // passing the text in the param doesn't seem to work, so lets do it again
+    // passing the text in the param doesn't seem to work, so let's do it again
     SetLabel( label );
 
     return true;
diff --git a/Externals/wxWidgets3/src/osx/carbon/dataview.cpp b/Externals/wxWidgets3/src/osx/carbon/dataview.cpp
index a981920486..48b992758b 100644
--- a/Externals/wxWidgets3/src/osx/carbon/dataview.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/dataview.cpp
@@ -854,7 +854,7 @@ bool wxMacDataViewDataBrowserListViewControl::DeleteColumn(wxDataViewColumn* col
 
 void wxMacDataViewDataBrowserListViewControl::DoSetExpanderColumn(wxDataViewColumn const* columnPtr)
 {
-  SetDisclosureColumn(columnPtr->GetNativeData()->GetPropertyID(),false); // second parameter explicitely passed to ensure that arrow is centered
+  SetDisclosureColumn(columnPtr->GetNativeData()->GetPropertyID(),false); // second parameter explicitly passed to ensure that arrow is centered
 }
 
 wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetColumn(unsigned int pos) const
@@ -2489,7 +2489,7 @@ wxDataViewColumn::~wxDataViewColumn()
 
 int wxDataViewColumn::GetWidth() const
 {
-    // FIXME: This returns the last programatically set width and will not work if
+    // FIXME: This returns the last programmatically set width and will not work if
     //        the user changes the column's width by dragging it with the mouse.
     return m_width;
 }
diff --git a/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp b/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp
index 7d2b74e3ed..f7d2ea4858 100644
--- a/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/glcanvas.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: glcanvas.cpp 66785 2011-01-27 12:38:24Z SC $
+// RCS-ID:      $Id: glcanvas.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -311,7 +311,7 @@ that previously allocated surface is associated with the context (e.g., no
 new surface is created) and the subsequent call to aglSetDrawable will
 attach that surface. This allows multiple contexts to be attached to a single
 surface. Using the default buffer name zero, returns to one surface per
-context behavior.
+context behaviour.
 */
 
 /*
diff --git a/Externals/wxWidgets3/src/osx/carbon/listbox.cpp b/Externals/wxWidgets3/src/osx/carbon/listbox.cpp
index 1438c22fe8..167e6a1910 100644
--- a/Externals/wxWidgets3/src/osx/carbon/listbox.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/listbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: listbox.cpp 67230 2011-03-18 14:20:12Z SC $
+// RCS-ID:      $Id: listbox.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -140,7 +140,7 @@ int wxMacDataBrowserListControl::DoListHitTest(const wxPoint& inpoint) const
                 // index(bounds) greater then key(point)
                 high = mid - 1;
             else
-                // index(bounds) less then key(point)
+                // index(bounds) less than key(point)
                 low = mid + 1;
         }
     }
diff --git a/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp b/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp
index 42188a234a..f81ac0c534 100644
--- a/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/mediactrl.cpp
@@ -4,7 +4,7 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id: mediactrl.cpp 64656 2010-06-20 18:18:23Z VZ $
+// RCS-ID:      $Id: mediactrl.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2004-2006 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1158,7 +1158,7 @@ pascal void wxQTMediaBackend::PPRMProc(
 //---------------------------------------------------------------------------
 // wxQTMediaBackend::MCFilterProc (static)
 //
-// Callback for when the movie controller recieves a message
+// Callback for when the movie controller receives a message
 //---------------------------------------------------------------------------
 pascal Boolean wxQTMediaBackend::MCFilterProc(
     MovieController WXUNUSED(theController),
diff --git a/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp b/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp
index 270feafcae..6518554ad9 100644
--- a/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp
+++ b/Externals/wxWidgets3/src/osx/carbon/nonownedwnd.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxNonOwnedWindow
 // Author:      Stefan Csomor
 // Created:     2008-03-24
-// RCS-ID:      $Id: nonownedwnd.cpp 66028 2010-11-05 21:38:25Z VZ $
+// RCS-ID:      $Id: nonownedwnd.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Stefan Csomor 2008
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -237,12 +237,12 @@ void wxNonOwnedWindowCarbonImpl::MacSetUnifiedAppearance( bool set )
         set ? kWindowNoAttributes : kWindowUnifiedTitleAndToolbarAttribute) ;
 
     // For some reason, Tiger uses white as the background color for this appearance,
-    // while most apps using it use the typical striped background. Restore that behavior
+    // while most apps using it use the typical striped background. Restore that behaviour
     // for wx.
     // TODO: Determine if we need this on Leopard as well. (should be harmless either way,
     // though)
     // since when creating the peering is not yet completely set-up we call both setters
-    // explicitely
+    // explicitly
     m_wxPeer->SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
     SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
 }
diff --git a/Externals/wxWidgets3/src/osx/cocoa/mediactrl.mm b/Externals/wxWidgets3/src/osx/cocoa/mediactrl.mm
new file mode 100644
index 0000000000..33381967df
--- /dev/null
+++ b/Externals/wxWidgets3/src/osx/cocoa/mediactrl.mm
@@ -0,0 +1,425 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/cocoa/mediactrl.cpp
+// Purpose:     Built-in Media Backends for Cocoa
+// Author:      Ryan Norton <wxprojects@comcast.net>
+// Modified by:
+// Created:     02/03/05
+// RCS-ID:      $Id: mediactrl.mm 39285 2006-05-23 11:04:37Z ABX $
+// Copyright:   (c) 2004-2005 Ryan Norton, (c) 2005 David Elliot
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+//===========================================================================
+//  DECLARATIONS
+//===========================================================================
+
+//---------------------------------------------------------------------------
+// Pre-compiled header stuff
+//---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+//---------------------------------------------------------------------------
+// Compilation guard
+//---------------------------------------------------------------------------
+#if wxUSE_MEDIACTRL
+
+#include "wx/mediactrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+
+#include "wx/osx/private.h"
+
+//===========================================================================
+//  BACKEND DECLARATIONS
+//===========================================================================
+
+//---------------------------------------------------------------------------
+//
+//  wxQTMediaBackend
+//
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+//  QT Includes
+//---------------------------------------------------------------------------
+#include <QTKit/QTKit.h>
+
+#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
+
+#import <AppKit/NSMovie.h>
+#import <AppKit/NSMovieView.h>
+
+class WXDLLIMPEXP_FWD_MEDIA wxQTMediaBackend;
+
+@interface wxQTMovie : QTMovie {
+    
+    wxQTMediaBackend* m_backend;
+}
+
+-(BOOL)isPlaying;
+
+@end
+
+class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackendCommonBase
+{
+public:
+
+    wxQTMediaBackend();
+    ~wxQTMediaBackend();
+
+    virtual bool CreateControl(wxControl* ctrl, wxWindow* parent,
+                                     wxWindowID id,
+                                     const wxPoint& pos,
+                                     const wxSize& size,
+                                     long style,
+                                     const wxValidator& validator,
+                                     const wxString& name);
+
+    virtual bool Play();
+    virtual bool Pause();
+    virtual bool Stop();
+
+    virtual bool Load(const wxString& fileName);
+    virtual bool Load(const wxURI& location);
+
+    virtual wxMediaState GetState();
+
+    virtual bool SetPosition(wxLongLong where);
+    virtual wxLongLong GetPosition();
+    virtual wxLongLong GetDuration();
+
+    virtual void Move(int x, int y, int w, int h);
+    wxSize GetVideoSize() const;
+
+    virtual double GetPlaybackRate();
+    virtual bool SetPlaybackRate(double dRate);
+
+    virtual double GetVolume();
+    virtual bool SetVolume(double dVolume);
+    
+    void Cleanup();
+    void FinishLoad();
+
+    virtual bool   ShowPlayerControls(wxMediaCtrlPlayerControls flags);
+private:
+    void DoShowPlayerControls(wxMediaCtrlPlayerControls flags);
+    
+    wxSize m_bestSize;              //Original movie size
+    wxQTMovie* m_movie;               //QTMovie handle/instance
+    QTMovieView* m_movieview;       //QTMovieView instance
+
+    wxMediaCtrlPlayerControls m_interfaceflags; // Saved interface flags
+
+    DECLARE_DYNAMIC_CLASS(wxQTMediaBackend);
+};
+
+// --------------------------------------------------------------------------
+// wxQTMovie
+// --------------------------------------------------------------------------
+
+@implementation wxQTMovie 
+
+- (id)initWithURL:(NSURL *)url error:(NSError **)errorPtr
+{
+    if ( [super initWithURL:url error:errorPtr] != nil )
+    {
+        m_backend = NULL;
+        
+        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+        [nc addObserver:self selector:@selector(movieDidEnd:) 
+                   name:QTMovieDidEndNotification object:nil];
+        [nc addObserver:self selector:@selector(movieRateChanged:) 
+                   name:QTMovieRateDidChangeNotification object:nil];
+        [nc addObserver:self selector:@selector(loadStateChanged:) 
+                   name:QTMovieLoadStateDidChangeNotification object:nil];
+        
+        return self;
+    }
+    else 
+        return nil;
+}
+
+-(void)dealloc
+{
+    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+	[nc removeObserver:self];
+    
+	[super dealloc];    
+}
+
+-(wxQTMediaBackend*) backend;
+{
+    return m_backend;
+}
+
+-(void) setBackend:(wxQTMediaBackend*) backend
+{
+    m_backend = backend;
+}
+
+- (void)movieDidEnd:(NSNotification *)notification
+{
+    if ( m_backend )
+    {
+        if ( m_backend->SendStopEvent() )
+            m_backend->QueueFinishEvent();
+    }
+}
+
+- (void)movieRateChanged:(NSNotification *)notification
+{
+	NSDictionary *userInfo = [notification userInfo];
+	
+	NSNumber *newRate = [userInfo objectForKey:QTMovieRateDidChangeNotificationParameter];
+    
+	if ([newRate intValue] == 0)
+	{
+		m_backend->QueuePauseEvent();
+	}	
+    else if ( [self isPlaying] == NO )
+    {
+		m_backend->QueuePlayEvent();
+    }
+}
+
+-(void)loadStateChanged:(QTMovie *)movie
+{
+    long loadState = [[movie attributeForKey:QTMovieLoadStateAttribute] longValue];
+    if (loadState >= QTMovieLoadStatePlayable)
+    {
+        // the movie has loaded enough media data to begin playing
+    }
+    else if (loadState >= QTMovieLoadStateLoaded)
+    {
+        m_backend->FinishLoad();
+    }
+    else if (loadState == -1)
+    {
+        // error occurred 
+    }
+}
+
+-(BOOL)isPlaying
+{
+	if ([self rate] == 0)
+	{
+		return NO;
+	}
+	
+	return YES;
+}
+
+@end
+
+// --------------------------------------------------------------------------
+// wxQTMediaBackend
+// --------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
+
+wxQTMediaBackend::wxQTMediaBackend() : 
+    m_interfaceflags(wxMEDIACTRLPLAYERCONTROLS_NONE),
+    m_movie(nil), m_movieview(nil)
+{
+}
+
+wxQTMediaBackend::~wxQTMediaBackend()
+{
+    Cleanup();
+}
+
+bool wxQTMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
+                                     wxWindowID wid,
+                                     const wxPoint& pos,
+                                     const wxSize& size,
+                                     long style,
+                                     const wxValidator& validator,
+                                     const wxString& name)
+{
+    wxMediaCtrl* mediactrl = (wxMediaCtrl*) inctrl;
+
+    mediactrl->DontCreatePeer();
+    
+    if ( !mediactrl->wxControl::Create(
+                                       parent, wid, pos, size,
+                                       wxWindow::MacRemoveBordersFromStyle(style),
+                                       validator, name))
+    {
+        return false;
+    }
+    
+    NSRect r = wxOSXGetFrameForControl( mediactrl, pos , size ) ;
+    QTMovieView* theView = [[QTMovieView alloc] initWithFrame: r];
+
+    wxWidgetCocoaImpl* impl = new wxWidgetCocoaImpl(mediactrl,theView);
+    mediactrl->SetPeer(impl);
+    
+    m_movieview = theView;
+    // will be set up after load
+    [theView setControllerVisible:NO];
+
+    m_ctrl = mediactrl;
+    return true;
+}
+
+bool wxQTMediaBackend::Load(const wxString& fileName)
+{
+    return Load(
+                wxURI(
+                    wxString( wxT("file://") ) + fileName
+                     )
+               );
+}
+
+bool wxQTMediaBackend::Load(const wxURI& location)
+{
+    wxCFStringRef uri(location.BuildURI());
+
+    [m_movie release];
+    wxQTMovie* movie = [[wxQTMovie alloc] initWithURL: [NSURL URLWithString: uri.AsNSString()] error: nil ];
+    
+    m_movie = movie;
+    [m_movie setBackend:this];
+    [m_movieview setMovie:movie];
+    
+    return movie != nil;
+}
+
+void wxQTMediaBackend::FinishLoad()
+{
+    DoShowPlayerControls(m_interfaceflags);
+    
+    NSRect r =[m_movieview movieBounds];
+    m_bestSize.x = r.size.width;
+    m_bestSize.y = r.size.height;
+    
+    NotifyMovieLoaded();
+
+}
+
+bool wxQTMediaBackend::Play()
+{
+    [m_movieview play:nil];
+    return true;
+}
+
+bool wxQTMediaBackend::Pause()
+{
+    [m_movieview pause:nil];
+    return true;
+}
+
+bool wxQTMediaBackend::Stop()
+{
+    [m_movieview pause:nil];
+    [m_movieview gotoBeginning:nil];
+    return true;
+}
+
+double wxQTMediaBackend::GetVolume()
+{
+    return [m_movie volume];
+}
+
+bool wxQTMediaBackend::SetVolume(double dVolume)
+{
+    [m_movie setVolume:dVolume];
+    return true;
+}
+double wxQTMediaBackend::GetPlaybackRate()
+{
+    return [m_movie rate];
+}
+
+bool wxQTMediaBackend::SetPlaybackRate(double dRate)
+{
+    [m_movie setRate:dRate];
+    return true;
+}
+
+bool wxQTMediaBackend::SetPosition(wxLongLong where)
+{
+    QTTime position;
+    position = [m_movie currentTime];
+    position.timeValue = (where.GetValue() / 1000.0) * position.timeScale;
+    [m_movie setCurrentTime:position];
+    return true;
+}
+
+wxLongLong wxQTMediaBackend::GetPosition()
+{
+    QTTime position = [m_movie currentTime];
+    return ((double) position.timeValue) / position.timeScale * 1000;
+}
+
+wxLongLong wxQTMediaBackend::GetDuration()
+{
+    QTTime duration = [m_movie duration];
+    return ((double) duration.timeValue) / duration.timeScale * 1000;
+}
+
+wxMediaState wxQTMediaBackend::GetState()
+{
+    if ( [m_movie isPlaying] )
+        return wxMEDIASTATE_PLAYING;
+    else
+    {
+        if ( GetPosition() == 0 )
+            return wxMEDIASTATE_STOPPED;
+        else
+            return wxMEDIASTATE_PAUSED;
+    }
+}
+
+void wxQTMediaBackend::Cleanup()
+{
+    [m_movieview setMovie:NULL];
+    [m_movie release];
+    m_movie = nil;
+}
+
+wxSize wxQTMediaBackend::GetVideoSize() const
+{
+    return m_bestSize;
+}
+
+void wxQTMediaBackend::Move(int x, int y, int w, int h)
+{
+}
+
+bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
+{
+    if ( m_interfaceflags != flags )
+        DoShowPlayerControls(flags);
+    
+    m_interfaceflags = flags;    
+    return true;
+}
+
+void wxQTMediaBackend::DoShowPlayerControls(wxMediaCtrlPlayerControls flags)
+{
+    if (flags == wxMEDIACTRLPLAYERCONTROLS_NONE )
+    {
+        [m_movieview setControllerVisible:NO];
+    }
+    else 
+    {
+        [m_movieview setStepButtonsVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_STEP) ? YES:NO];
+        [m_movieview setVolumeButtonVisible:(flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME) ? YES:NO];
+    }
+}
+
+//in source file that contains stuff you don't directly use
+#include "wx/html/forcelnk.h"
+FORCE_LINK_ME(basewxmediabackends);
+
+#endif //wxUSE_MEDIACTRL
diff --git a/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp b/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp
index 30a82494db..beca56da0f 100644
--- a/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp
+++ b/Externals/wxWidgets3/src/osx/core/hidjoystick.cpp
@@ -4,7 +4,7 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2/13/2005
-// RCS-ID:      $Id: hidjoystick.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: hidjoystick.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -778,7 +778,7 @@ void* wxJoystickThread::Entry()
 //---------------------------------------------------------------------------
 // wxJoystickThread::HIDCallback (static)
 //
-// Callback for the native HID device when it recieves input.
+// Callback for the native HID device when it receives input.
 //
 // This is where the REAL dirty work gets done.
 //
diff --git a/Externals/wxWidgets3/src/osx/core/sockosx.cpp b/Externals/wxWidgets3/src/osx/core/sockosx.cpp
index f8920b26da..2b9bc131be 100644
--- a/Externals/wxWidgets3/src/osx/core/sockosx.cpp
+++ b/Externals/wxWidgets3/src/osx/core/sockosx.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxSocketImpl implementation for OS X
 // Authors:     Brian Victor, Vadim Zeitlin
 // Created:     February 2002
-// RCS-ID:      $Id: sockosx.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: sockosx.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 2002 Brian Victor
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -141,7 +141,7 @@ private:
                 // KH: If data is non-NULL, the connect failed, do not call Detected_Write,
                 // which will only end up creating a spurious connect event because the
                 // call to getsocketopt SO_ERROR inexplicably returns no error.
-                // The change in behavior cannot be traced to any particular commit or
+                // The change in behaviour cannot be traced to any particular commit or
                 // timeframe so I'm not sure what to think, but after so many hours,
                 // this seems to address the issue and it's time to move on.
                 if (data == NULL)
diff --git a/Externals/wxWidgets3/src/osx/imaglist.cpp b/Externals/wxWidgets3/src/osx/imaglist.cpp
index 162b15a880..89edd3afc9 100644
--- a/Externals/wxWidgets3/src/osx/imaglist.cpp
+++ b/Externals/wxWidgets3/src/osx/imaglist.cpp
@@ -2,7 +2,7 @@
 // Name:        src/osx/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
-// RCS_ID:      $Id: imaglist.cpp 61508 2009-07-23 20:30:22Z VZ $
+// RCS_ID:      $Id: imaglist.cpp 67280 2011-03-22 14:17:38Z DS $
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -79,7 +79,7 @@ int wxImageList::Add( const wxBitmap &bitmap )
                   wxT("invalid bitmap size in wxImageList: this might work ")
                   wxT("on this platform but definitely won't under Windows.") );
 
-    // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
+    // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added
     // bitmap into sub-images of the correct size
     if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
     {
diff --git a/Externals/wxWidgets3/src/osx/menu_osx.cpp b/Externals/wxWidgets3/src/osx/menu_osx.cpp
index 232d1d5723..3a793b5023 100644
--- a/Externals/wxWidgets3/src/osx/menu_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/menu_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menu_osx.cpp 67230 2011-03-18 14:20:12Z SC $
+// RCS-ID:      $Id: menu_osx.cpp 67272 2011-03-22 06:44:08Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -497,6 +497,8 @@ wxMenuBar* wxMenuBar::s_macCommonMenuBar = NULL ;
 bool     wxMenuBar::s_macAutoWindowMenu = true ;
 WXHMENU  wxMenuBar::s_macWindowMenuHandle = NULL ;
 
+const int firstMenuPos = 1; // to account for the 0th application menu on mac
+
 void wxMenuBar::Init()
 {
     m_eventHandler = this;
@@ -806,7 +808,7 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
     wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
 
-    m_rootMenu->FindItemByPosition( pos )->Enable(enable);
+    m_rootMenu->FindItemByPosition(pos+firstMenuPos)->Enable(enable);
 
     Refresh();
 }
@@ -841,8 +843,6 @@ wxString wxMenuBar::GetMenuLabel(size_t pos) const
 // wxMenuBar construction
 // ---------------------------------------------------------------------------
 
-const int firstMenuPos = 1; // to account for the 0th application menu on mac
-
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
diff --git a/Externals/wxWidgets3/src/osx/menuitem_osx.cpp b/Externals/wxWidgets3/src/osx/menuitem_osx.cpp
index a0f999fba6..13aa8127fa 100644
--- a/Externals/wxWidgets3/src/osx/menuitem_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/menuitem_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menuitem_osx.cpp 67230 2011-03-18 14:20:12Z SC $
+// RCS-ID:      $Id: menuitem_osx.cpp 67273 2011-03-22 07:10:41Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -41,13 +41,14 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
 
     // In other languages there is no difference in naming the Exit/Quit menu item between MacOS and Windows guidelines
     // therefore these item must not be translated
-    if ( wxStripMenuCodes(m_text).Upper() == wxT("EXIT") )
-        m_text = wxT("Quit\tCtrl+Q") ;
+    if (pParentMenu != NULL && !pParentMenu->GetNoEventsMode())
+        if ( wxStripMenuCodes(m_text).Upper() == wxT("EXIT") )
+            m_text = wxT("Quit\tCtrl+Q") ;
 
     m_radioGroup.start = -1;
     m_isRadioGroupStart = false;
 
-    wxString text = wxStripMenuCodes(m_text);
+    wxString text = wxStripMenuCodes(m_text, (pParentMenu != NULL && pParentMenu->GetNoEventsMode()) ? wxStrip_Accel : wxStrip_All);
     if (text.IsEmpty() && !IsSeparator())
     {
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
@@ -202,7 +203,7 @@ void wxMenuItem::UpdateItemText()
     if ( !m_parentMenu )
         return ;
 
-    wxString text = wxStripMenuCodes(m_text);
+    wxString text = wxStripMenuCodes(m_text, m_parentMenu != NULL && m_parentMenu->GetNoEventsMode() ? wxStrip_Accel : wxStrip_All);
     if (text.IsEmpty() && !IsSeparator())
     {
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
diff --git a/Externals/wxWidgets3/src/osx/window_osx.cpp b/Externals/wxWidgets3/src/osx/window_osx.cpp
index bed9f36a02..b781718ded 100644
--- a/Externals/wxWidgets3/src/osx/window_osx.cpp
+++ b/Externals/wxWidgets3/src/osx/window_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: window_osx.cpp 67254 2011-03-20 00:14:35Z DS $
+// RCS-ID:      $Id: window_osx.cpp 67282 2011-03-22 16:39:26Z SC $
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -298,7 +298,8 @@ void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer)
 {
     if ( GetPeer() )
     {
-        GetPeer()->RemoveFromParent();
+        if ( !GetPeer()->IsRootControl() )
+            GetPeer()->RemoveFromParent();
         wxDELETE(m_peer);
     }