Compile fix for the iPaq. No idea why.

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index a43d00a38a1185e9f709e2fdd3b8ade01b944430..e0afa97dd945b6e51accdcdb5859909aed48ae2d 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -13,12 +13,13 @@
 #pragma implementation "choice.h"
 #endif
 
-#ifdef VMS
+#ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
+#include "wx/defs.h"
+
 #include "wx/choice.h"
 #include "wx/utils.h"
 
@@ -171,7 +172,7 @@ wxChoice::~wxChoice()
     }
 }
 
-void wxChoice::Append(const wxString& item)
+int wxChoice::DoAppend(const wxString& item)
 {
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
 #if USE_GADGETS
@@ -225,6 +226,8 @@ void wxChoice::Append(const wxString& item)
         m_clientList.Insert( m_clientList.Item(m_noStrings-1),
                                  (wxObject*) NULL );
     m_noStrings ++;
+
+    return Number() - 1;
 }
 
 void wxChoice::Delete(int WXUNUSED(n))
@@ -516,11 +519,13 @@ int wxChoice::GetCount() const
     return Number();
 }
 
+/*
 int wxChoice::DoAppend(const wxString& item)
 {
     Append(item);
     return GetCount() - 1;
 }
+*/
 
 // Just appends, doesn't yet insert
 void wxChoice::DoInsertItems(const wxArrayString& items, int WXUNUSED(pos))