diff --git a/wxPython/contrib/dllwidget/dllwidget.h b/wxPython/contrib/dllwidget/dllwidget.h
index daf209c82d..61263da614 100644
--- a/wxPython/contrib/dllwidget/dllwidget.h
+++ b/wxPython/contrib/dllwidget/dllwidget.h
@@ -86,7 +86,7 @@ public:
     bool Ok() { return m_widget != NULL; }
 
     virtual int SendCommand(int cmd, const wxString& param = wxEmptyString);
-    virtual wxWindow* GetEmbeddedWindow() { return m_widget; }
+    virtual wxWindow* GetWidgetWindow() { return m_widget; }
 
     virtual void AddChild(wxWindowBase *child);
 
diff --git a/wxPython/contrib/dllwidget/dllwidget_.cpp b/wxPython/contrib/dllwidget/dllwidget_.cpp
index b34a06a273..1a953eb1fc 100644
--- a/wxPython/contrib/dllwidget/dllwidget_.cpp
+++ b/wxPython/contrib/dllwidget/dllwidget_.cpp
@@ -309,8 +309,8 @@ static PyObject *_wrap_wxDllWidget_SendCommand(PyObject *self, PyObject *args, P
     return _resultobj;
 }
 
-#define wxDllWidget_GetEmbeddedWindow(_swigobj)  (_swigobj->GetEmbeddedWindow())
-static PyObject *_wrap_wxDllWidget_GetEmbeddedWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxDllWidget_GetWidgetWindow(_swigobj)  (_swigobj->GetWidgetWindow())
+static PyObject *_wrap_wxDllWidget_GetWidgetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxDllWidget * _arg0;
@@ -318,18 +318,18 @@ static PyObject *_wrap_wxDllWidget_GetEmbeddedWindow(PyObject *self, PyObject *a
     char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDllWidget_GetEmbeddedWindow",_kwnames,&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDllWidget_GetWidgetWindow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDllWidget_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDllWidget_GetEmbeddedWindow. Expected _wxDllWidget_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDllWidget_GetWidgetWindow. Expected _wxDllWidget_p.");
         return NULL;
         }
     }
 {
     wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxWindow *)wxDllWidget_GetEmbeddedWindow(_arg0);
+        _result = (wxWindow *)wxDllWidget_GetWidgetWindow(_arg0);
 
     wxPy_END_ALLOW_THREADS;
 }{ _resultobj = wxPyMake_wxObject(_result); }
@@ -360,7 +360,7 @@ static PyObject *_wrap_wxDllWidget_GetDllExt(PyObject *self, PyObject *args, PyO
 
 static PyMethodDef dllwidget_cMethods[] = {
 	 { "wxDllWidget_GetDllExt", (PyCFunction) _wrap_wxDllWidget_GetDllExt, METH_VARARGS | METH_KEYWORDS },
-	 { "wxDllWidget_GetEmbeddedWindow", (PyCFunction) _wrap_wxDllWidget_GetEmbeddedWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDllWidget_GetWidgetWindow", (PyCFunction) _wrap_wxDllWidget_GetWidgetWindow, METH_VARARGS | METH_KEYWORDS },
 	 { "wxDllWidget_SendCommand", (PyCFunction) _wrap_wxDllWidget_SendCommand, METH_VARARGS | METH_KEYWORDS },
 	 { "wxDllWidget_Ok", (PyCFunction) _wrap_wxDllWidget_Ok, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxDllWidget", (PyCFunction) _wrap_new_wxDllWidget, METH_VARARGS | METH_KEYWORDS },
diff --git a/wxPython/contrib/dllwidget/dllwidget_.i b/wxPython/contrib/dllwidget/dllwidget_.i
index 37aa1781db..52f4622f6e 100644
--- a/wxPython/contrib/dllwidget/dllwidget_.i
+++ b/wxPython/contrib/dllwidget/dllwidget_.i
@@ -93,7 +93,7 @@ public:
     bool Ok();
 
     int SendCommand(int cmd, const wxString& param = wxEmptyString);
-    wxWindow* GetEmbeddedWindow();
+    wxWindow* GetWidgetWindow();
 
     static wxString GetDllExt();
 };
diff --git a/wxPython/contrib/dllwidget/dllwidget_.py b/wxPython/contrib/dllwidget/dllwidget_.py
index 377dbf404d..19f6558ad0 100644
--- a/wxPython/contrib/dllwidget/dllwidget_.py
+++ b/wxPython/contrib/dllwidget/dllwidget_.py
@@ -50,8 +50,8 @@ class wxDllWidgetPtr(wxPanelPtr):
     def SendCommand(self, *_args, **_kwargs):
         val = apply(dllwidget_c.wxDllWidget_SendCommand,(self,) + _args, _kwargs)
         return val
-    def GetEmbeddedWindow(self, *_args, **_kwargs):
-        val = apply(dllwidget_c.wxDllWidget_GetEmbeddedWindow,(self,) + _args, _kwargs)
+    def GetWidgetWindow(self, *_args, **_kwargs):
+        val = apply(dllwidget_c.wxDllWidget_GetWidgetWindow,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxDllWidget instance at %s>" % (self.this,)
diff --git a/wxPython/demo/dllwidget/test_prog.py b/wxPython/demo/dllwidget/test_prog.py
index 660b158c41..bd54f16cd2 100644
--- a/wxPython/demo/dllwidget/test_prog.py
+++ b/wxPython/demo/dllwidget/test_prog.py
@@ -38,11 +38,11 @@ class TestFrame(wxFrame):
 
         if dw.Ok():
             # The embedded window is the one exported from the DLL
-            print dw.GetEmbeddedWindow().GetClassName()
+            print dw.GetWidgetWindow().GetClassName()
 
             # This shows that we can give it a child from this side of things.
             # You can also call any wxWindow methods on it too.
-            wxStaticText(dw.GetEmbeddedWindow(), -1,
+            wxStaticText(dw.GetWidgetWindow(), -1,
                          "Loaded from test_dll...", pos=(10,10))
         else:
             wxStaticText(dw, -1, "ERROR!!!!", pos=(20,20))
diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index cd743b007d..78ea6acf0a 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -319,6 +319,7 @@ enum {
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
+    //wxSP_SASH_AQUA,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,