Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-14 10:02:19 +00:00
parent 15fa9a1f82
commit 0bca037363
40 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xrc/xmlres.cpp
View File

@@ -26,6 +26,7 @@
#include "wx/frame.h"
#include "wx/dialog.h"
#include "wx/settings.h"
#include "wx/bitmap.h"
#endif
#ifndef __WXWINCE__
@@ -38,7 +39,6 @@
#include "wx/tokenzr.h"
#include "wx/fontenum.h"
#include "wx/module.h"
#include "wx/bitmap.h"
#include "wx/image.h"
#include "wx/fontmap.h"
#include "wx/artprov.h"
@@ -643,7 +643,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
}
}
if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().length() )
dest.SetContent(with.GetContent());
}