define WX_XTI_TEMPLATE_FIX in case it is not yet

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

diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp
index c9f114ea92d54db8923a0848668af5a7a7f3ebbd..fb8c71ad34599ef012850b166537c258ec8df2d8 100644 (file)
--- a/contrib/src/xrc/xh_chckl.cpp
+++ b/contrib/src/xrc/xh_chckl.cpp
@@ -19,8 +19,13 @@
     #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"
+
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListXmlHandler, wxXmlResourceHandler)

 
 wxCheckListXmlHandler::wxCheckListXmlHandler() 
 : wxXmlResourceHandler(), m_insideBox(FALSE)
 
 wxCheckListXmlHandler::wxCheckListXmlHandler() 
 : wxXmlResourceHandler(), m_insideBox(FALSE)


@@ -37,24 +42,24 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         m_insideBox = TRUE;
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         m_insideBox = TRUE;
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;

-        if( strList.GetCount() > 0 )
+        if (strList.GetCount() > 0)

         {
             strings = new wxString[strList.GetCount()];
             int count = strList.GetCount();
         {
             strings = new wxString[strList.GetCount()];
             int count = strList.GetCount();

-            for( int i = 0; i < count; i++ )
-                strings[i]=strList[i];
+            for(int i = 0; i < count; i++)
+                strings[i] = strList[i];

         }
 
         }
 

+        XRC_MAKE_INSTANCE(control, wxCheckListBox)

 
 

-        wxCheckListBox *control = new wxCheckListBox(m_parentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+        control->Create(m_parentAsWindow,
+                        GetID(),
+                        GetPosition(), GetSize(),
+                        strList.GetCount(),
+                        strings,
+                        GetStyle(),
+                        wxDefaultValidator,
+                        GetName());

 
         // step through children myself (again.)
         wxXmlNode *n = GetParamNode(wxT("content"));
 
         // step through children myself (again.)
         wxXmlNode *n = GetParamNode(wxT("content"));


@@ -78,8 +83,8 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
         
         SetupWindow(control);
 
         
         SetupWindow(control);
 

-        if( strings != NULL )
-            delete [] strings;
+        if (strings != NULL)
+            delete[] strings;

         strList.Clear();    // dump the strings   
 
         return control;
         strList.Clear();    // dump the strings   
 
         return control;


@@ -90,20 +95,19 @@ 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)
 {
     return (IsOfClass(node, wxT("wxCheckList")) ||
 bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxCheckList")) ||

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

 }
 
 }
 

+#endif