translate wx{File,Dir}PickerWidgetLabel

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

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index b2a2d2f3bca8fc4cdef060ce68be09dda4cfc356..6146f5956f6ef216efc38f7e83c199257c2665c4 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -44,10 +44,6 @@ class wxXmlSubclassFactories;
 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).
 //
@@ -330,10 +326,10 @@ private:
 //   <size>400, 300</size>
 // </object>
 //
-// wxSizerItem* item = XRCSIZERITEM(*this, wxT("area"))
+// wxSizerItem* item = XRCSIZERITEM(*this, "area")
 
 #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.