merge of wxMac into main repository

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index cf6a80e27ac859ac456d25ccc1e71fa33089543e..8ff7ab4cd11006ada8543f7999c4db9819c22387 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -12,6 +12,12 @@
 #pragma implementation "listbox.h"
 #endif
 
 #pragma implementation "listbox.h"
 #endif
 

+#ifdef __VMS
+#define gtk_scrolled_window_add_with_viewport gtk_scrolled_window_add_with_vi
+#define gtk_container_set_focus_vadjustment gtk_container_set_focus_vadjust
+#define gtk_scrolled_window_get_vadjustment gtk_scrolled_window_get_vadjust
+#endif
+

 #include "wx/listbox.h"
 
 #if wxUSE_LISTBOX
 #include "wx/listbox.h"
 
 #if wxUSE_LISTBOX


@@ -26,7 +32,7 @@
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"
 #endif
 

-#include <gdk/gdk.h>
+# include <gdk/gdk.h>

 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 


@@ -349,7 +355,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );

     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );