diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index 967fb587d1..8cf834ec39 100644
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -618,7 +618,7 @@ public:
         "windows, or, if wxPD_APP_MODAL flag is not given, for its parent window only.");
 
     DocDeclStr(
-        bool , Update(int value, const wxString& newmsg = wxPyEmptyString),
+        virtual bool , Update(int value, const wxString& newmsg = wxPyEmptyString),
         "Updates the dialog, setting the progress bar to the new value and, if given\n"
         "changes the message above it. Returns true unless the Cancel button has been\n"
         "pressed.\n\n"
diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index e61213b451..55e415d87c 100644
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -572,98 +572,10 @@ public:
 
 
 %{
-//-=-=-=-=-=-=-=-=-=-=-    
-
-#if 1
-// Use the standard wxBufferedDC
 #include <wx/dcbuffer.h>
-
-#else
-
-//  Or, temporarily put a set of classes here similar to the old buffered DC
-//  classes until the real ones can be fixed to work "correctly" again.
-
-class wxBufferedDC : public wxMemoryDC
-{
-private:
-    wxDC        *m_dc;
-    wxBitmap    m_buffer;
-
-public:
-
-    wxBufferedDC() : m_dc( 0 ) {}
-    
-    wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
-        : m_dc( dc ), m_buffer( buffer )
-    {
-        SelectObject( m_buffer );
-    }
-       
-    wxBufferedDC( wxDC *dc, const wxSize &area )
-        : m_dc( dc ), m_buffer( area.GetWidth(), area.GetHeight() )
-    {
-        SelectObject( m_buffer );
-    }
-
-    ~wxBufferedDC() {
-        if( m_dc != 0 )
-            UnMask();
-    }
-
-
-    void Init( wxDC *dc, const wxBitmap &buffer ) {
-        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
-                      _T("wxBufferedDC already initialised") );
-        m_dc = dc;
-        m_buffer = buffer;
-        SelectObject( m_buffer );
-    }
-
-    void Init( wxDC *dc, const wxSize &area ) {
-        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
-                      _T("wxBufferedDC already initialised") );
-        m_dc = dc;
-        m_buffer = wxBitmap( area.GetWidth(), area.GetHeight() );
-        SelectObject( m_buffer );
-    }
-
-    void UnMask() {
-        wxASSERT_MSG( m_dc != 0, _T("No low level DC associated with buffer (anymore)") );
-        m_dc->Blit( 0, 0, m_buffer.GetWidth(), m_buffer.GetHeight(), this, 0, 0 );
-        m_dc = 0;
-    }
-};
- 
-
-class wxBufferedPaintDC : public wxBufferedDC
-{
-private:
-    wxPaintDC    m_paintdc;
-
-public:
-    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap )
-        : m_paintdc( window )
-    {
-        window->PrepareDC( m_paintdc );
-
-        if( buffer != wxNullBitmap )
-            Init( &m_paintdc, buffer );
-        else
-            Init( &m_paintdc, window->GetClientSize() );
-    }
-        
-    ~wxBufferedPaintDC() {
-        UnMask();
-    }
-};
-
-#endif
-//-=-=-=-=-=-=-=-=-=-=-    
 %}
 
 
-
-
 class wxBufferedDC : public wxMemoryDC
 {
 public:
diff --git a/wxPython/src/_obj.i b/wxPython/src/_obj.i
index 9aa98b17dc..07901443ab 100644
--- a/wxPython/src/_obj.i
+++ b/wxPython/src/_obj.i
@@ -25,7 +25,7 @@ public:
 
     %extend {
         DocStr(GetClassName,
-               "Returns the class name of the C++ object using wxRTTI.");
+               "Returns the class name of the C++ class using wxRTTI.");
         wxString GetClassName() {
             return self->GetClassInfo()->GetClassName();
         }
diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 5997304fed..8da7a55a31 100644
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -299,17 +299,6 @@ public:
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
-
-    // returns True if we're in a modal loop
-    %extend {
-        bool IsModalShowing() {
-        #ifdef __WXGTK__
-            return self->m_modalShowing;
-        #else
-            return self->IsModalShowing();
-        #endif
-        }
-    }
 };
 
 //---------------------------------------------------------------------------
diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 7388adc43a..70e855e1d3 100644
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -682,9 +682,10 @@ window had already been in the specified state.");
 
     DocDeclStr(
         virtual void , SetWindowStyleFlag( long style ),
-        "Sets the style of the window. Please note that some styles cannot be
-changed after the window creation and that Refresh() might be called
-after changing the others for the change to take place immediately.");
+        "Sets the style of the window. Please note that some styles cannot
+be changed after the window creation and that Refresh() might
+need to be called after changing the others for the change to
+take place immediately.");
     
     DocDeclStr(
         virtual long , GetWindowStyleFlag() const,