[Gtk2hs-commit] gtk2hs/gtk/general Gtk.hs,1.27,1.28

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/general
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv358/gtk/general

Modified Files:
	Gtk.hs 
Log Message:
Axel's patches to get the build to work for gtk-2.2, exclude new module bodies
so c2hs doesn't see the new functions, and change the way _stub.o files are
found so we don't try to link non-existant ones.
Everything should build for gtk-2.0 and gtk-2.2 now.


Index: Gtk.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Gtk.hs,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Gtk.hs	3 Aug 2004 04:16:56 -0000	1.27
+++ Gtk.hs	8 Aug 2004 19:04:39 -0000	1.28
@@ -58,12 +58,10 @@
   module Window,
   module Dialog,
   module FileSel,
-#if GTK_CHECK_VERSION(2,4,0)
   -- ** File dialog
   module FileChooser,
   module FileChooserDialog,
   module FileChooserWidget,
-#endif
   -- * Display widgets,
   module AccelLabel,
   module Image,
@@ -78,9 +76,7 @@
   -- * Numeric\/text data entry
   module Editable,
   module Entry,
-#if GTK_CHECK_VERSION(2,4,0)
   module EntryCompletion,
-#endif
   module HScale,
   module VScale,
   module SpinButton,
@@ -108,10 +104,8 @@
   -- * Menus, combo box, toolbar
   module CheckMenuItem,
   module Combo,
-#if GTK_CHECK_VERSION(2,4,0)
   module ComboBox,
   module ComboBoxEntry,
-#endif
   module Menu,
   module MenuBar,
   module MenuItem,
@@ -121,9 +115,7 @@
   module RadioMenuItem,
   module TearoffMenuItem,
   module Toolbar,
-#if GTK_CHECK_VERSION(2,4,0)
   module ToolItem,
-#endif
   -- selectors (file/font/color/input device)
   module ColorSelection,
   module ColorSelectionDialog,
@@ -140,9 +132,7 @@
   module HPaned,
   module Layout,
   module Notebook,
-#if GTK_CHECK_VERSION(2,4,0)
   module Expander,
-#endif
   module Table,
   module VBox,
   module VButtonBox,
@@ -209,11 +199,9 @@
 -- windows
 import Dialog
 import FileSel
-#if GTK_CHECK_VERSION(2,4,0)
 import FileChooser
 import FileChooserDialog
 import FileChooserWidget
-#endif
 import Window
 --import WindowGroup
 -- display widgets
@@ -230,9 +218,7 @@
 -- numeric\/text data entry
 import Editable
 import Entry
-#if GTK_CHECK_VERSION(2,4,0)
 import EntryCompletion
-#endif
 import HScale
 import VScale
 import SpinButton
@@ -266,10 +252,8 @@
 import TreeStore
 -- menus, combo box, toolbar
 import Combo
-#if GTK_CHECK_VERSION(2,4,0)
 import ComboBox
 import ComboBoxEntry
-#endif
 -- import ItemFactory
 import Menu
 import MenuBar
@@ -281,9 +265,7 @@
 import CheckMenuItem
 import TearoffMenuItem
 import Toolbar
-#if GTK_CHECK_VERSION(2,4,0)
 import ToolItem
-#endif
 -- selectors (file\/font\/color\/input device)
 import ColorSelection
 import ColorSelectionDialog
@@ -303,9 +285,7 @@
 import VPaned
 import Layout
 import Notebook
-#if GTK_CHECK_VERSION(2,4,0)
 import Expander
-#endif
 import Table
 -- ornaments
 import Frame