do NOT hard code univ sources in x11 port

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

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 706ea7297d61a0a594218e04e35168be7c2a6db4..3502c25afce81e698d6c76bcf4a017701ef3f98a 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -13,7 +13,12 @@
     #pragma implementation "listbox.h"
 #endif
 
-#include "wx/listbox.h"
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
+#endif
+
+# include "wx/listbox.h"
 #include "wx/settings.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
@@ -28,9 +33,7 @@
 #endif
 #include "wx/motif/private.h"
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-#endif
 
 static void wxListBoxCallback(Widget w,
                               XtPointer clientData,
@@ -411,7 +414,7 @@ void wxListBox::SetSelection(int N, bool select)
     m_inSetValue = FALSE;
 }
 
-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const
 {
     // In Motif, no simple way to determine if the item is selected.
     wxArrayInt theSelections;
@@ -757,7 +760,7 @@ void wxListBox::ChangeBackgroundColour()
    /* TODO: should scrollbars be affected? Should probably have separate
     * function to change them (by default, taken from wxSystemSettings)
     */
-    wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
     DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);