reverted Robert's over-optimisation, correct fix coming soon

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

diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index 6f9f6b2ab47d95fe7676b851b1bd149c9eddc9f8..6746b8322435657bef9297f3b6e20fe998d7754a 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_listc.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_listc.h"
 #endif


@@ -19,13 +19,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/textctrl.h"
 #include "wx/xrc/xh_listc.h"
 #include "wx/listctrl.h"
 
 
 #include "wx/textctrl.h"
 #include "wx/xrc/xh_listc.h"
 #include "wx/listctrl.h"
 
 

-wxListCtrlXmlHandler::wxListCtrlXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler)
+
+wxListCtrlXmlHandler::wxListCtrlXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxLC_LIST);
     XRC_ADD_STYLE(wxLC_REPORT);
 {
     XRC_ADD_STYLE(wxLC_LIST);
     XRC_ADD_STYLE(wxLC_REPORT);


@@ -40,11 +44,15 @@ wxListCtrlXmlHandler::wxListCtrlXmlHandler()
     XRC_ADD_STYLE(wxLC_SINGLE_SEL);
     XRC_ADD_STYLE(wxLC_SORT_ASCENDING);
     XRC_ADD_STYLE(wxLC_SORT_DESCENDING);
     XRC_ADD_STYLE(wxLC_SINGLE_SEL);
     XRC_ADD_STYLE(wxLC_SORT_ASCENDING);
     XRC_ADD_STYLE(wxLC_SORT_DESCENDING);

+    XRC_ADD_STYLE(wxLC_VIRTUAL);
+    XRC_ADD_STYLE(wxLC_HRULES);
+    XRC_ADD_STYLE(wxLC_VRULES);
+    XRC_ADD_STYLE(wxLC_NO_SORT_HEADER);

     AddWindowStyles();
 }
 
 wxObject *wxListCtrlXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxListCtrlXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(list, wxListCtrl)
 
     list->Create(m_parentAsWindow,
     XRC_MAKE_INSTANCE(list, wxListCtrl)
 
     list->Create(m_parentAsWindow,


@@ -55,9 +63,9 @@ wxObject *wxListCtrlXmlHandler::DoCreateResource()
                  GetName());
 
     // FIXME: add columns definition
                  GetName());
 
     // FIXME: add columns definition

-    
+

     SetupWindow(list);
     SetupWindow(list);

-    
+

     return list;
 }
 
     return list;
 }
 


@@ -65,3 +73,5 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxListCtrl"));
 }
 {
     return IsOfClass(node, wxT("wxListCtrl"));
 }

+
+#endif // wxUSE_XRC