don't provide unnecessary (as default) arguments to wxPen ctor, this incidentally...

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

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index d1b48f96d76d7119d22ee3e2338d40e8f65505cf..fb92aeae16844bfd3c5c3b76fabb3ba3cf4a6581 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_listb.cpp
+// Name:        src/xrc/xh_listb.cpp
 // Purpose:     XRC resource for wxListBox
 // Author:      Bob Mitchell & Vaclav Slavik
 // Created:     2000/07/29
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_listb.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,60 +15,58 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_LISTBOX
+
 #include "wx/xrc/xh_listb.h"
-#include "wx/listbox.h"
 
-wxListBoxXmlHandler::wxListBoxXmlHandler() 
-: wxXmlResourceHandler() , m_insideBox(FALSE)
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/listbox.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler)
+
+wxListBoxXmlHandler::wxListBoxXmlHandler()
+                   : wxXmlResourceHandler(),
+                     m_insideBox(false)
 {
-    ADD_STYLE(wxLB_SINGLE);
-    ADD_STYLE(wxLB_MULTIPLE);
-    ADD_STYLE(wxLB_EXTENDED);
-    ADD_STYLE(wxLB_HSCROLL);
-    ADD_STYLE(wxLB_ALWAYS_SB);
-    ADD_STYLE(wxLB_NEEDED_SB);
-    ADD_STYLE(wxLB_SORT);
+    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 *wxListBoxXmlHandler::DoCreateResource()
-{ 
-    if( m_class == wxT("wxListBox"))
+{
+    if ( m_class == wxT("wxListBox"))
     {
         // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
+        long selection = GetLong(wxT("selection"), -1);
 
         // need to build the list of strings from children
-        m_insideBox = TRUE;
-        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
-        wxString *strings = (wxString *) NULL;
-        if( strList.GetCount() > 0 )
-        {
-            strings = new wxString[strList.GetCount()];
-            int count = strList.GetCount();
-            for( int i = 0; i < count; i++ )
-                strings[i]=strList[i];
-        }
-
-
-        wxListBox *control = new wxListBox(m_parentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    strList.GetCount(),
-                                    strings,
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
-
-        if( selection != -1 )
-            control->SetSelection( selection );
+        m_insideBox = true;
+        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
+        m_insideBox = false;
 
-        SetupWindow(control);
+        XRC_MAKE_INSTANCE(control, wxListBox)
+
+        control->Create(m_parentAsWindow,
+                        GetID(),
+                        GetPosition(), GetSize(),
+                        strList,
+                        GetStyle(),
+                        wxDefaultValidator,
+                        GetName());
 
-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
+        if (selection != -1)
+            control->SetSelection(selection);
+
+        SetupWindow(control);
+        strList.Clear();    // dump the strings
 
         return control;
     }
@@ -80,22 +74,21 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
     {
         // on the inside now.
         // handle <item>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, m_resource->GetDomain());
+        strList.Add(str);
 
         return NULL;
     }
-
 }
 
-
-
 bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxListBox")) ||
-           (m_insideBox && node->GetName() == wxT("item"))
-           );
+           (m_insideBox && node->GetName() == wxT("item")));
 }
 
-
+#endif // wxUSE_XRC && wxUSE_LISTBOX