reverted to TCL version of regex library

[wxWidgets.git] / src / xrc / xh_listc.cpp

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index de3635dedee0e8257b16815eef3d1fac931798df..b876461977c7bf2df1c00436ad036914dc48e808 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -24,49 +24,46 @@
 #include "wx/listctrl.h"
 
 
 #include "wx/listctrl.h"
 
 

+IMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler)
+

 wxListCtrlXmlHandler::wxListCtrlXmlHandler() 
 : wxXmlResourceHandler() 
 {
 wxListCtrlXmlHandler::wxListCtrlXmlHandler() 
 : wxXmlResourceHandler() 
 {

-    ADD_STYLE(wxLC_LIST);
-    ADD_STYLE(wxLC_REPORT);
-    ADD_STYLE(wxLC_ICON);
-    ADD_STYLE(wxLC_SMALL_ICON);
-    ADD_STYLE(wxLC_ALIGN_TOP);
-    ADD_STYLE(wxLC_ALIGN_LEFT);
-    ADD_STYLE(wxLC_AUTOARRANGE);
-    ADD_STYLE(wxLC_USER_TEXT);
-    ADD_STYLE(wxLC_EDIT_LABELS);
-    ADD_STYLE(wxLC_NO_HEADER);
-    ADD_STYLE(wxLC_SINGLE_SEL);
-    ADD_STYLE(wxLC_SORT_ASCENDING);
-    ADD_STYLE(wxLC_SORT_DESCENDING);
+    XRC_ADD_STYLE(wxLC_LIST);
+    XRC_ADD_STYLE(wxLC_REPORT);
+    XRC_ADD_STYLE(wxLC_ICON);
+    XRC_ADD_STYLE(wxLC_SMALL_ICON);
+    XRC_ADD_STYLE(wxLC_ALIGN_TOP);
+    XRC_ADD_STYLE(wxLC_ALIGN_LEFT);
+    XRC_ADD_STYLE(wxLC_AUTOARRANGE);
+    XRC_ADD_STYLE(wxLC_USER_TEXT);
+    XRC_ADD_STYLE(wxLC_EDIT_LABELS);
+    XRC_ADD_STYLE(wxLC_NO_HEADER);
+    XRC_ADD_STYLE(wxLC_SINGLE_SEL);
+    XRC_ADD_STYLE(wxLC_SORT_ASCENDING);
+    XRC_ADD_STYLE(wxLC_SORT_DESCENDING);
+    XRC_ADD_STYLE(wxLC_VIRTUAL);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 

-

 wxObject *wxListCtrlXmlHandler::DoCreateResource()
 { 
 wxObject *wxListCtrlXmlHandler::DoCreateResource()
 { 

-   wxListCtrl *list = wxStaticCast(m_instance, wxListCtrl);
-
-   if (!list)
-       list = new wxListCtrl;
+    XRC_MAKE_INSTANCE(list, wxListCtrl)

 
 

-   list->Create(m_parentAsWindow,
-                    GetID(),
-                    GetPosition(), GetSize(),
-                    GetStyle(),
-                    wxDefaultValidator,
-                    GetName());
+    list->Create(m_parentAsWindow,
+                 GetID(),
+                 GetPosition(), GetSize(),
+                 GetStyle(),
+                 wxDefaultValidator,
+                 GetName());

 
 

-    /* TODO: columns definition */
+    // FIXME: add columns definition

     
     SetupWindow(list);
     
     return list;
 }
 
     
     SetupWindow(list);
     
     return list;
 }
 

-
-

 bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxListCtrl"));
 bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxListCtrl"));