more updates for recent toolbar changes

[wxWidgets.git] / contrib / utils / wxrcedit / preview.cpp

diff --git a/contrib/utils/wxrcedit/preview.cpp b/contrib/utils/wxrcedit/preview.cpp
index 08e570e796ae3850f1e8c3aafed9b283c6cf7dc9..ddf3be2b61d5962b749b1864d8522730d01af21f 100644 (file)
--- a/contrib/utils/wxrcedit/preview.cpp
+++ b/contrib/utils/wxrcedit/preview.cpp
@@ -18,8 +18,8 @@
 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"

-#include "wx/xml/xml.h"
-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xml.h"
+#include "wx/xrc/xmlres.h"

 #include "wx/config.h"
 #include "wx/log.h"
 #include "wx/splitter.h"
 #include "wx/config.h"
 #include "wx/log.h"
 #include "wx/splitter.h"


@@ -27,7 +27,7 @@
 #include "xmlhelpr.h"
 #include "editor.h"
 
 #include "xmlhelpr.h"
 #include "editor.h"
 

-#include "wx/xml/xh_menu.h"
+#include "wx/xrc/xh_menu.h"

 
 class MyMenubarHandler : public wxMenuBarXmlHandler
 {
 
 class MyMenubarHandler : public wxMenuBarXmlHandler
 {


@@ -154,7 +154,7 @@ void PreviewFrame::Preview(wxXmlNode *node,const wxString &version)
        if (XmlGetClass(doc.GetRoot()->GetChildren()) == _T("wxDialog")) 
            XmlSetClass(doc.GetRoot()->GetChildren(), _T("wxPanel"));   
 
        if (XmlGetClass(doc.GetRoot()->GetChildren()) == _T("wxDialog")) 
            XmlSetClass(doc.GetRoot()->GetChildren(), _T("wxPanel"));   
 

-       doc.Save(m_TmpFile, wxXML_IO_BIN);
+       doc.Save(m_TmpFile);

        // wxXmlResource will detect change automatically
    }
 
        // wxXmlResource will detect change automatically
    }