Warning fixes, source cleaning.

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

diff --git a/contrib/src/xrc/xh_combo.cpp b/contrib/src/xrc/xh_combo.cpp
index 26e9ad9abd82479282ee9288486e6ec762c29f97..ffde9361980cd7b5ac52983d87d5fc39771cd163 100644 (file)
--- a/contrib/src/xrc/xh_combo.cpp
+++ b/contrib/src/xrc/xh_combo.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_combo.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_combo.h"
 #endif


@@ -21,45 +21,44 @@
 
 #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
 

-wxComboBoxXmlHandler::wxComboBoxXmlHandler() 
-: wxXmlResourceHandler() , m_insideBox(FALSE)
+IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
+
+wxComboBoxXmlHandler::wxComboBoxXmlHandler()
+: wxXmlResourceHandler() , m_insideBox(false)

 {
 {

-    ADD_STYLE(wxCB_SIMPLE);
-    ADD_STYLE(wxCB_SORT);
-    ADD_STYLE(wxCB_READONLY);
-    ADD_STYLE(wxCB_DROPDOWN);
+    XRC_ADD_STYLE(wxCB_SIMPLE);
+    XRC_ADD_STYLE(wxCB_SORT);
+    XRC_ADD_STYLE(wxCB_READONLY);
+    XRC_ADD_STYLE(wxCB_DROPDOWN);

     AddWindowStyles();
 }
 
 wxObject *wxComboBoxXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxComboBoxXmlHandler::DoCreateResource()

-{ 
+{

     if( m_class == wxT("wxComboBox"))
     {
         // find the selection
         long selection = GetLong( wxT("selection"), -1 );
 
         // need to build the list of strings from children
     if( m_class == wxT("wxComboBox"))
     {
         // find the selection
         long selection = GetLong( wxT("selection"), -1 );
 
         // need to build the list of strings from children

-        m_insideBox = TRUE;
-        CreateChildrenPrivately( NULL, GetParamNode(wxT("content")));
+        m_insideBox = true;
+        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));

         wxString *strings = (wxString *) NULL;
         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++ )
+            for (int i = 0; i < count; i++)

                 strings[i]=strList[i];
         }
 
                 strings[i]=strList[i];
         }
 

+        XRC_MAKE_INSTANCE(control, wxComboBox)

 
 

-        wxComboBox *control = wxStaticCast(m_instance, wxComboBox);
-
-        if (!control)
-           control = new wxComboBox;
-            
-       control->Create(m_parentAsWindow,
+        control->Create(m_parentAsWindow,

                         GetID(),
                         GetText(wxT("value")),
                         GetPosition(), GetSize(),
                         GetID(),
                         GetText(wxT("value")),
                         GetPosition(), GetSize(),


@@ -69,14 +68,14 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
                         wxDefaultValidator,
                         GetName());
 
                         wxDefaultValidator,
                         GetName());
 

-        if( selection != -1 )
-            control->SetSelection( selection );
+        if (selection != -1)
+            control->SetSelection(selection);

 
         SetupWindow(control);
 
 
         SetupWindow(control);
 

-        if( strings != NULL )
-            delete [] strings;
-        strList.Clear();    // dump the strings   
+        if (strings != NULL)
+            delete[] strings;
+        strList.Clear();    // dump the strings

 
         return control;
     }
 
         return control;
     }


@@ -86,20 +85,19 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
         // 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);
+        strList.Add(str);

 
         return NULL;
     }
 
         return NULL;
     }

-

 }
 
 }
 

-
-

 bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxComboBox")) ||
 bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return (IsOfClass(node, wxT("wxComboBox")) ||

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

 }
 
 #endif
 }
 
 #endif