code

[wxWidgets.git] / src / motif / combobox.cpp

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 36e322073f2c621e40ec0622533fa35e6f5adf14..5e81729e67304d89976420976f8e7281eb09714d 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -13,10 +13,12 @@
 #pragma implementation "combobox.h"
 #endif
 
 #pragma implementation "combobox.h"
 #endif
 

-#include "wx/combobox.h"
+#include "wx/setup.h"

 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

+#include "wx/combobox.h"
+

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif


@@ -24,6 +26,10 @@
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif

+
+// use the old, GPL'd combobox
+#if (XmVersion < 2000)
+

 #include "xmcombo/xmcombo.h"
 
 #include "wx/motif/private.h"
 #include "xmcombo/xmcombo.h"
 
 #include "wx/motif/private.h"


@@ -124,6 +130,11 @@ void wxComboBox::SetValue(const wxString& value)
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

+void wxComboBox::SetString(int n, const wxString& s)
+{
+    wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") );
+}
+

 int wxComboBox::DoAppend(const wxString& item)
 {
     wxXmString str( item.c_str() );
 int wxComboBox::DoAppend(const wxString& item)
 {
     wxXmString str( item.c_str() );


@@ -269,7 +280,8 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     case XmCR_SINGLE_SELECT:
     case XmCR_BROWSE_SELECT:
         {
     case XmCR_SINGLE_SELECT:
     case XmCR_BROWSE_SELECT:
         {

-            wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId());
+            wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
+                                  item->GetId());

             event.m_commandInt = cbs->index - 1;
             event.m_commandString = item->GetString (event.m_commandInt);
             if ( item->HasClientObjectData() )
             event.m_commandInt = cbs->index - 1;
             event.m_commandString = item->GetString (event.m_commandInt);
             if ( item->HasClientObjectData() )


@@ -326,5 +338,6 @@ wxSize wxComboBox::DoGetBestSize() const
         return wxWindow::DoGetBestSize();
 }
 
         return wxWindow::DoGetBestSize();
 }
 

-#endif
+#endif // XmVersion < 2000

 
 

+#endif // wxUSE_COMBOBOX