moved Esc processing from wxWindow to wxDialog where it belongs; use the -- to be...

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

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 0dde7f6759578afa0ab82057d43adc0f210bab5a..d7e5226486b447435d85dda7a54bd9fa429343e7 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_chckl.h"
 #endif
 
@@ -19,7 +19,9 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+#if wxUSE_XRC
+
+#if wxUSE_CHECKLISTBOX
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
@@ -31,7 +33,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
 : wxXmlResourceHandler(), m_insideBox(false)
 {
-    // no styles
+    // wxListBox styles:
+    XRC_ADD_STYLE(wxLB_SINGLE);
+    XRC_ADD_STYLE(wxLB_MULTIPLE);
+    XRC_ADD_STYLE(wxLB_EXTENDED);
+    XRC_ADD_STYLE(wxLB_HSCROLL);
+    XRC_ADD_STYLE(wxLB_ALWAYS_SB);
+    XRC_ADD_STYLE(wxLB_NEEDED_SB);
+    XRC_ADD_STYLE(wxLB_SORT);
+    
     AddWindowStyles();
 }
 
@@ -121,5 +131,6 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif
+#endif // wxUSE_CHECKLISTBOX
 
+#endif // wxUSE_XRC