add wxScrollHelper::ShowScrollbars() (implemented for GTK only right now, generic...

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 4083a88ebd6bee1e1a9fee7cf2a5603d8a94ddd4..f7326ad98c0ce0926b79d7561915a7f21424c4ae 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -121,6 +121,8 @@ void wxComboBox::DoSetSize(int x, int y,
     wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);
 }
 
+#if 0
+// Already defined in include/motif/combobox.h
 wxString wxComboBox::GetValue() const
 {
     char *s = XmComboBoxGetString ((Widget) m_mainWidget);
@@ -133,6 +135,7 @@ wxString wxComboBox::GetValue() const
     else
         return wxEmptyString;
 }
+#endif
 
 void wxComboBox::SetValue(const wxString& value)
 {
@@ -184,7 +187,7 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
     m_noStrings--;
 }
 
-void wxComboBox::DoClear()
+void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
     m_stringList.Clear();
@@ -236,68 +239,6 @@ int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const
     return wxNOT_FOUND;
 }
 
-// Clipboard operations
-void wxComboBox::Copy()
-{
-    XmComboBoxCopy((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxComboBox::Cut()
-{
-    XmComboBoxCut((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxComboBox::Paste()
-{
-    XmComboBoxPaste((Widget) m_mainWidget);
-}
-
-void wxComboBox::SetEditable(bool WXUNUSED(editable))
-{
-    // TODO
-}
-
-void wxComboBox::SetInsertionPoint(long pos)
-{
-    XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) pos);
-}
-
-void wxComboBox::SetInsertionPointEnd()
-{
-    XmTextPosition pos = XmComboBoxGetLastPosition ((Widget) m_mainWidget);
-    XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) (pos + 1));
-}
-
-long wxComboBox::GetInsertionPoint() const
-{
-    return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget);
-}
-
-wxTextPos wxComboBox::GetLastPosition() const
-{
-    return (wxTextPos) XmComboBoxGetLastPosition ((Widget) m_mainWidget);
-}
-
-void wxComboBox::Replace(long from, long to, const wxString& value)
-{
-    XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
-                       (XmTextPosition) to,
-                       value.char_str());
-}
-
-void wxComboBox::Remove(long from, long to)
-{
-    XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                      (Time) 0);
-    XmComboBoxRemove ((Widget) m_mainWidget);
-}
-
-void wxComboBox::SetSelection(long from, long to)
-{
-    XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                      (Time) 0);
-}
-
 void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs)
 {
@@ -366,6 +307,11 @@ wxSize wxComboBox::DoGetBestSize() const
         return wxWindow::DoGetBestSize();
 }
 
+WXWidget wxComboBox::GetTextWidget() const
+{
+    return (WXWidget)XmComboBoxGetEditWidget((Widget) m_mainWidget);
+}
+
 #endif // XmVersion < 2000
 
 #endif // wxUSE_COMBOBOX