define wxHAS_RAW_BITMAP for wxDFB

[wxWidgets.git] / include / wx / xrc / xmlres.h

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index b2a2d2f3bca8fc4cdef060ce68be09dda4cfc356..9321e4c186d8af4590d8001b58ed246c191cb21b 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -17,6 +17,7 @@
 
 #include "wx/string.h"
 #include "wx/dynarray.h"
 
 #include "wx/string.h"
 #include "wx/dynarray.h"

+#include "wx/arrstr.h"

 #include "wx/datetime.h"
 #include "wx/list.h"
 #include "wx/gdicmn.h"
 #include "wx/datetime.h"
 #include "wx/list.h"
 #include "wx/gdicmn.h"


@@ -44,10 +45,6 @@ class wxXmlSubclassFactories;
 class wxXmlResourceModule;
 class wxXmlResourceDataRecords;
 
 class wxXmlResourceModule;
 class wxXmlResourceDataRecords;
 

-// make VC++ happy: otherwise it gives warnings when using this type for a
-// member of DLL-exported wxXmlResource class in shared builds
-template class WXDLLIMPEXP_FWD_XRC wxVector<wxXmlResourceHandler *>;
-

 // These macros indicate current version of XML resources (this information is
 // encoded in root node of XRC file as "version" property).
 //
 // These macros indicate current version of XML resources (this information is
 // encoded in root node of XRC file as "version" property).
 //


@@ -330,10 +327,10 @@ private:
 //   <size>400, 300</size>
 // </object>
 //
 //   <size>400, 300</size>
 // </object>
 //

-// wxSizerItem* item = XRCSIZERITEM(*this, wxT("area"))
+// wxSizerItem* item = XRCSIZERITEM(*this, "area")

 
 #define XRCSIZERITEM(window, id) \
 
 #define XRCSIZERITEM(window, id) \

-    ((window).GetSizer() ? (window).GetSizer()->GetItemById(id) : NULL)    
+    ((window).GetSizer() ? (window).GetSizer()->GetItemById(XRCID(id)) : NULL)

 
 // wxXmlResourceHandler is an abstract base class for resource handlers
 // capable of creating a control from an XML node.
 
 // wxXmlResourceHandler is an abstract base class for resource handlers
 // capable of creating a control from an XML node.