Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 522612a2644ac9871155c53a935c279e2ae31084..d7e5226486b447435d85dda7a54bd9fa429343e7 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_chckl.h"
 #endif
 
 #pragma implementation "xh_chckl.h"
 #endif
 


@@ -19,7 +19,9 @@
     #pragma hdrstop
 #endif
 
     #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"
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"


@@ -28,15 +30,23 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 

-wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler() 
-: wxXmlResourceHandler(), m_insideBox(FALSE)
+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();
 }
 
 wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxCheckListBoxXmlHandler::DoCreateResource()

-{ 
+{

     if (m_class == wxT("wxCheckListBox")
 #if WXWIN_COMPATIBILITY_2_4
         || m_class == wxT("wxCheckList")
     if (m_class == wxT("wxCheckListBox")
 #if WXWIN_COMPATIBILITY_2_4
         || m_class == wxT("wxCheckList")


@@ -48,7 +58,7 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
             wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
 #endif
         // need to build the list of strings from children
             wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
 #endif
         // need to build the list of strings from children

-        m_insideBox = TRUE;
+        m_insideBox = true;

         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if (strList.GetCount() > 0)
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if (strList.GetCount() > 0)


@@ -84,17 +94,17 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
             wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
             v.MakeLower();
             if (v && v == wxT("1"))
             wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
             v.MakeLower();
             if (v && v == wxT("1"))

-                control->Check( i, TRUE );
+                control->Check( i, true );

 
 

-            i++;        
+            i++;

             n = n->GetNext();
         }
             n = n->GetNext();
         }

-        
+

         SetupWindow(control);
 
         if (strings != NULL)
             delete[] strings;
         SetupWindow(control);
 
         if (strings != NULL)
             delete[] strings;

-        strList.Clear();    // dump the strings   
+        strList.Clear();    // dump the strings

 
         return control;
     }
 
         return control;
     }


@@ -121,5 +131,6 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-#endif
+#endif // wxUSE_CHECKLISTBOX

 
 

+#endif // wxUSE_XRC