Committing in .

 removing some obsolete CLEAR members

 Modified Files:
 	wxWindows/samples/richedit/wxlwindow.cpp
 	wxWindows/utils/dialoged/src/reseditr.cpp
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index 4383578c2cc3d3a1df89da3b241951a881a4f34e..f39113a35c78da3c1df0fab17e204f7abdf070ba 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -214,7 +214,7 @@ wxLayoutWindow::Clear(int family,
 {
    GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
    SetBackgroundColour(GetLayoutList()->GetDefaultStyleInfo().GetBGColour());
 {
    GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
    SetBackgroundColour(GetLayoutList()->GetDefaultStyleInfo().GetBGColour());

-   wxScrolledWindow::Clear();
+   //wxScrolledWindow::Clear();

    ResizeScrollbars(true);
    SetDirty();
    SetModified(FALSE);
    ResizeScrollbars(true);
    SetDirty();
    SetModified(FALSE);

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 2d33bddd2ca0d716ca279e52da1a623072469f8a..0b9968031ced66a60ba14a13b47df821124c0358 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -640,8 +640,8 @@ bool wxResourceManager::DeleteWindow(wxWindow* win)
     
     win->Destroy();
     
     
     win->Destroy();
     

-    if (clearDisplay)
-        m_editorPanel->Clear();
+    //if (clearDisplay)
+    //    m_editorPanel->Clear();

     
     return TRUE;
 }
     
     return TRUE;
 }


@@ -1218,7 +1218,7 @@ void wxResourceManager::ClearCurrentDialog()
         DisassociateResource(m_editorPanel->m_childWindow);
         DeleteWindow(m_editorPanel->m_childWindow);
         m_editorPanel->m_childWindow = NULL;
         DisassociateResource(m_editorPanel->m_childWindow);
         DeleteWindow(m_editorPanel->m_childWindow);
         m_editorPanel->m_childWindow = NULL;

-        m_editorPanel->Clear();
+        //m_editorPanel->Clear();

     }
 }
 
     }
 }