From b33c8d22ccc7f7d059c2d0daaa2a86f6e30e7315 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 29 Mar 2002 21:11:00 +0000 Subject: [PATCH] Removed old #ifdef from GTK 1.0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/listbox.cpp | 12 ------------ src/gtk1/listbox.cpp | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 56089bfd2c..d54e30e324 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -37,14 +37,6 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; -//------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- - -#if (GTK_MINOR_VERSION > 0) - #define NEW_GTK_SCROLL_CODE -#endif - //----------------------------------------------------------------------------- // private functions //----------------------------------------------------------------------------- @@ -379,11 +371,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); -#ifdef NEW_GTK_SCROLL_CODE gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) ); -#else - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) ); -#endif /* make list scroll when moving the focus down using cursor keys */ gtk_container_set_focus_vadjustment( diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 56089bfd2c..d54e30e324 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -37,14 +37,6 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; -//------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- - -#if (GTK_MINOR_VERSION > 0) - #define NEW_GTK_SCROLL_CODE -#endif - //----------------------------------------------------------------------------- // private functions //----------------------------------------------------------------------------- @@ -379,11 +371,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); -#ifdef NEW_GTK_SCROLL_CODE gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) ); -#else - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) ); -#endif /* make list scroll when moving the focus down using cursor keys */ gtk_container_set_focus_vadjustment( -- 2.45.2