applied patch that adds more i18n support to XRC handlers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp
index 72edfaaad76904fe2e82f705c48e9732285d4eb8..24e191e830dec1dfac86157c27ed0eaec279c7a0 100644 (file)
--- a/contrib/src/xrc/xh_chckl.cpp
+++ b/contrib/src/xrc/xh_chckl.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"

+#include "wx/intl.h"

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


@@ -90,7 +91,7 @@ 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));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

         return NULL;
     }
 }
         return NULL;
     }
 }

diff --git a/contrib/src/xrc/xh_choic.cpp b/contrib/src/xrc/xh_choic.cpp
index e9ff297b64696e759a54d04709547e81f4082118..2f91e382a8f204a5b9afc96343094dfb3d9d9b27 100644 (file)
--- a/contrib/src/xrc/xh_choic.cpp
+++ b/contrib/src/xrc/xh_choic.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"

+#include "wx/intl.h"

 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)
 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)


@@ -76,7 +77,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
         // handle <item>Label</item>
         
         // add to the list
         // handle <item>Label</item>
         
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }

diff --git a/contrib/src/xrc/xh_combo.cpp b/contrib/src/xrc/xh_combo.cpp
index daeb0d70f7688ec84349254bee601df83f74a321..3d708c3a49256e4b365ea075931bc52fb97947a6 100644 (file)
--- a/contrib/src/xrc/xh_combo.cpp
+++ b/contrib/src/xrc/xh_combo.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"

+#include "wx/intl.h"

 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 


@@ -82,7 +83,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
         // handle <item>Label</item>
 
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }

diff --git a/contrib/src/xrc/xh_listb.cpp b/contrib/src/xrc/xh_listb.cpp
index f77a5b5d812b5fbd781423694a2d28e57f232dec..50790fbb34fe89717984b3b8bce3f4c96d1d8005 100644 (file)
--- a/contrib/src/xrc/xh_listb.cpp
+++ b/contrib/src/xrc/xh_listb.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_listb.h"
 #include "wx/listbox.h"
 
 #include "wx/xrc/xh_listb.h"
 #include "wx/listbox.h"

+#include "wx/intl.h"

 
 wxListBoxXmlHandler::wxListBoxXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)
 
 wxListBoxXmlHandler::wxListBoxXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)


@@ -82,7 +83,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
         
         // add to the list
         // handle <item>Label</item>
         
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }

diff --git a/contrib/src/xrc/xh_radbx.cpp b/contrib/src/xrc/xh_radbx.cpp
index 244960bd133b5fa9ae206fbe6ea51f16bebb3f1c..6ba0e86182b098520cde51ab9127139826e7c7e7 100644 (file)
--- a/contrib/src/xrc/xh_radbx.cpp
+++ b/contrib/src/xrc/xh_radbx.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"

+#include "wx/intl.h"

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 


@@ -83,7 +84,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         // handle <item selected="boolean">Label</item>
 
         // add to the list
         // handle <item selected="boolean">Label</item>
 
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 72edfaaad76904fe2e82f705c48e9732285d4eb8..24e191e830dec1dfac86157c27ed0eaec279c7a0 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"

+#include "wx/intl.h"

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


@@ -90,7 +91,7 @@ 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));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

         return NULL;
     }
 }
         return NULL;
     }
 }

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index e9ff297b64696e759a54d04709547e81f4082118..2f91e382a8f204a5b9afc96343094dfb3d9d9b27 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"

+#include "wx/intl.h"

 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)
 
 wxChoiceXmlHandler::wxChoiceXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)


@@ -76,7 +77,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
         // handle <item>Label</item>
         
         // add to the list
         // handle <item>Label</item>
         
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index daeb0d70f7688ec84349254bee601df83f74a321..3d708c3a49256e4b365ea075931bc52fb97947a6 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"

+#include "wx/intl.h"

 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 


@@ -82,7 +83,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
         // handle <item>Label</item>
 
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index f77a5b5d812b5fbd781423694a2d28e57f232dec..50790fbb34fe89717984b3b8bce3f4c96d1d8005 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_listb.h"
 #include "wx/listbox.h"
 
 #include "wx/xrc/xh_listb.h"
 #include "wx/listbox.h"

+#include "wx/intl.h"

 
 wxListBoxXmlHandler::wxListBoxXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)
 
 wxListBoxXmlHandler::wxListBoxXmlHandler() 
 : wxXmlResourceHandler() , m_insideBox(FALSE)


@@ -82,7 +83,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
         
         // add to the list
         // handle <item>Label</item>
         
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }

diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 244960bd133b5fa9ae206fbe6ea51f16bebb3f1c..6ba0e86182b098520cde51ab9127139826e7c7e7 100644 (file)
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"

+#include "wx/intl.h"

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 


@@ -83,7 +84,7 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         // handle <item selected="boolean">Label</item>
 
         // add to the list
         // handle <item selected="boolean">Label</item>
 
         // add to the list

-        strList.Add(GetNodeContent(m_node));
+        strList.Add(wxGetTranslation(GetNodeContent(m_node)));

 
         return NULL;
     }
 
         return NULL;
     }