switched wxXML to expat parser
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -255,7 +255,7 @@ void EditorFrame::SaveFile(const wxString& filename)
|
||||
{
|
||||
m_FileName = filename;
|
||||
|
||||
if (!m_Resource->Save(filename, wxXML_IO_LIBXML))
|
||||
if (!m_Resource->Save(filename))
|
||||
wxLogError(_("Error saving ") + filename);
|
||||
else
|
||||
m_Modified = FALSE;
|
||||
|
@@ -63,7 +63,11 @@ PreviewFrame *PreviewFrame::Get()
|
||||
PreviewFrame::PreviewFrame()
|
||||
: wxFrame(EditorFrame::Get(), -1, _("Preview"),
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR | wxFRAME_TOOL_WINDOW)
|
||||
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR
|
||||
#ifdef __WXMSW__
|
||||
| wxFRAME_TOOL_WINDOW
|
||||
#endif
|
||||
)
|
||||
{
|
||||
m_Dirty = FALSE;
|
||||
ms_Instance = this;
|
||||
|
@@ -201,7 +201,11 @@ PropertiesFrame *PropertiesFrame::Get()
|
||||
PropertiesFrame::PropertiesFrame()
|
||||
: wxFrame(EditorFrame::Get(), -1, _("Properties"),
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR | wxFRAME_TOOL_WINDOW)
|
||||
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR
|
||||
#ifdef __WXMSW__
|
||||
| wxFRAME_TOOL_WINDOW
|
||||
#endif
|
||||
)
|
||||
{
|
||||
ms_Instance = this;
|
||||
m_Node = NULL;
|
||||
|
@@ -170,7 +170,7 @@ void wxRemotelyScrolledTreeCtrl::PrepareDC(wxDC& dc)
|
||||
scrolledWindow->GetScrollPixelsPerUnit(& xppu2, & yppu2);
|
||||
|
||||
dc.SetDeviceOrigin( -startX * xppu1, -startY * yppu2 );
|
||||
dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
|
||||
//dc.SetUserScale( win->GetScaleX(), win->GetScaleY() );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -576,7 +576,7 @@ void wxSplitterScrolledWindow::OnScroll(wxScrollWinEvent& event)
|
||||
|
||||
int orient = event.GetOrientation();
|
||||
|
||||
int nScrollInc = CalcScrollInc(event);
|
||||
int nScrollInc = 16;// FIXME CalcScrollInc(event);
|
||||
if (nScrollInc == 0)
|
||||
{
|
||||
inOnScroll = FALSE;
|
||||
|
@@ -1,5 +1,7 @@
|
||||
#include "wx/msw/wx.rc"
|
||||
|
||||
aaa ICON mondrian.ico
|
||||
|
||||
close BITMAP bitmaps/close.bmp
|
||||
open BITMAP bitmaps/open.bmp
|
||||
preview BITMAP bitmaps/preview.bmp
|
||||
|
Reference in New Issue
Block a user