The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

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

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index 3d708c3a49256e4b365ea075931bc52fb97947a6..837633de09ea15f4c347319b040abbceaebb3f90 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -19,14 +19,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_COMBOBOX
+

 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"
 #include "wx/intl.h"
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"
 #include "wx/intl.h"
 

-#if wxUSE_COMBOBOX
+IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)

 
 

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

 {
     XRC_ADD_STYLE(wxCB_SIMPLE);
     XRC_ADD_STYLE(wxCB_SORT);
 {
     XRC_ADD_STYLE(wxCB_SIMPLE);
     XRC_ADD_STYLE(wxCB_SORT);


@@ -36,14 +38,14 @@ wxComboBoxXmlHandler::wxComboBoxXmlHandler()
 }
 
 wxObject *wxComboBoxXmlHandler::DoCreateResource()
 }
 
 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;
+        m_insideBox = true;

         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if (strList.GetCount() > 0)
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if (strList.GetCount() > 0)


@@ -73,7 +75,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
 
         if (strings != NULL)
             delete[] strings;
 
         if (strings != NULL)
             delete[] strings;

-        strList.Clear();    // dump the strings   
+        strList.Clear();    // dump the strings

 
         return control;
     }
 
         return control;
     }


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

-        strList.Add(wxGetTranslation(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;
     }


@@ -95,4 +100,4 @@ bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_COMBOBOX