Put back wxMSW's wxStaticBitmap::DoGetBestSize because GetBitmap (used

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

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 72edfaaad76904fe2e82f705c48e9732285d4eb8..522612a2644ac9871155c53a935c279e2ae31084 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -19,20 +19,34 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+

 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"

+#include "wx/intl.h"
+#include "wx/log.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)

 
 

-wxCheckListXmlHandler::wxCheckListXmlHandler() 
+wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler() 

 : wxXmlResourceHandler(), m_insideBox(FALSE)
 {
     // no styles
     AddWindowStyles();
 }
 
 : wxXmlResourceHandler(), m_insideBox(FALSE)
 {
     // no styles
     AddWindowStyles();
 }
 

-wxObject *wxCheckListXmlHandler::DoCreateResource()
+wxObject *wxCheckListBoxXmlHandler::DoCreateResource()

 { 
 { 

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

     {
     {

+#if WXWIN_COMPATIBILITY_2_4
+        if (m_class == wxT("wxCheckList"))
+            wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
+#endif

         // need to build the list of strings from children
         m_insideBox = TRUE;
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         // need to build the list of strings from children
         m_insideBox = TRUE;
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));


@@ -90,15 +104,22 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         // handle <item checked="boolean">Label</item>
 
         // add to the list
         // handle <item checked="boolean">Label</item>
 
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        wxString str = GetNodeContent(m_node);
+        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+            str = wxGetTranslation(str);
+        strList.Add(str);

         return NULL;
     }
 }
 
         return NULL;
     }
 }
 

-bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
+bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)

 {
 {

-    return (IsOfClass(node, wxT("wxCheckList")) ||
+    return (IsOfClass(node, wxT("wxCheckListBox")) ||
+#if WXWIN_COMPATIBILITY_2_4
+            IsOfClass(node, wxT("wxCheckList")) ||
+#endif

            (m_insideBox && node->GetName() == wxT("item")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

+#endif