compilation fixes

[wxWidgets.git] / src / gtk.inc

diff --git a/src/gtk.inc b/src/gtk.inc
index 33c7871a84d3d550bec90f1a941273e4de26a49a..5df08d7d71a0c3cef0280634fd032b42d90d2bfd 100644 (file)
--- a/src/gtk.inc
+++ b/src/gtk.inc
@@ -2,9 +2,9 @@
 NONE =
 
 # define library name
-LIB_TARGET=wx_gtk
+LIB_TARGET=wx_gtk2
 LIB_MAJOR=1
-LIB_MINOR=91
+LIB_MINOR=0
 
 # define library sources
 
@@ -13,6 +13,7 @@ LIB_CPP_SRC=\
  common/cmndata.cpp \
  common/config.cpp \
  common/date.cpp \
+ common/dcbase.cpp \
  common/docmdi.cpp \
  common/docview.cpp \
  common/dynarray.cpp \
@@ -25,47 +26,74 @@ LIB_CPP_SRC=\
  common/hash.cpp \
  common/helpbase.cpp \
  common/intl.cpp \
+ common/image.cpp \
+ common/imagjpeg.cpp \
+ common/imagpng.cpp \
+ common/imaggif.cpp \
  common/ipcbase.cpp \
  common/layout.cpp \
  common/list.cpp \
  common/log.cpp \
  common/matrix.cpp \
  common/memory.cpp \
+ common/mimetype.cpp \
  common/module.cpp \
  common/object.cpp \
- common/postscrp.cpp \
+ common/db.cpp \
+ common/dbtable.cpp \
  common/prntbase.cpp \
- common/resource.cpp \
  common/serbase.cpp \
+ common/paper.cpp \
  common/string.cpp \
  common/textfile.cpp \
  common/time.cpp \
  common/timercmn.cpp \
+ common/tbarsmpl.cpp \
  common/utilscmn.cpp \
  common/wincmn.cpp \
  common/framecmn.cpp \
  common/stream.cpp \
+ common/wfstream.cpp \
  common/datstrm.cpp \
- common/fstream.cpp \
  common/mstream.cpp \
  common/zstream.cpp \
  common/objstrm.cpp \
+ common/sckstrm.cpp \
  common/validate.cpp \
+ common/valgen.cpp \
  common/valtext.cpp \
+ common/variant.cpp \
+ common/socket.cpp \
+ common/sckint.cpp \
+ common/sckaddr.cpp \
+ common/sckipc.cpp \
+ common/protocol.cpp \
+ common/http.cpp \
+ common/ftp.cpp \
+ common/url.cpp \
+ common/tbarbase.cpp \
+ common/tokenzr.cpp \
+ common/resource.cpp \
  common/wxexpr.cpp \
+ common/process.cpp \
+ common/wxchar.cpp \
 \
+ gtk/accel.cpp \
  gtk/app.cpp \
  gtk/bitmap.cpp \
  gtk/bmpbuttn.cpp \
  gtk/brush.cpp \
  gtk/button.cpp \
  gtk/checkbox.cpp \
+ gtk/checklst.cpp \
  gtk/choice.cpp \
+ gtk/clipbrd.cpp \
  gtk/colour.cpp \
  gtk/control.cpp \
  gtk/combobox.cpp \
  gtk/cursor.cpp \
  gtk/data.cpp \
+ gtk/dataobj.cpp \
  gtk/dc.cpp \
  gtk/dcclient.cpp \
  gtk/dcmemory.cpp \
@@ -79,8 +107,10 @@ LIB_CPP_SRC=\
  gtk/gdiobj.cpp \
  gtk/icon.cpp \
  gtk/listbox.cpp \
+ gtk/main.cpp \
  gtk/mdi.cpp \
  gtk/menu.cpp \
+ gtk/minifram.cpp \
  gtk/notebook.cpp \
  gtk/palette.cpp \
  gtk/pen.cpp \
@@ -90,91 +120,50 @@ LIB_CPP_SRC=\
  gtk/scrolbar.cpp \
  gtk/settings.cpp \
  gtk/slider.cpp \
+ gtk/spinbutt.cpp \
  gtk/statbox.cpp \
  gtk/statbmp.cpp \
+ gtk/statline.cpp \
  gtk/stattext.cpp \
  gtk/tbargtk.cpp \
  gtk/textctrl.cpp \
  gtk/timer.cpp \
+ gtk/tooltip.cpp \
  gtk/utilsgtk.cpp \
  gtk/utilsres.cpp \
  gtk/window.cpp \
 \
+ unix/utilsunx.cpp \
+\
+ generic/caret.cpp \
  generic/choicdgg.cpp \
+ generic/dcpsg.cpp \
  generic/colrdlgg.cpp \
+ generic/dirdlgg.cpp \
  generic/fontdlgg.cpp \
  generic/gridg.cpp \
  generic/imaglist.cpp \
  generic/listctrl.cpp \
+ generic/laywin.cpp \
  generic/msgdlgg.cpp \
  generic/panelg.cpp \
  generic/printps.cpp \
  generic/prntdlgg.cpp \
+ generic/prop.cpp \
+ generic/propform.cpp \
+ generic/proplist.cpp \
+ generic/sashwin.cpp \
  generic/scrolwin.cpp \
  generic/splitter.cpp \
  generic/statusbr.cpp \
  generic/tabg.cpp \
  generic/textdlgg.cpp \
- generic/treectrl.cpp
- 
- 
+ generic/treectrl.cpp \
+ generic/helpext.cpp \
+ generic/helphtml.cpp \
+ generic/progdlgg.cpp
+
 LIB_C_SRC=\
  common/extended.c \
 \
- gtk/win_gtk.c \
-\
- png/png.c \
- png/pngset.c \
- png/pngget.c \
- png/pngrutil.c \
- png/pngtrans.c \
- png/pngwutil.c \
- png/pngread.c \
- png/pngrio.c \
- png/pngwio.c \
- png/pngwrite.c \
- png/pngrtran.c \
- png/pngwtran.c \
- png/pngmem.c \
- png/pngerror.c \
- png/pngpread.c \
-\
- zlib/adler32.c \
- zlib/compress.c \
- zlib/crc32.c \
- zlib/gzio.c \
- zlib/uncompr.c \
- zlib/deflate.c \
- zlib/trees.c \
- zlib/zutil.c \
- zlib/inflate.c \
- zlib/infblock.c \
- zlib/inftrees.c \
- zlib/infcodes.c \
- zlib/infutil.c \
- zlib/inffast.c \
-\
- gdk_imlib/cache.c \
- gdk_imlib/colors.c \
- gdk_imlib/globals.c \
- gdk_imlib/load.c \
- gdk_imlib/misc.c \
- gdk_imlib/rend.c \
- gdk_imlib/save.c \
- gdk_imlib/utils.c 
-# \
-#  iodbc/dlf.c \
-#  iodbc/dlproc.c \
-#  iodbc/herr.c \
-#  iodbc/henv.c \
-#  iodbc/hdbc.c \
-#  iodbc/hstmt.c \
-#  iodbc/connect.c \
-#  iodbc/prepare.c \
-#  iodbc/result.c \
-#  iodbc/execute.c \
-#  iodbc/fetch.c \
-#  iodbc/info.c \
-#  iodbc/catalog.c \
-#  iodbc/misc.c \
-#  iodbc/itrace.c
+ gtk/win_gtk.c