pressing PageDown and then PageUp should return to the same item

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 34079657648e46d8cd48b268ff568658c1f472ae..466b14e7e583830cac203b9f806b97e785aff62d 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -179,7 +179,7 @@ int wxChoice::DoAppend(const wxString& item)
 #endif
         NULL);
 
-    DoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
+    wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
 
     if( m_font.Ok() )
         wxDoChangeFont( w, m_font );
@@ -209,6 +209,14 @@ int wxChoice::DoAppend(const wxString& item)
     return GetCount() - 1;
 }
 
+int wxChoice::DoInsert(const wxString& item, int pos)
+{
+    wxCHECK_MSG(FALSE, -1, wxT("insert not implemented"));
+
+//    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+//    if (pos == GetCount()) return DoAppend(item);
+}
+
 void wxChoice::Delete(int n)
 {
     Widget w = (Widget)m_widgetArray[n];
@@ -459,22 +467,22 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
 
 void wxChoice::ChangeBackgroundColour()
 {
-    DoChangeBackgroundColour(m_formWidget, m_backgroundColour);
-    DoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
-    DoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
     size_t i;
     for (i = 0; i < m_noStrings; i++)
-        DoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
+        wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
 }
 
 void wxChoice::ChangeForegroundColour()
 {
-    DoChangeForegroundColour(m_formWidget, m_foregroundColour);
-    DoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
-    DoChangeForegroundColour(m_menuWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);
     size_t i;
     for (i = 0; i < m_noStrings; i++)
-        DoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
+        wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 
 int wxChoice::GetCount() const