diff --git a/bugs/FontFixed.hs b/bugs/FontFixed.hs
new file mode 100644
--- /dev/null
+++ b/bugs/FontFixed.hs
@@ -0,0 +1,32 @@
+module Main where
+
+import Graphics.UI.WX
+
+-- To reproduce the bug, copy the text from the lower text widget to
+-- the upper text widget.
+
+main = start $
+       do f  <- frame [ text := "Problems with font" ]
+          p  <- panel f []
+          tcOne <- textCtrl p [ ]
+          tcTwo <- textCtrl p [ ]
+          set tcOne [ font := fontFixed ]
+          set tcTwo [ font := fontFixed ]
+          set tcTwo [ text := monoText ]
+          set f [ layout := container p $ column 10 [ fill $ widget tcOne, fill $ widget tcTwo ]
+                , size := Size 640 480
+                ]
+
+monoText :: String
+monoText = "123456789\n" ++
+           "      789"
+
+{-
+-- A nasty workaround for removing bug, it to periodically get and re-set the
+-- text control contents:
+
+          timer f [ interval   := 500
+                  , on command :=  do xs <- get tcTwo text
+                                      set tcTwo [ text := xs ]  
+                  ]
+-}
diff --git a/bugs/NonModalDialog.hs b/bugs/NonModalDialog.hs
new file mode 100644
--- /dev/null
+++ b/bugs/NonModalDialog.hs
@@ -0,0 +1,13 @@
+-- Compile with ghc -fglasgow-exts
+-- --make NonModalDialogTest.hs -o
+-- NonModalDialogTest
+
+module Main where
+import Graphics.UI.WX
+main = start $ do
+         f <- frame [ text := "program" ]
+         w <- get f parent    -- added line
+         d <- dialog w [ text := "Some dialog" ]
+         let bugtext = unlines [ "Bug: closing these two windows should exit the"
+                               , "program, but it does not" ]
+         set d [ visible := True, layout := margin 10 $ label bugtext ]
diff --git a/bugs/StartStart.hs b/bugs/StartStart.hs
new file mode 100644
--- /dev/null
+++ b/bugs/StartStart.hs
@@ -0,0 +1,12 @@
+import Graphics.UI.WX
+
+bugtext = "Bug: clicking this button\n"
+ ++ "(which closes the window)\n"
+ ++ "causes a crash"
+
+main = start f >> start f
+ where
+   f = do w <- frame []
+          b <- button w [ text := "Crash me" , on command := close w ]
+          set w [ layout := fill $ column 2 [ label bugtext, widget b ] ]
+          return ()
diff --git a/bugs/SubMenu.hs b/bugs/SubMenu.hs
new file mode 100644
--- /dev/null
+++ b/bugs/SubMenu.hs
@@ -0,0 +1,56 @@
+{- From Maarten <maarten <at> snowlion.nl>
+-
+The following code doesn't seem to work properly. Either the main entry
+(m1/mp1) or it's sub menu entry (ms1/mps1) do not seem to propagate the
+event when pressed. It is possible to make it working by uncomments the
+lines where the menu commands are registered in the frame.
+-}
+
+module Main where
+
+import Graphics.UI.WX
+
+main :: IO ()
+main = start gui
+
+gui :: IO ()
+gui = do
+  f <- frame [ text := "Hello world!" ]
+
+  m   <- menuPane [ text := "&Menu" ]
+  m1 <- menuItem m [ text := "Menu m1"
+                   , on command := putStrLn "menu m1"]
+  --  set f [ on (menu m1) := putStrLn "menu m1" ]
+  menuLine m
+  sub <- menuPane [text := "Sub menu"]
+  ms1 <- menuItem sub [ text := "submenu ms1"
+                      , on command := putStrLn "submenu ms1" ]
+  --  set f [ on (menu ms1) := putStrLn "submenu ms1" ]
+  menuSub m sub [ text := "Sub" ]
+  menuItem m [text := "E&xit", on command := close f]
+
+  set f [menuBar := [m], on mouse := mouseEvent f, clientSize := sz 200 200 ]
+  return ()
+
+mouseEvent f eventMouse = do
+  case eventMouse of
+    MouseRightDown mousePoint _ -> doPopup f mousePoint
+    _ -> return ()
+
+doPopup f mousePoint = do
+  m <- makePopupMenu f "&Popup" "Doesnt' work..."
+  menuPopup m mousePoint f
+  objectDelete m
+
+makePopupMenu f c t = do
+  mp   <- menuPane [ text := c ]
+  mp1 <- menuItem mp [ text := "Popup mp1"
+                     , on command := putStrLn "popup mp1"]
+  --  set f [ on (menu mp1) := putStrLn "popup mp1" ]
+  menuLine mp
+  sub <- menuPane [text := "more text"]
+  mps1 <- menuItem sub [ text := "Popup mps1"
+                       , on command := putStrLn "popup mps1"]
+  menuSub mp sub [ text := "Sub" ]
+  --  set f [ on (menu mps1) := putStrLn "popup mps1" ]
+  return mp
diff --git a/bugs/TextColor.hs b/bugs/TextColor.hs
new file mode 100644
--- /dev/null
+++ b/bugs/TextColor.hs
@@ -0,0 +1,17 @@
+import Graphics.UI.WX
+
+bugtext = unlines
+ [ "Bug: the text in all these entry fields should be red,"
+ , "it is black in the first two" ]
+
+
+main = start $
+  do f <- frame []
+     e1 <- entry f [text := "hello", textColor := red]
+     t1 <- textCtrlRich f [text := "bad", textColor := red]
+     t2 <- textCtrlRich f [textColor := red]
+     set t2 [text := "good"]
+     set f [ layout := column 4 [ label bugtext
+                                , widget e1
+                                , widget t1
+                                , widget t2 ]]
diff --git a/changes.txt b/changes.txt
--- a/changes.txt
+++ b/changes.txt
@@ -4,6 +4,41 @@
   See license.txt for details.
 ----------------------------------------------------------------------
 
+Version 0.10.3
+-------------
+Non backward compatible changes:
+- Changed repository to darcs
+- Changed encoding to Unicode
+- Changed the configuration, make files, and install scripts to work 
+  with GHC 6.6, GHC 6.8 or higher
+- Added basic cabal script
+- Added Haddock2 support
+- Added "--with-mediactrl" argument to configure script
+- Added "--with-stc" argument to configure script
+- Added "--hcprof" argument to configure script for builing profiling 
+  version of library
+- Added "--enable-split-objs" argument to configure script
+
+Backward compatible additions:
+- Added CalendarCtrl events
+- Added StyledTextCtrl events
+- Added Drag & Drop events
+- Added TaskBar icon events
+- Added "Wave" type synonym. But "Wave" type is deprecated. Use "Sound"
+  instead of "Wave".
+- Added MediaCtrl control
+- Added "Media" class
+- Changed "play" function to "Media" classes' method
+
+Bugfixes:
+- Fixed bug in listCtrl. "get" returns null string
+- Fixed old example
+- wxcore's BouncingBalls example disabled the close button.
+- treeCtrl now returns all children for node, not just the first one
+- avoided a segfault in image getPixelData (bug 1003006)
+- boxed combinator no longer 'disables' the widgets it contains (bug 1549363)
+- Fixed bug where dbGetDataSources only returns the first letter of every word.
+
 Version 0.9.4-1
 -------------
 Bugfixes:
@@ -42,62 +77,4 @@
 
 Bug fixes:
 - fixed "on command" event handlers in submenus.
-
-Version 0.8
--------------
-Non backward compatible changes:
-- Added wildcards argument to the "fileSaveDialog" function.
-- Removed the call to "buttonSetDefault" in the "defaultButton" 
-  property since GTK seems to enlarge the button in that case.
-- Removed alignment argument for text controls
-- Removed sorted and labels argument for choice and combo boxes.
-- Removed sorted argument for listboxes.
-- Added default "stretch" to every toplevel layout, assuring that
-  such layout gets at least all available space assigned.
-- (un)set "maximize box" when "resizeable" is set.
-- Removed default "wxTAB_TRAVERSAL" style on frames (to make the grid
-  work correctly).
-- Renamed "WXCore.WxcClassTypes" to "WXCore.WxcClassInfo".
-- Ignore double buffering on the Mac toolkit to avoid bugs (?) in
-  wxMac 2.5.2.
-
-Backward compatible additions:
-- Added pure "bitmap" and "sound"
-- Added "variable" objects (mutable variables)
-- Added custom control demo.
-- Made "refresh" erase the background too.
-- Added "children" attribute for windows.
-- Added "border" attribute for windows.
-- Added "tabTraversal" attribute for windows.
-- Added wxGrid events and demo (samples/wx/Grid.hs).
-- Improved signatures for wxGrid.
-- Added "changes.txt" file :-)
-- Added "HAS_RADIO_MENU_ITEMS" to "isDefined".
-- Added support for radio menu items.
-- New wxHaskell+HOpenGL sample added to the contributions. Thanks
-  to Shelarcy and Sean Seefried.
-- Added "Align" and "Wrapped" classes to set alignment
-  and wrap mode for text controls.
-- Added "Sorted" class to set the sort mode of choice, combo box,
-  and listbox controls.
-- Added "creation time" attributes that use reflective attributes
-  not compositional (and thus not so nice), but very convenient!
-- Added "entry" as shorthand for "textEntry"
-- Added "SystemColor" and "colorSystem" to get standard system colors.
-- Defaulted background color of "Frame"s to Color3DFace (as a Panel).
-- Made the definition of "Closure" in "wrappers.h" more liberal to 
-  support wxOCaml better.
-- Added "frameCentre" method
-- Huge internal changes: split up wxcClasses in three files and added
-  support for managed objects like bitmaps. Also added checks for NULL 
-  pointers. 
-
-
-Bug fixes:
-- HtmlLinkClicked events are now properly generated.
-- Fixed bug that crashed wxHaskell when a tree control had the focus
-  and a key was pressed. Thanks to Olivier Spier for sending a fix.
-- The "item" attribute of a list control always returned the first
-  item and disregarded the parameter. Thanks to Olivier Spier for 
-  sending a fix.
 
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -12,7 +12,7 @@
 #--------------------------------------------------------------------
 # Versioning
 #--------------------------------------------------------------------
-version="0.10.2"
+version="0.10.3"
 release="0"
 
 #--------------------------------------------------------------------
@@ -28,7 +28,9 @@
 
 # haskell
 hc="ghc"
+hcflags=""
 hcpkg="ghc-pkg"
+hcprof="-prof -auto-all"
 hcpkglocal=""
 hdoc="haddock"
 
@@ -54,12 +56,13 @@
 wxtoolkit=""
 wxversion=""
 extraldopts=""
-withopengl="no"
 
 # check architecture, for mac os x
 architecture=""
 
-# stc
+# extras
+withopengl="no"
+withmediactrl="no"
 withstc="no"
 wxcstc=""
 
@@ -203,15 +206,7 @@
 fi
 fi
 
-# guess base.haddock location
-if findprogram "ghc"; then
-  guesshdocbase="`which ghc | sed -e 's|/bin/ghc|/doc/html/base/base.haddock|'`"
-  if test -f "$guesshdocbase"; then
-    hdocbase="$guesshdocbase"
-  fi
-fi
 
-
 # improve the guesses if wx-config is present.
 if findprogram "$wxconfig"; then
   # improve prefix guess
@@ -287,6 +282,7 @@
 	  echo " --help                 show this information"
 	  echo " --hc=<program>         the haskell compiler [$hc]"
 	  echo " --hcpkg=<program>      package compiler [$hcpkg]"
+          echo " --hcprof=<flags>       enable profiling (using flags [$hcprof])"
 	  echo " --package-conf=<file>  optional local package configuration [$hcpkglocal]"
 	  echo " --version=<version>    library version [$version]"
 	  echo " --release=<version>    library release version [$release]"
@@ -308,7 +304,8 @@
 	  echo "wxwidgets options:"
 	  echo " --wx-toolkit=<name>    wxWidgets gui toolkit [$wxtoolkit]"
 	  echo " --with-opengl          enable openGL support [$withopengl]"
-	  echo " --with-stc             enable stc support [$withstc]"
+	  echo " --with-mediactrl       enable mediactrl support [$withmediactrl]"
+          echo " --with-stc             enable stc support [$withstc]"
 	  echo " --wx-config=<program>  wxWidgets configure script [$wxconfig]"
 	  echo ""
 	  echo "platform options:"
@@ -331,6 +328,13 @@
 	  hc="$arg";;
       -hcpkg=*|--hcpkg=*)
 	  hcpkg="$arg";;
+      -hcflags=*|--hcflags=*)
+	  hcflags="$arg";;
+      -hcprof|--hcprof)
+	  enableprof="yes";;
+      -hcprof=*|--hcprof=*)
+	  hcprof="$arg"
+	  enableprof="yes";;
       -package-conf=*|--package-conf=*)
 	  hcpkglocal="$arg";;
       -version=*|--version=*)
@@ -353,6 +357,8 @@
       -libexecdir=*|--libexecdir=*) ;; # just for cabal
       -shared-prefix=*|--shared-prefix=*)
 	  sharedprefix="$arg";;
+      -enable-split-objs|--enable-split-objs)
+	  enablesplitobjs="yes";;
       -enable-strip|--enable-strip)
 	  enablestrip="yes";;
       -disable-strip|--disable-strip)
@@ -371,6 +377,8 @@
 	  wxtoolkit="$arg";;
       -with-opengl|--with-opengl)
 	  withopengl="yes";;
+      -with-mediactrl|--with-mediactrl)
+	  withmediactrl="yes";;
       -with-stc|--with-stc)
 	  withstc="yes";;
       -wx-config=*|--wx-config=*)
@@ -474,23 +482,28 @@
   # initialize options for wxc
   cxx="`$wxconfig --cxx`"
   wxwincxxflags="`$wxconfig --cxxflags`"
-  
+
+  wxlibswanted="std"
   if test "$withopengl" = "yes"; then
-   wxwinlibs="`$wxconfig --libs std media --gl-libs | tr '\n' ' '`"
+    wxlibswanted="$wxlibswanted gl"
   else
-   wxwinlibs="`$wxconfig --libs std media`"
+    # override wxUSE_GLCANVAS=1 in the wxWidgets setup.h
+    # file so that we can compile without --with-opengl
+    # even if our wxWidgets supports it
+    wxwincxxflags="-DwxcREFUSE_OPENGL $wxwincxxflags"
   fi
 
-  # add wxSTC
+  if test "$withmediactrl" = "yes"; then
+    wxlibswanted="$wxlibswanted media"
+  else
+    wxwincxxflags="-DwxcREFUSE_MEDIACTRL $wxwincxxflags"
+  fi
+
   if test "$withstc" = "yes"; then
-    if test "$withopengl" = "yes"; then
-      wxwinlibs="`$wxconfig --libs std media stc --gl-libs | tr '\n' ' '`"
-      # wxwinlibs="$wxwinlibs -L wxSTC-D3/lib -lwx_gtk2_stc_d3-2.4"
-    else
-     wxwinlibs="`$wxconfig --libs std media stc`"
-    fi
+    wxlibswanted="$wxlibswanted stc"
     wxcstc="-DwxUSE_STC=1"
   fi
+  wxwinlibs="`$wxconfig --libs $wxlibswanted`"
 
   # version
   wxversion="`$wxconfig --version`"
@@ -579,6 +592,10 @@
 	echo ""
 	ghcold="yes";;
     6.0* | 6.1* | 6.2*)
+	echo "WARNING:"
+	echo " You seem to have an older ghc installed, namely $hcversion"
+        echo " Support for GHC version prior to 6.4 has been removed for simplicity."
+        echo " It is strongly advised to upgrade to a newer version."
 	ghcold="yes";;
     6.*) ;;
     7.*) ;;
@@ -635,6 +652,33 @@
 esac
 
 #--------------------------------------------------------------------
+# Support for Data.Time ?
+#--------------------------------------------------------------------
+
+#GHC 6.6 do not support Data.Time and if no seperate Data.Time package
+#is installed we need to use the old System.Time package.
+
+echo -n " Data.Time package "
+
+cat > TestDataTime.hs << EOF
+module Main
+where
+import Data.Time
+main :: IO ()
+main = return ()
+EOF
+
+if runhaskell TestDataTime.hs >/dev/null 2>&1 ; then
+    hasdatatime="";
+    echo found
+else
+    hasdatatime="-DNO_DATA_TIME";
+    echo "not found"
+fi
+
+rm TestDataTime.hs
+
+#--------------------------------------------------------------------
 # Haddock
 #--------------------------------------------------------------------
 # Do we have haddock?
@@ -648,36 +692,63 @@
   echo " You can specify the haddock executable on the command line."
   echo " For example: ./configure --haddock=/usr/local/bin/haddock"
   echo ""
-  hdocbase=""
+  hdocbases=""
   hdocfound="no"
 fi
 
+# guess base.haddock location
+if findprogram "ghc"; then
+  guesshdocbase="`which ghc | sed -e 's|/bin/ghc|/doc/html/base/base.haddock|'`"
+  if test -f "$guesshdocbase"; then
+    hdocbases="$guesshdocbase"
+  fi
+  if test "$cygpathfound"; then
+    guessghclibdir=`which ghc | sed -e 's|/bin/ghc||'`
+    normghclibdir="`cygpath -w $guessghclibdir | sed -e 's|\\\\|/|g'`"
+  else
+    guessghclibdir=`which ghc | sed -e "s|/bin/ghc|/lib/ghc-$hcversion|"`
+    normghclibdir="$guessghclibdir"
+  fi
+  haddockversion=`haddock --version | sed -e "s|.*version \([0-9]*\)\..*|\1|"`
+  if test -d "$normghclibdir" -a $haddockversion -eq "2"; then
+    hdocbases="$hdocbases -B $normghclibdir"
+  fi
+fi
 
+
 # Find .haddock files
 if test "$hdocfound" = "yes"; then
   if findprogram "ghc"; then
     ghcroot="`which ghc | sed -e 's|/bin/ghc||'`"
-    docroot="$ghcroot/doc/html/libraries"
+    # set correct haddock root directory
+    case "$hcversion" in
+      6.0* | 6.1* | 6.2* | 6.3* | 6.4* | 6.5* | 6.6*)
+	docroot="$ghcroot/doc/html/libraries";;
+      6.*) 
+         if test "$cygpathfound"; then
+           docroot="$ghcroot/doc/libraries"
+         else
+           docroot="$ghcroot/share/doc/ghc/libraries"
+         fi
+         ;;
+      *)
+	docroot="$ghcroot/doc/libraries";;
+    esac
     # normalize the root since haddock doesn't like unix names
     if test "$cygpathfound"; then
       normdocroot="`cygpath -w $docroot | sed -e 's|\\\\|/|g'`"
-    fi
-
-    if test -d "$docroot"; then
-      # modern ghc >= 6.2, include all available haddock files
-      cd $docroot
-      for file in */*.haddock
-      do
-	 basename="`echo $file | sed -e 's|/.*||'`"
-	 hdocbases="$hdocbases -ihttp://haskell.cs.yale.edu/ghc/docs/latest/html/libraries/$basename,$normdocroot/$file"
-      done
-      cd $topdir
     else
-      # older ghc < 6.2, try to include the base.haddock file
-      if test -f "$ghcroot/doc/html/base/base.haddock"; then
-	hdocbases=" -ihttp://haskell.cs.yale.edu/ghc/docs/6.0.1/html/base,$ghcroot/doc/html/base/base.haddock"
-      fi
+      normdocroot="$docroot"
     fi
+
+    # modern ghc >= 6.2, include all available haddock files
+    cd $docroot
+    for file in */*.haddock
+    do
+      basename="`echo $file | sed -e 's|/.*||'`"
+      hdocbases="$hdocbases -ihttp://www.haskell.org/ghc/docs/latest/html/libraries/$basename,$normdocroot/$file"
+    done
+    cd $topdir
   fi
 fi
 
@@ -685,7 +756,23 @@
 # wxWidgets
 #--------------------------------------------------------------------
 
+# confirm that we have unicode enabled
 
+if test "$wxtoolkit" != "msw"; then
+  `$wxconfig --unicode=yes`
+  if test "$?" = 0; then
+    echo " wxWidgets Unicode support found"
+  else
+    echo ""
+    echo " I can't find the Unicode version of wxWidgets!"
+    echo ""
+    echo " Did you configure configure wxWidgets with --enable-unicode?"
+    echo " If you have more than one copy, are you passing in the right"
+    echo " version via --wx-config?"
+    exit 1
+  fi
+fi
+
 #--------------------------------------------------------------------
 # install
 #--------------------------------------------------------------------
@@ -745,6 +832,11 @@
  fi
 fi
 
+if test "$enablesplitobjs" = "yes"; then
+  hcflags="$hcflags -split-objs"
+fi
+
+
 #--------------------------------------------------------------------
 # toolkit
 #--------------------------------------------------------------------
@@ -797,9 +889,11 @@
 HCVERSION=$hcversion
 HCNAME=$hcname
 HCBASENAME=$hcbasename
-HCFLAGS=
+HCFLAGS=$hcflags
 HCPKG=$hcpkg
-GHCOLD=$ghcold
+ENABLE-PROF=$enableprof
+ENABLE-SPLITOBJS=$enablesplitobjs
+HC-PROF-FLAGS=-hisuf p_hi $hcprof
 
 # Packages
 PKG-PARSEC=$pkgparsec
@@ -824,6 +918,9 @@
 # STC
 WXC-STC=$wxcstc
 
+# WxDirect
+HAS-DATA-TIME = $hasdatatime
+
 # WxWidgets
 WXWIN-VERSION=$wxversion
 WXWIN-LIBS=$wxwinlibs
@@ -868,7 +965,6 @@
 
 #echo " package descriptions"
 echo " config/wxcore.pkg"
-if test "$ghcold" != "yes"; then
 # ghc 6.4+, the partial packages are only used for the windows installer
 cat > config/wxcore-partial.pkg << EOF
 name:wxcore
@@ -939,33 +1035,7 @@
 echo "import-dirs:\${wxhlibdir}/imports" >> config/wx.pkg
 echo "library-dirs:\${wxhlibdir}"	 >> config/wx.pkg
 
-else
-# pre ghc 6.4
-cat > config/wxcore.pkg << EOF
-Package
-  { name="wxcore"
-  , import_dirs=["\${wxhlibdir}/imports"]
-  , library_dirs=["\${wxhlibdir}"]
-  , hs_libraries=["wxcore","wxcore0","wxcore1","wxcore2"]
-  , extra_libraries=["${wxclibname}-${binversion}"]
-  , package_deps = ["base","lang","haskell98","concurrent"]
-  , extra_ld_opts=[$extraldopts]
-  }
-EOF
 
-echo " config/wx.pkg"
-cat > config/wx.pkg << EOF
-Package
-  { name="wx"
-  , import_dirs=["\${wxhlibdir}"]
-  , library_dirs=["\${wxhlibdir}"]
-  , hs_libraries=["wx"]
-  , package_deps=["wxcore"]
-  }
-EOF
-fi
-
-
 # set version in msc project file
 updateversion () {
   sed -e "s|wxc-msw[\\.0-9]\+-[\\.0-9]\+\\.|wxc-${binversion}.|g" -e "s|wxcd-msw[\\.0-9]\+-[\\.0-9]\+\\.|wxcd-${binversion}.|g" -e "s|\$|\\r|g" $1 > $1.out
@@ -986,26 +1056,31 @@
 # generate windows installer files.
 echo " config/wxhaskell-register.bat"
 echo "@SET wxclibname=${wxclibname}-${binversion}"	>  config/wxhaskell-register-temp
-if test "$ghcold" = "yes"; then
-  cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\${hcregister}|ghc-pkg -u -i|g" -e "s|\$|\\r|g" > config/wxhaskell-register.bat
-else
-  echo "@SET generate=yes" >> config/wxhaskell-register-temp
-  cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\${hcregister}|ghc-pkg update|g" -e "s|\$|\\r|g" > config/wxhaskell-register.bat
-fi
+echo "@SET generate=yes" >> config/wxhaskell-register-temp
+cat config/wxhaskell-register-temp bin/wxhaskell-register-template.bat | sed -e "s|\${hcregister}|ghc-pkg update|g" -e "s|\$|\\r|g" > config/wxhaskell-register.bat
 rm -f config/wxhaskell-register-temp
 
 echo " config/wxhaskell-unregister.bat"
 echo "@SET wxclibname=${wxclibname}-${binversion}"	>  config/wxhaskell-unregister-temp
-if test "$ghcold" = "yes"; then
-  cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\${hcunregister}|ghc-pkg -r|g" -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
-else
-  cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\${hcunregister}|ghc-pkg unregister|g" -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
-fi
+cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\${hcunregister}|ghc-pkg unregister|g" -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
 rm -f config/wxhaskell-unregister-temp
 
 echo " config/setcd"
 cp bin/setcd config/setcd
 
+cat > config/README-template-windows << EOF
+Click on the newly created wxhaskell-${version}\\bin\\wxhaskell-register.bat
+program to register the wxHaskell package.
+
+To uninstall, you can click on
+wxhaskell-${version}\\bin\\wxhaskell-unregister.bat and than remove the
+wxhaskell-${version} directory.
+EOF
+
+if test "$wxtoolkit" = "msw"; then
+  cat config/README-template-windows | sed -e "s|\${version}|${version}|g" > README.txt
+fi
+
 # generate maxosx installer files.
 echo " config/macosx-install.info"
 cat > config/macosx-install.info << EOF
@@ -1026,19 +1101,28 @@
 
 # generate macosx post-install files.
 echo " config/macosx-postinstall"
-if test "$ghcold" = "yes"; then
 cat > config/macosx-postinstall << EOF
-#!/bin/sh      
-env wxhlibdir="$libdir" /usr/local/bin/ghc-pkg -u -i "\$1/Contents/Resources/wxcore.pkg" 
-env wxhlibdir="$libdir" /usr/local/bin/ghc-pkg -u -i "\$1/Contents/Resources/wx.pkg" 
-EOF
-else
-cat > config/macosx-postinstall << EOF
-#!/bin/sh      
-cat "\$1/Contents/Resources/wxcore.pkg" | sed -e "s|\\\${wxhlibdir}|${libdir}|" | /usr/local/bin/ghc-pkg --global update -
-cat "\$1/Contents/Resources/wx.pkg" | sed -e "s|\\\${wxhlibdir}|${libdir}|" | /usr/local/bin/ghc-pkg --global update -
-EOF
+#!/bin/sh
+
+GHCPKG=`which ghc-pkg`
+# try these versions of GHC-PKG in turn
+# would it maybe be best just to let the installer fail?
+if test "\$GHCPKG" = ""; then
+  if test -f /usr/local/bin/ghc-pkg; then
+    GHCPKG=/usr/local/bin/ghc-pkg
+  elif test -f /opt/local/bin/ghc-pkg; then
+    GHCPKG=/opt/local/bin/ghc-pkg
+  elif test -f /sw/bin/ghc-pkg; then
+    GHCPKG=/sw/bin/ghc-pkg
+  else
+    echo "I can't find ghc-pkg in the path (\$PATH)!"
+    echo "Is GHC even installed?"
+    exit 1
+  fi
 fi
+cat "\$1/Contents/Resources/wxcore.pkg" | sed -e "s|\\\${wxhlibdir}|${libdir}|" | \$GHCPKG --global update -
+cat "\$1/Contents/Resources/wx.pkg" | sed -e "s|\\\${wxhlibdir}|${libdir}|" | \$GHCPKG --global update -
+EOF
 
 chmod a+x config/macosx-postinstall
 
@@ -1068,12 +1152,60 @@
 echo "%define wxtoolkit    $wxtoolkit"		>> config/wxhaskell.spec.temp
 echo "%define wxToolkit    $wxToolkit"		>> config/wxhaskell.spec.temp
 echo "%define wxversion    $wxversion"		>> config/wxhaskell.spec.temp
-echo "%define sourceroot   $topdir/out/"        >> config/wxhaskell.spec.temp
+echo "%define sourceroot   $topdir/dist/"       >> config/wxhaskell.spec.temp
 echo "%define configflags  $arguments_exp"	>> config/wxhaskell.spec.temp
 echo ""						>> config/wxhaskell.spec.temp
 cat config/wxhaskell.spec.temp bin/wxhaskell-spec-template > config/wxhaskell.spec
 rm -f config/wxhaskell.spec.temp
 
+# generate DEB installer files
+
+mkdir config/DEBIAN
+
+case "$hcversion" in
+    6.6*)
+	deb_package=libghc6-6-wxhaskell
+	deb_ghc_dependency=6.6
+	;;
+    6.8*)
+	deb_package=libghc6-8-wxhaskell
+	deb_ghc_dependency=$hcversion
+	;;
+    *)
+	deb_package=libghc6-unknown-wxhaskell
+	deb_ghc_dependency=6
+	;;
+esac
+
+cat > config/DEBIAN/control << EOF
+Package: $deb_package
+Version: $version
+Section: devel
+Priority: optional
+Architecture: i386
+Essential: no
+Depends: ghc6 (>= $deb_ghc_dependency), ghc6 (<<$deb_ghc_dependency+), libwxgtk2.6-dev
+Recommends: libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev
+Installed-Size: 21238821
+Maintainer: Mads Lindstroem [mads_lindstroem@yahoo.dk]
+Description: wxHaskell is a portable and native GUI library for Haskell
+EOF
+
+cat > config/DEBIAN/prerm << EOF
+#!/bin/sh
+ghc-pkg -r wx
+ghc-pkg -r wxcore
+ldconfig
+exit 0
+EOF
+
+cat > config/DEBIAN/postinst << EOF
+#!/bin/sh
+cat /usr/local/lib/wxcore.pkg | sed -e "s|\\\${wxhlibdir}|/usr/local/lib|"  | ghc-pkg update -
+cat /usr/local/lib/wx.pkg | sed -e "s|\\\${wxhlibdir}|/usr/local/lib|"  | ghc-pkg update -
+ldconfig
+EOF
+
 # generate prologue for documentation
 echo " config/prologue.txt"
 echo "Documentation for wxHaskell $version"  >  config/prologue.txt.temp
@@ -1091,8 +1223,10 @@
 echo " library:     wxhaskell-$version  (release $release)"
 echo " compiler:    $hcbasename-$hcversion"
 echo " wxwidgets:   $wxtoolkit-$wxversion"
-echo " with openGL: $withopengl"
-echo " with stc:    $withstc"
+echo " extensions:"
+echo "   openGL:    $withopengl"
+echo "   mediactrl: $withmediactrl"
+echo "   stc:       $withstc"
 echo " library dir: $libdir"
 
 if test "$wxrezfile"; then
diff --git a/makefile b/makefile
--- a/makefile
+++ b/makefile
@@ -32,6 +32,7 @@
 	@echo " bindist         binaries, docs, and samples zip (windows distribution)"
 	@echo " macdist         installer for MacOS X (.dmg file) (includes docs and samples)"
 	@echo " rpmdist         unix RPM installer (no docs and samples included)"
+	@echo " debdist         unix DEB installer (no docs and samples included)"
 	@echo ""
 	@echo "maintenance:"
 	@echo " clean           remove object files and binaries"
@@ -169,10 +170,10 @@
 # treectrl
 
 WXC-SOURCES = \
-	$(WXC-CORE) $(patsubst %,ewxw/elj%,$(WXC-EWXW))
+	$(WXC-CORE) $(patsubst %,elj%,$(WXC-EWXW))
 
 WXC-SPECS-EIFFEL = \
-	wxc/eiffel/wxc_defs.e  wxc/eiffel/ewxw/wx_defs.e \
+	wxc/eiffel/wxc_defs.e  wxc/eiffel/wx_defs.e \
 	wxc/eiffel/stc.e
 
 WXC-SPECS-HEADER = \
@@ -181,16 +182,14 @@
 	wxc/include/sound.h wxc/include/managed.h \
 	wxc/include/printout.h wxc/include/previewframe.h \
 	wxc/include/textstream.h \
-	wxc/include/ewxw/wxc_glue.h 
+	wxc/include/wxc_glue.h
 
 
 # distributed in a source distribution
-WXC-SRCS1=$(wildcard wxc/src/*.cpp)   
-
-WXC-SRCS2=$(wildcard wxc/src/ewxw/*.cpp) \
-	 $(wildcard wxc/src/ewxw/*.h)\
-	 $(wildcard wxc/include/*.h) $(wildcard wxc/include/ewxw/*.h) \
-	 $(wildcard wxc/eiffel/*.e)  $(wildcard wxc/eiffel/ewxw/*.e) \
+WXC-SRCS=$(wildcard wxc/src/*.cpp) \
+	 $(wildcard wxc/src/*.h)\
+	 $(wildcard wxc/include/*.h)\
+	 $(wildcard wxc/eiffel/*.e)\
 	 wxc/src/wxc.rc \
 	 $(wildcard wxc/wxc*.dsp) $(wildcard wxc/wxc*.dsw)
 
@@ -249,13 +248,18 @@
 	samples/contrib/PaintDirect.hs \
 	samples/contrib/NotebookRight.hs \
 	samples/contrib/GLCanvas.hs \
-	samples/contrib/GLMultiCanvas.hs 
-
+	samples/contrib/GLMultiCanvas.hs\
+	\
+	bugs/FontFixed.hs\
+	bugs/SubMenu.hs\
+	bugs/StartStart.hs\
+	bugs/NonModalDialog.hs\
+	bugs/TextColor.hs\
 	
 #--------------------------------------------------------------------------
 # The main targets.
 #--------------------------------------------------------------------------
-.SUFFIXES: .hs .hi .o .c .cpp
+.SUFFIXES: .hs .hi .o .p_hi .p_o .c .cpp
 .PHONY: all install uninstall install-files uninstall-files
 .PHONY: help doc webdoc clean realclean
 
@@ -347,7 +351,9 @@
 	@$(call cp-srcdist, $(SAMPLE-SOURCES))
 	@echo zipping: $(DIST-SRC)
 	@$(CD) $(SRCDIST-OUTDIR) && $(call zip-add-rec,$(DIST-SRC),$(WXHASKELLVER))
+	@$(CD) $(SRCDIST-OUTDIR) && $(call tgz-add-rec,$(basename $(DIST-SRC)).tar.gz,$(WXHASKELLVER))
 
+
 srcdist-clean:
 	-@$(call full-remove-dir,$(SRCDIST-OUTDIR))
 	-@$(call safe-remove-file,$(DIST-SRC))
@@ -356,10 +362,9 @@
 bindist: bindist-clean dist-dirs wxc-bindist wxcore-bindist wx-bindist docdist
 	@$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxcore.pkg config/wx.pkg)
 ifeq ($(TOOLKIT),msw)
-ifeq ($(GHCOLD),no)
 	@$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxcore-partial.pkg config/wx-partial.pkg)
-endif
 	@$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxhaskell-register.bat config/wxhaskell-unregister.bat config/setcd)
+	@$(call cp-bindist,,$(BINDIST-BINDIR),README.txt)
 else
 	@$(call cp-bindist,bin,$(BINDIST-BINDIR),bin/wxhaskell-register bin/wxhaskell-unregister)
 endif
@@ -382,10 +387,43 @@
 	$(CP) -f $(DIST-SRC) $(RPM-SOURCE-DIR)
 	rpmbuild -ba config/wxhaskell.spec
 
+# DEB dist
+DEBIAN_DIST=dist/debian
+DEBIAN_INSTALL_LOCACTION=$(DEBIAN_DIST)/usr/local
+DEB_NAME=$(DIST-OUTDIR)/wxhaskell$(ARCHITECTURE)-bin-$(REL-VERSION).deb
+DEB_DOC=$(DEBIAN_DIST)/usr/local/share
 
+.PHONY: debdist debdist-clean
+debdist: 
+
+debdist:dist-dirs wxc-bindist wxcore-bindist wx-bindist
+	@$(call ensure-dir,$(DEBIAN_DIST))
+	@$(call cp-echo,config/DEBIAN,$(DEBIAN_DIST)/DEBIAN)
+	@$(call ensure-dir,$(DEBIAN_INSTALL_LOCACTION))
+	@$(call cp-echo,$(BINDIST-LIBDIR),$(DEBIAN_INSTALL_LOCACTION))
+	# copy packages
+	@$(call cp-echo,config/wxcore.pkg,$(DEBIAN_INSTALL_LOCACTION)/lib/wxcore.pkg)
+	@$(call cp-echo,config/wx.pkg,$(DEBIAN_INSTALL_LOCACTION)/lib/wx.pkg)
+	# copy license
+	@$(call cp-echo,license.txt,$(DEBIAN_DIST)/DEBIAN/copyright)
+	# permissions
+	chmod 755 $(DEBIAN_DIST)/DEBIAN/prerm
+	chmod 755 $(DEBIAN_DIST)/DEBIAN/postinst
+	#extract doc-zip
+	@$(call ensure-dir,$(DEB_DOC))
+	unzip wxhaskell-doc-0.10.3.zip -d $(DEB_DOC)
+	#ownership
+	chown --recursive root.root $(DEBIAN_DIST)
+	#build
+	dpkg --build dist/debian/ $(DEB_NAME)
+
+debdist-clean: bindist-clean
+	@$(RM) $(DEB_NAME)
+	-@$(call full-remove-dir,$(DEBIAN_DIST))
+
 # MAC dist
 WXHASKELLINS=wxhaskell
-WXHASKELLDMG=$(DIST-OUTDIR)/wxhaskell-bin-$(REL-VERSION).dmg
+WXHASKELLDMG=$(DIST-OUTDIR)/wxhaskell-bin-$(ARCHITECTURE)-$(REL-VERSION).dmg
 RESOURCEDIR=$(OUTDIR)/macdist/recources
 PACKAGEDIR=$(OUTDIR)/macdist/$(WXHASKELLINS)
 INFOFILE=$(PACKAGEDIR).info
@@ -405,9 +443,12 @@
 	@$(call cp-echo,license.txt,$(RESOURCEDIR)/License.txt)
 	@echo "See <http://wxhaskell.sourceforge.net> for more information." > $(RESOURCEDIR)/Readme.txt
 	# create package
+	chmod u+x bin/macosx-package
 	bin/macosx-package $(BINDIST-OUTDIR)/$(WXHASKELLVER) $(INFOFILE) -d $(PACKAGEDIR) -r $(RESOURCEDIR)
 	$(CP) -R $(DOCDIST-SRCDIR)/doc $(PACKAGEDIR)
 	$(CP) -R $(DOCDIST-SRCDIR)/samples $(PACKAGEDIR)
+	$(CP) -R $(DOCDIST-SRCDIR)/bugs $(PACKAGEDIR)
+	chmod u+x bin/macosx-builddmg
 	bin/macosx-builddmg $(PACKAGEDIR) $(OUTDIR)
 	@mv -f $(OUTDIR)/$(WXHASKELLINS).dmg $(WXHASKELLDMG)
 	echo "created: $(WXHASKELLDMG)"
@@ -423,7 +464,7 @@
 WXD-HS		=$(call make-hs,   $(WXD-SRCDIR), $(WXD-SOURCES))
 WXD-FLAGS	= --wxc $(WXC) -o $(WXCORE-SRCDIR)/$(WXCORE-HPATH)
 
-# build executable
+# Build executable
 wxd: wxd-dirs $(WXD-EXE)
 
 wxd-dirs:
@@ -443,7 +484,7 @@
 
 # create an object file from source files.
 $(WXD-OBJS): $(WXD-OUTDIR)/%.o: $(WXD-SRCDIR)/%.hs
-	@$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC) $(PKG-TIME),$(WXD-OUTDIR),-i$(WXD-SRCDIR))
+	@$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC) -cpp $(HAS-DATA-TIME) $(PKG-TIME),$(WXD-OUTDIR),-i$(WXD-SRCDIR))
 
 # automatically include all dependency information.
 -include $(WXD-DEPS)
@@ -455,7 +496,7 @@
 WXCORE-PKG	=config/$(WXCORE).pkg
 WXCORE-SRCDIR	=$(WXCORE)/src
 WXCORE-HPATH	=Graphics/UI/WXCore
-WXCORE-OUTDIR	=$(OUTDIR)/wx
+WXCORE-OUTDIR	=$(OUTDIR)/wxcore
 WXCORE-IMPORTSDIR=$(WXCORE-OUTDIR)/imports
 
 WXCORE-HSDIRS	=-i$(WXCORE-SRCDIR) -i$(WXD-SRCDIR)
@@ -479,26 +520,57 @@
 WXCORE-CORE-C-OBJS=$(call make-objs, $(WXCORE-IMPORTSDIR), $(WXCORE-CORE-C-SOURCES))
 WXCORE-STUB-OBJS=$(call make-objs, $(WXCORE-IMPORTSDIR), $(patsubst %,%_stub,$(WXCORE-STUBS)))
 
+WXCORE-PROF-OBJ	=$(WXCORE-OUTDIR)/$(WXCORE).p_o
+WXCORE-PROF-LIB	=$(WXCORE-OUTDIR)/lib$(WXCORE)_p.a
+WXCORE-CORE-A-PROF-OBJ =$(WXCORE-OUTDIR)/$(WXCORE)0.p_o
+WXCORE-CORE-A-PROF-LIB =$(WXCORE-OUTDIR)/lib$(WXCORE)0_p.a
+WXCORE-CORE-B-PROF-OBJ =$(WXCORE-OUTDIR)/$(WXCORE)1.p_o
+WXCORE-CORE-B-PROF-LIB =$(WXCORE-OUTDIR)/lib$(WXCORE)1_p.a
+WXCORE-CORE-C-PROF-OBJ =$(WXCORE-OUTDIR)/$(WXCORE)2.p_o
+WXCORE-CORE-C-PROF-LIB =$(WXCORE-OUTDIR)/lib$(WXCORE)2_p.a
+WXCORE-PROF-LIBS	=$(WXCORE-CORE-A-PROF-LIB) $(WXCORE-CORE-A-PROF-OBJ) \
+                 $(WXCORE-CORE-B-PROF-LIB) $(WXCORE-CORE-B-PROF-OBJ) \
+                 $(WXCORE-CORE-C-PROF-LIB) $(WXCORE-CORE-C-PROF-OBJ) \
+		 $(WXCORE-PROF-LIB) $(WXCORE-PROF-OBJ)
+WXCORE-PROF-OBJS	=$(call make-prof-objs, $(WXCORE-IMPORTSDIR), $(WXCORE-SOURCES))
+WXCORE-CORE-A-PROF-OBJS=$(call make-prof-objs, $(WXCORE-IMPORTSDIR), $(WXCORE-CORE-A-SOURCES))
+WXCORE-CORE-B-PROF-OBJS=$(call make-prof-objs, $(WXCORE-IMPORTSDIR), $(WXCORE-CORE-B-SOURCES))
+WXCORE-CORE-C-PROF-OBJS=$(call make-prof-objs, $(WXCORE-IMPORTSDIR), $(WXCORE-CORE-C-SOURCES))
+WXCORE-STUB-PROF-OBJS=$(call make-prof-objs, $(WXCORE-IMPORTSDIR), $(patsubst %,%_stub,$(WXCORE-STUBS)))
+
 WXCORE-CORE-SOURCES=$(WXCORE-CORE-A-SOURCES) $(WXCORE-CORE-B-SOURCES) $(WXCORE-CORE-C-SOURCES)
 WXCORE-CORE-OBJS   =$(WXCORE-CORE-A-OBJS) $(WXCORE-CORE-B-OBJS) $(WXCORE-CORE-C-OBJS)
 
 WXCORE-DEPS	=$(call make-deps, $(WXCORE-IMPORTSDIR), $(WXCORE-CORE-SOURCES) $(WXCORE-SOURCES))
 WXCORE-HIS	=$(call make-his,  $(WXCORE-IMPORTSDIR), $(WXCORE-CORE-SOURCES) $(WXCORE-SOURCES))
+WXCORE-PROF-HIS	=$(call make-prof-his,  $(WXCORE-IMPORTSDIR), $(WXCORE-CORE-SOURCES) $(WXCORE-SOURCES))
 WXCORE-HS	=$(call make-hs,   $(WXCORE-SRCDIR),     $(WXCORE-CORE-SOURCES) $(WXCORE-SOURCES))
 WXCORE-GEN-HS   =$(call make-hs,   $(WXCORE-SRCDIR),     $(WXCORE-GEN-SOURCES))
 WXCORE-NONGEN-HS=$(filter-out $(WXCORE-GEN-HS),$(WXCORE-HS))
 
 WXCORE-BINS	=$(WXCORE-HIS) $(WXCORE-LIBS)
+WXCORE-PROF-BINS	=$(WXCORE-PROF-HIS) $(WXCORE-PROF-LIBS)
 WXCORE-DOCS	=$(filter-out $(WXCORE-SRCDIR)/$(WXCORE-HPATH)/IntMap.hs,$(WXCORE-HS))
 WXCORE-HCFLAGS	=$(HCFLAGS) -fvia-C -package-name $(WXCORE)-$(VERSION)
 
 
 # build main library
-wxcore: wxd wxc wxcore-dirs $(WXCORE-LIBS)
+ifdef ENABLE-PROF
+wxcore: wxcore-only wxcore-prof
+else
+wxcore: wxcore-only
+endif
 
+wxcore-only: wxd wxc wxcore-dirs $(WXCORE-LIBS)
+
 wxcore-dirs:
 	@$(call ensure-dirs-of-files,$(WXCORE-OBJS))
 
+wxcore-prof: wxd wxc wxcore-prof-dirs $(WXCORE-PROF-LIBS)
+
+wxcore-prof-dirs:
+	@$(call ensure-dirs-of-files,$(WXCORE-PROF-OBJS))
+
 wxcore-clean:
 	-@$(call full-remove-dir,$(WXCORE-OUTDIR))
 
@@ -512,6 +584,9 @@
 # bindist
 wxcore-bindist: wxcore
 	@$(call cp-bindist,$(WXCORE-OUTDIR),$(BINDIST-LIBDIR),$(WXCORE-BINS))
+ifdef ENABLE-PROF
+	@$(call cp-bindist,$(WXCORE-OUTDIR),$(BINDIST-LIBDIR),$(WXCORE-PROF-BINS))
+endif
 
 # install
 wxcore-register: 
@@ -519,6 +594,9 @@
 
 wxcore-install-files: wxcore wxc-install-files 
 	@$(call install-files,$(WXCORE-OUTDIR),$(LIBDIR),$(WXCORE-BINS))
+ifdef ENABLE-PROF
+	@$(call install-files,$(WXCORE-OUTDIR),$(LIBDIR),$(WXCORE-PROF-BINS))
+endif
 	@$(call install-files,$(dir $(WXCORE-PKG)),$(LIBDIR),$(WXCORE-PKG))
 
 wxcore-unregister: 
@@ -526,6 +604,9 @@
 
 wxcore-uninstall-files:	
 	-@$(call uninstall-files,$(WXCORE-OUTDIR),$(LIBDIR),$(WXCORE-BINS))
+ifdef ENABLE-PROF
+	-@$(call uninstall-files,$(WXCORE-OUTDIR),$(LIBDIR),$(WXCORE-PROF-BINS))
+endif
 	-@$(call uninstall-files,$(dir $(WXCORE-PKG)),$(LIBDIR),$(WXCORE-PKG))
 
 # build marshall modules
@@ -557,8 +638,23 @@
 $(WXCORE-CORE-C-OBJ): $(WXCORE-CORE-C-OBJS)
 	  $(call combine-objs,$@,$^)
 
+ifdef ENABLE-SPLITOBJS
 # build a library
 $(WXCORE-LIB): $(WXCORE-OBJS)  $(WXCORE-STUB-OBJS)
+	  $(call make-archive-of-splitobjs,$@,$(WXCORE-OBJS))
+	  $(call make-archive,$@,$(WXCORE-STUB-OBJS))
+
+$(WXCORE-CORE-A-LIB): $(WXCORE-CORE-A-OBJS)
+	  $(call make-archive,$@,$(filter %WxcTypes.o,$^))
+	  $(call make-archive-of-splitobjs,$@,$(filter-out %WxcTypes.o,$^))
+
+$(WXCORE-CORE-B-LIB): $(WXCORE-CORE-B-OBJS)
+	  $(call make-archive-of-splitobjs,$@,$^)
+
+$(WXCORE-CORE-C-LIB): $(WXCORE-CORE-C-OBJS)
+	  $(call make-archive-of-splitobjs,$@,$^)
+else
+$(WXCORE-LIB): $(WXCORE-OBJS)  $(WXCORE-STUB-OBJS)
 	  $(call make-archive,$@,$^)
 
 $(WXCORE-CORE-A-LIB): $(WXCORE-CORE-A-OBJS)
@@ -569,6 +665,7 @@
 
 $(WXCORE-CORE-C-LIB): $(WXCORE-CORE-C-OBJS)
 	  $(call make-archive,$@,$^)
+endif
 
 # create an object file from source files.
 $(WXCORE-CORE-A-OBJS) $(WXCORE-CORE-B-OBJS) $(WXCORE-CORE-C-OBJS) $(WXCORE-OBJS): $(WXCORE-IMPORTSDIR)/%.o: $(WXCORE-SRCDIR)/%.hs
@@ -577,6 +674,43 @@
 $(WXCORE-STUB-OBJS): $(WXCORE-IMPORTSDIR)/%_stub.o: $(WXCORE-SRCDIR)/%.hs
 	$(HC) -c $(basename $@).c
 
+# profiling version of above targets
+$(WXCORE-PROF-OBJ): $(WXCORE-PROF-OBJS)  $(WXCORE-STUB-PROF-OBJS)
+	  $(call combine-objs,$@,$^)
+$(WXCORE-CORE-A-PROF-OBJ): $(WXCORE-CORE-A-PROF-OBJS)
+	  $(call combine-objs,$@,$^)
+$(WXCORE-CORE-B-PROF-OBJ): $(WXCORE-CORE-B-PROF-OBJS)
+	  $(call combine-objs,$@,$^)
+$(WXCORE-CORE-C-PROF-OBJ): $(WXCORE-CORE-C-PROF-OBJS)
+	  $(call combine-objs,$@,$^)
+
+ifdef ENABLE-SPLITOBJS
+$(WXCORE-PROF-LIB): $(WXCORE-PROF-OBJS)  $(WXCORE-STUB-PROF-OBJS)
+	  $(call make-archive-of-splitobjs,$@,$(WXCORE-PROF-OBJS))
+	  $(call make-archive,$@,$(WXCORE-STUB-PROF-OBJS))
+$(WXCORE-CORE-A-PROF-LIB): $(WXCORE-CORE-A-PROF-OBJS)
+	  $(call make-archive,$@,$(filter %WxcTypes.p_o,$^))
+	  $(call make-archive-of-splitobjs,$@,$(filter-out %WxcTypes.p_o,$^))
+$(WXCORE-CORE-B-PROF-LIB): $(WXCORE-CORE-B-PROF-OBJS)
+	  $(call make-archive-of-splitobjs,$@,$^)
+$(WXCORE-CORE-C-PROF-LIB): $(WXCORE-CORE-C-PROF-OBJS)
+	  $(call make-archive-of-splitobjs,$@,$^)
+else
+$(WXCORE-PROF-LIB): $(WXCORE-PROF-OBJS)  $(WXCORE-STUB-PROF-OBJS)
+	  $(call make-archive,$@,$^)
+$(WXCORE-CORE-A-PROF-LIB): $(WXCORE-CORE-A-PROF-OBJS)
+	  $(call make-archive,$@,$^)
+$(WXCORE-CORE-B-PROF-LIB): $(WXCORE-CORE-B-PROF-OBJS)
+	  $(call make-archive,$@,$^)
+$(WXCORE-CORE-C-PROF-LIB): $(WXCORE-CORE-C-PROF-OBJS)
+	  $(call make-archive,$@,$^)
+endif
+
+$(WXCORE-CORE-A-PROF-OBJS) $(WXCORE-CORE-B-PROF-OBJS) $(WXCORE-CORE-C-PROF-OBJS) $(WXCORE-PROF-OBJS): $(WXCORE-IMPORTSDIR)/%.p_o: $(WXCORE-SRCDIR)/%.hs
+	@$(call compile-prof-hs,$@,$<,$(WXCORE-HCFLAGS) $(HC-PROF-FLAGS) -Iwxc/include,$(WXCORE-IMPORTSDIR),$(WXCORE-HSDIRS) )
+$(WXCORE-STUB-PROF-OBJS): $(WXCORE-IMPORTSDIR)/%_stub.p_o: $(WXCORE-SRCDIR)/%.hs
+	$(HC) -c $(basename $@).c
+
 # automatically include all dependency information.
 -include $(WXCORE-DEPS)
 
@@ -593,26 +727,42 @@
 WX-LIB		=$(WX-OUTDIR)/lib$(WX).a
 WX-LIBS		=$(WX-LIB) $(WX-OBJ)
 
+WX-PROF=BJ		=$(WX-OUTDIR)/$(WX).p_o
+WX-PROF-LIB		=$(WX-OUTDIR)/lib$(WX)_p.a
+WX-PROF-LIBS		=$(WX-PROF-LIB) $(WX-PROF-OBJ)
+
 WX-OBJS		=$(call make-objs, $(WX-IMPORTSDIR), $(WX-SOURCES))
+WX-PROF-OBJS		=$(call make-prof-objs, $(WX-IMPORTSDIR), $(WX-SOURCES))
 WX-DEPS		=$(call make-deps, $(WX-IMPORTSDIR), $(WX-SOURCES))
 WX-HIS		=$(call make-his,  $(WX-IMPORTSDIR), $(WX-SOURCES))
+WX-PROF-HIS		=$(call make-prof-his,  $(WX-IMPORTSDIR), $(WX-SOURCES))
 WX-HS		=$(call make-hs,   $(WX-SRCDIR),     $(WX-SOURCES))
 WX-DOCS		=$(WX-HS)
 WX-BINS		=$(WX-HIS) $(WX-LIBS)
+WX-PROF-BINS		=$(WX-PROF-HIS) $(WX-PROF-LIBS)
 WX-HCFLAGS	=$(HCFLAGS) -fvia-C -package-name $(WX)-$(VERSION) -package $(WXCORE)-$(VERSION)
 
 WX-HSDIRS	=-i$(WX-SRCDIR)
 
 # build main library
-wx: wxcore-clean wx-main
+ifdef ENABLE-PROF
+wx: wx-only wx-prof
+else
+wx: wx-only
+endif
 
-wx-main: wx-dirs $(WX-LIBS)
+wx-only: wx-dirs $(WX-LIBS)
 
 wx-install: wx-install-files wx-register
 
 wx-dirs:
 	@$(call ensure-dirs-of-files,$(WX-OBJS))
 
+wx-prof: wxd wxc wx-prof-dirs $(WX-PROF-LIBS)
+
+wx-prof-dirs:
+	@$(call ensure-dirs-of-files,$(WX-PROF-OBJS))
+
 wx-clean:
 	-@$(call full-remove-dir,$(WX-OUTDIR))
 
@@ -621,15 +771,21 @@
 	@$(call cp-srcdist, $^)
 
 # bindist
-wx-bindist: 
+wx-bindist: wx
 	@$(call cp-bindist,$(WX-OUTDIR),$(BINDIST-LIBDIR),$(WX-BINS))
+ifdef ENABLE-PROF
+	@$(call cp-bindist,$(WX-OUTDIR),$(BINDIST-LIBDIR),$(WX-PROF-BINS))
+endif
 
 # install
 wx-register:
 	@$(call install-pkg  ,$(LIBDIR),$(WX-PKG))
 
-wx-install-files: wx-main
+wx-install-files: wx-only
 	@$(call install-files,$(WX-OUTDIR),$(LIBDIR),$(WX-BINS))
+ifdef ENABLE-PROF
+	@$(call install-files,$(WX-OUTDIR),$(LIBDIR),$(WX-PROF-BINS))
+endif
 	@$(call install-files,$(dir $(WX-PKG)),$(LIBDIR),$(WX-PKG))
 
 wx-unregister:
@@ -637,6 +793,9 @@
 
 wx-uninstall-files: 
 	-@$(call uninstall-files,$(WX-OUTDIR),$(LIBDIR),$(WX-BINS))
+ifdef ENABLE-PROF
+	-@$(call uninstall-files,$(WX-OUTDIR),$(LIBDIR),$(WX-PROF-BINS))
+endif
 	-@$(call uninstall-files,$(dir $(WX-PKG)),$(LIBDIR),$(WX-PKG))
 
 # build ghci object files
@@ -645,12 +804,28 @@
 
 # build a library
 $(WX-LIB): $(WX-OBJS)
+ifdef ENABLE-SPLITOBJS
+	$(call make-archive-of-splitobjs,$@,$^)
+else
 	$(call make-archive,$@,$^)
+endif
 
 # create an object file from source files.
 $(WX-OBJS): $(WX-IMPORTSDIR)/%.o: $(WX-SRCDIR)/%.hs
 	@$(call compile-hs,$@,$<,$(WX-HCFLAGS),$(WX-IMPORTSDIR),$(WX-HSDIRS))
 
+# profiling version of above targets
+$(WX-PROF-OBJ): $(WX-PROF-OBJS)
+	$(call combine-objs,$@,$^)
+$(WX-PROF-LIB): $(WX-PROF-OBJS)
+ifdef ENABLE-SPLITOBJS
+	$(call make-archive-of-splitobjs,$@,$^)
+else
+	$(call make-archive,$@,$^)
+endif
+$(WX-PROF-OBJS): $(WX-IMPORTSDIR)/%.p_o: $(WX-SRCDIR)/%.hs
+	@$(call compile-prof-hs,$@,$<,$(WX-HCFLAGS) $(HC-PROF-FLAGS),$(WX-IMPORTSDIR),$(WX-HSDIRS))
+
 # automatically include all dependency information.
 -include $(WX-DEPS)
 
@@ -663,7 +838,6 @@
 # either "wxc" or "wxcd" for a debug version.
 #--------------------------------------------------------------------------
 WXC		=wxc
-WXC-CPATH	=ewxw
 WXC-OUTDIR	=$(OUTDIR)/$(WXC)
 WXC-SRCDIR	=$(WXC)/src
 WXC-INCDIR	=$(WXC)/include
@@ -689,9 +863,8 @@
 	@$(call run-compress,$(WXC-LIB))
 
 # source dist
-wxc-dist: $(WXC-SRCS1) $(WXC-SRCS2)
-	@$(call cp-srcdist, $(WXC-SRCS1))
-	@$(call cp-srcdist, $(WXC-SRCS2))
+wxc-dist: $(WXC-SRCS)
+	@$(call cp-srcdist, $(WXC-SRCS))
 
 # binary distribution. A complication is that sometimes wxWindows is in a separate dll
 # and sometimes it is statically linked into wxc.dll (as with microsoft visual c++).
@@ -738,13 +911,7 @@
 
 # dynamic link library on macOSX: generates single .so file
 $(basename $(WXC-LIB)).dylib: $(WXC-OBJS)
-ifeq ($(ARCHITECTURE),powerpc)
-	$(CXX) -r -keep_private_externs -nostdlib -o $(WXC-OUTDIR)/master.o $^ $(WXC-LIBS) -lSystemStubs -shared-libgcc -lstdc++-static
-	$(CXX) -dynamiclib -install_name $(SHARED-PREFIX)$(notdir $@) -undefined suppress -flat_namespace -o $@ $(WXC-OUTDIR)/master.o $(filter-out %.a,$(WXC-LIBS))
-	$(RM) -f $(WXC-OUTDIR)/master.o
-else
 	$(CXX) -dynamiclib -install_name $(SHARED-PREFIX)$(notdir $@) -undefined suppress -flat_namespace -o $@ $^ $(filter-out %.a,$(WXC-LIBS))
-endif
 	
 # create an object file from source files
 $(WXC-OBJS): $(WXC-OUTDIR)/%.o: $(WXC-SRCDIR)/%.cpp
@@ -775,9 +942,12 @@
 DOC-OUTDIR  =$(OUTDIR)/doc/html
 WXCORE-DOC-OUTDIR  =$(DOC-OUTDIR)/wxcore
 WX-DOC-OUTDIR  	   =$(DOC-OUTDIR)/wx
+WXBOTH-DOC-OUTDIR  =$(DOC-OUTDIR)
 WXCORE-DOCFILE     =$(WXCORE-DOC-OUTDIR)/wxcore.haddock
 WX-DOCFILE     	   =$(WX-DOC-OUTDIR)/wx.haddock
-HDOCFLAGS   = --prologue=config/prologue.txt --html $(HDOCBASES)
+WXBOTH-DOCFILE     =$(WXBOTH-DOC-OUTDIR)/wxhaskell.haddock
+WXCORE-HDOCFLAGS   = --prologue=config/prologue.txt --html $(HDOCBASES)
+WX-HDOCFLAGS   = $(WXCORE-HDOCFLAGS) -i$(WXCORE-DOC-OUTDIR)/wxcore.haddock
 WXCORE-DOCSOURCES  = $(WXCORE-DOCS)
 WX-DOCSOURCES      = $(WX-DOCS)
 
@@ -787,18 +957,22 @@
 doc-dirs:
 	@$(call ensure-dir,$(WXCORE-DOC-OUTDIR))
 	@$(call ensure-dir,$(WX-DOC-OUTDIR))
+	@$(call ensure-dir,$(WXBOTH-DOC-OUTDIR))
 
 doc-clean:
 	-@$(call full-remove-dir,$(WXCORE-DOC-OUTDIR))
 	-@$(call full-remove-dir,$(WX-DOC-OUTDIR))
+	-@$(call full-remove-dir,$(WXBOTH-DOC-OUTDIR))
 
+combined-doc: doc-dirs $(WXBOTH-DOCFILE)
+
 # copy documentation to the wxhaskell website
 webdoc: doc
 	cd $(DOC-OUTDIR); scp *.* $(USERNAME)@shell.sourceforge.net:/home/groups/w/wx/wxhaskell/htdocs/doc
 
 # documentation distribution
 ifeq ($(HDOCFOUND),yes)
-docdist: docdist-clean doc
+docdist: docdist-clean combined-doc
 	@echo "-- adding documentation"
 	@echo $(wildcard $(DOC-OUTDIR)/*)
 	@$(call cp-docdist,$(OUTDIR),$(wildcard $(DOC-OUTDIR)/*))
@@ -817,10 +991,13 @@
 
 # generate documentation with haddock
 $(WXCORE-DOCFILE): config/prologue.txt $(WXCORE-DOCSOURCES)
-	$(HDOC) --odir $(WXCORE-DOC-OUTDIR) --dump-interface=$(WXCORE-DOCFILE)  $(HDOCFLAGS) $(WXCORE-DOCSOURCES)
+	$(HDOC) --odir $(WXCORE-DOC-OUTDIR) --dump-interface=$(WXCORE-DOCFILE)  $(WXCORE-HDOCFLAGS) $(WXCORE-DOCSOURCES)
 
 $(WX-DOCFILE): config/prologue.txt $(WX-DOCSOURCES)
-	$(HDOC) --odir $(WX-DOC-OUTDIR) --dump-interface=$(WX-DOCFILE) $(HDOCFLAGS) $(WX-DOCSOURCES)
+	$(HDOC) --odir $(WX-DOC-OUTDIR) --dump-interface=$(WX-DOCFILE) $(WX-HDOCFLAGS) $(WX-DOCSOURCES)
+
+$(WXBOTH-DOCFILE): config/prologue.txt $(WXCORE-DOCSOURCES) $(WX-DOCSOURCES)
+	$(HDOC) --odir $(WXBOTH-DOC-OUTDIR) --dump-interface=$(WXBOTH-DOCFILE) $(WXCORE-HDOCFLAGS) $(WXCORE-DOCSOURCES) $(WX-DOCSOURCES)
 
 #--------------------------------------------------------------------------
 # Cabal / Hackage stuff
diff --git a/makefile.lib b/makefile.lib
--- a/makefile.lib
+++ b/makefile.lib
@@ -1,3 +1,4 @@
+# vim:syntax=make:indentexpr=GetMakeIndent():
 #-----------------------------------------------------------------------
 #  Copyright (c) 2003 2004 Daan Leijen.
 #  This file is distributed under the wxWindows library license.
@@ -57,8 +58,11 @@
 # usage: $(call make-objs,<object root path>,<file base names>)
 make-hs		=$(patsubst %,$(1)/%.hs,$(2))
 make-objs	=$(patsubst %,$(1)/%.o,$(2))
+make-prof-objs	=$(patsubst %,$(1)/%.p_o,$(2))
+make-split-objs	=$(patsubst %,$(1)/%_split/*.o,$(2))
 make-deps	=$(patsubst %,$(1)/%.d,$(2))
 make-his	=$(patsubst %,$(1)/%.hi,$(2))
+make-prof-his	=$(patsubst %,$(1)/%.p_hi,$(2))
 
 # usage: $(call run-silent,<command>)
 run-silent	=$(1) 1> /dev/null 2> /dev/null
@@ -112,25 +116,6 @@
 #--------------------------------------------------------------------------
 
 
-ifeq ($(GHCOLD),yes)
-# pre GHC 6.4
-# silent-move-stubs(<output .o>,<input .c>)
-silent-move-stubs =$(call silent-move-file,$(basename $(2))_stub.h,$(dir $(1))) && \
-		   $(call silent-move-file,$(basename $(2))_stub.c,$(dir $(1)))	
-
-# make-hs-obj(<output .o>,<input .hs>,<compile flags>,<top output directory>)
-make-hs-obj     =$(call run-with-echo,$(HC) -c $(2) -o $(1) -i$(4) -ohi $(basename $(1)).hi -odir $(dir $(1)) $(3))
-
-# make-hs-deps(<output .o>,<input .hs>,<compile flags>,<top output directory>)
-make-hs-deps	=$(HC) $(2) $(3) -i$(4) -M -optdep-f -optdep$(basename $(1)).d.in && \
-		 sed -e 's|$(basename $(2))|$(basename $(1))|' -e 's|\.hi|\.o|g' $(basename $(1)).d.in > $(basename $(1)).d && \
-		 $(call silent-remove-file,$(basename $(1)).d.in)
-
-# compile-hs(<output .o>,<input .hs>,<compile flags>,<top output directory>)
-compile-hs      =$(call make-hs-obj,$(1),$(2),$(3),$(4)) && \
-		 $(call silent-move-stubs,$(1),$(2)) && \
-		 $(call make-hs-deps,$(1),$(2),$(3),$(4))
-else
 # GHC 6.4+ and others
 # make-hs-obj(<output .o>,<input .hs>,<compile flags>,<top output directory>)
 # silent-move-stubs(<output .o>,<input .c>)
@@ -148,9 +133,16 @@
 		 $(call silent-move-stubs,$(1),$(2)) && \
 		 $(call make-hs-deps,$(1),$(2),$(3),$(4),$(5))
 
+# make-hs-deps(<output .o>,<input .hs>,<compile flags>,<top output directory>,<hs directories>)
+make-hs-prof-deps	=$(HC) $(2) $(3) -odir $(4) -hidir $(4) $(5) -M -optdep-f -optdep$(basename $(1)).p_d.in && \
+		 sed -e 's|\.o|\.p_o|g' -e 's|\.hi|\.p_o|g' $(basename $(1)).p_d.in | grep '^$(1)' > $(basename $(1)).p_d
 
-endif
+# compile-hs(<output .o>,<input .hs>,<compile flags>,<top output directory>,<hs directories>)
+compile-prof-hs      =$(call make-hs-obj,$(1),$(2),$(3),$(4)) && \
+		 $(call silent-move-stubs,$(1),$(2)) && \
+		 $(call make-hs-prof-deps,$(1),$(2),$(3),$(4),$(5))
 
+
 #--------------------------------------------------------------------------
 # Linking
 #--------------------------------------------------------------------------
@@ -166,6 +158,7 @@
 # create an archive
 # make-archive(<archive>,<input .o files>)
 make-archive	=$(AR) -sr $(1) $(2)
+make-archive-of-splitobjs	=echo $(patsubst %.o,%_split/*.o,$(2)) | xargs -n 25 $(AR) -sr $(1)
 
 # update the archive symbol index
 # make-archive-index(<archive>)
@@ -208,11 +201,7 @@
 # install packages
 # usage: $(call install-pkg,<install dir>,<package file>)
 # usage: $(call uninstall-pkg,<package name>)
-ifeq ($(GHCOLD),yes)
-install-pkg=env wxhlibdir=$(1) $(HCPKG) -u -i $(2)
-else
 install-pkg=cat $(2) | sed -e "s|\$${wxhlibdir}|$(1)|" | $(HCPKG) update -
-endif
 uninstall-pkg=if $(call run-silent,$(HCPKG) -s $(1)); then echo "unregister package: $(1)" && $(HCPKG) -r $(1); fi
 
 
@@ -225,7 +214,7 @@
 # use -R switch to copy symbolic links literally instead of following the links.
 # use -p to preserve file dates to avoid linker bug on macosX with .a files.
 cp-echox	=echo  "copy $(1) to $(2)" && $(CP) -p -R $(1) $(2) && :
-cp-echo         =$(foreach file,$(wildcard $(1)),$(call cp-echox,$(file),$(2)))
+cp-echo         =$(foreach file,$(1),$(call cp-echox,$(file),$(2)))
 cp-fromto	=$(call ensure-dirs-of-files,$(call relative-fromto,$(1),$(2),$(3))) && \
 		 $(foreach file,$(3),$(call cp-echo,$(file),$(dir $(call relative-fromto,$(1),$(2),$(file)))) && ) :
 cp-bindist	=$(call cp-fromto,$(patsubst %/,%,$(1)),$(patsubst %/,%,$(2)),$(3))
diff --git a/samples/contrib/Camels.hs b/samples/contrib/Camels.hs
--- a/samples/contrib/Camels.hs
+++ b/samples/contrib/Camels.hs
@@ -1,5 +1,5 @@
-{--------------------------------------------------------------------------------
-   Camel game by Maarten Löffler (mloffler@cs.uu.nl) (adapted by Daan Leijen).
+{--------------------------------------------------------------------------------
+   Camel game by Maarten Löfler (mloffler@cs.uu.nl) (adapted by Daan Leijen).
 --------------------------------------------------------------------------------}
 module Main where
 
@@ -142,13 +142,13 @@
   | correct board = do infoDialog pan "Level up" "Congratulations! You succeeded."
                        varUpdate desert (const $ newBoard $ length board + 2)
                        repaint pan
-  | otherwise     = do infoDialog pan "Level down" "There are no more possible moves..."
-                       varUpdate desert (const $ newBoard $ max 3 $ length board - 2)
+  | otherwise     = do infoDialog pan "Level restart" "There are no more possible moves..."
+                       varUpdate desert (const $ newBoard $ max 3 $ length board)
                        repaint pan
 
 about :: Window a -> IO ()
 about w
-  = infoDialog w "About Camels" "Camels\n\nby Maarten Löffler\nmloffler@cs.uu.nl\n\nCamels was written using wxHaskell"
+  = infoDialog w "About Camels" "Camels\n\nby Maarten Löfler\nmloffler@cs.uu.nl\n\nCamels was written using wxHaskell"
 
 chelp :: Window a -> IO ()
 chelp w
diff --git a/samples/wx/BouncingBalls.hs b/samples/wx/BouncingBalls.hs
--- a/samples/wx/BouncingBalls.hs
+++ b/samples/wx/BouncingBalls.hs
@@ -28,9 +28,14 @@
              ,on (charKey '-') := set t [interval :~ \i -> i*2] -- increase interval
              ,on (charKey '+') := set t [interval :~ \i -> max 1 (i `div` 2)]  -- decrease interval
              ]
-
+       let instructions = init . unlines $
+                                  [ "Click to create more bouncing balls"
+                                  , "Right-click to for a new window"
+                                  , "<p> to pause"
+                                  , "<+/-> to change the speed" ]
        -- put the panel in the frame
-       set f [layout := minsize (sz maxX maxY) $ widget p]
+       set f [layout := column 1 [ minsize (sz maxX maxY) (widget p)
+                                 , label instructions ] ]
        return ()
   where
     -- drop a new ball
diff --git a/samples/wxcore/BouncingBalls.hs b/samples/wxcore/BouncingBalls.hs
--- a/samples/wxcore/BouncingBalls.hs
+++ b/samples/wxcore/BouncingBalls.hs
@@ -14,11 +14,18 @@
 
        -- create a non-user-resizable top-level (orphan) frame.
        f <- frameCreate objectNull idAny "Bouncing balls" rectNull
-                         (wxMINIMIZE_BOX + wxSYSTEM_MENU + wxCAPTION + wxNO_FULL_REPAINT_ON_RESIZE + wxCLIP_CHILDREN)
-       windowSetClientSize f (sz maxX maxY)
+                         ( wxMINIMIZE_BOX + wxSYSTEM_MENU + wxCAPTION + wxNO_FULL_REPAINT_ON_RESIZE
+                         + wxCLIP_CHILDREN + wxCLOSE_BOX)
 
        -- add a panel to draw on, nice grey color.
        p <- panelCreate f idAny rectNull 0 -- (wxNO_FULL_REPAINT_ON_RESIZE)
+       let instructions = init . unlines $
+                                  [ "Click to create more bouncing balls"
+                                  , "Right-click to for a new window"
+                                  , "<+/-> to change the speed" ]
+       windowSetBackgroundColour f $ colorSystem Color3DFace
+       windowSetLayout f (column 1 [ minsize (sz maxX maxY) (widget p)
+                                   , label instructions ])
 
        -- create a timer, on each tick it advances all the balls to their next position
        t <- windowTimerCreate f
diff --git a/wx/wx.cabal b/wx/wx.cabal
--- a/wx/wx.cabal
+++ b/wx/wx.cabal
@@ -1,13 +1,13 @@
 Name:           wx
-Version:        0.10.2
+Version:        0.10.3
 License:        LGPL
 License-file:   license.txt
 Author:         Daan Leijen
 Build-Type:     Simple
-Category:       GUI
+Category:       GUI, User interfaces
 Cabal-Version:  >= 1.2
 Description:    wxHaskell is a portable and native GUI library for Haskell.  It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X.  At present, it works with wxWidgets 2.6 (and sadly, not with with wxWidgets 2.8)
-Maintainer:     wxhaskell-users@lists.sourceforge.net
+Maintainer:     wxhaskell-devel@lists.sourceforge.net
 Synopsis:       wxHaskell
 Data-Files:     wx.cabal
 
diff --git a/wxc/eiffel/ewxw/wx_defs.e b/wxc/eiffel/ewxw/wx_defs.e
deleted file mode 100644
--- a/wxc/eiffel/ewxw/wx_defs.e
+++ /dev/null
@@ -1,2395 +0,0 @@
-class WX_DEFS
-
-feature {NONE}
-	-- from: event.h
-
-	wxACCEL_ALT    : INTEGER is 1
-	wxACCEL_CTRL   : INTEGER is 2
-	wxACCEL_SHIFT  : INTEGER is 4
-	wxACCEL_NORMAL : INTEGER is 0
-
-	wxNULL_FLAG : INTEGER is 0
-	wxEVT_NULL : INTEGER is 0
-	wxEVT_FIRST : INTEGER is 10000
-	wxJOYSTICK1 : INTEGER is 0
-	wxJOYSTICK2 : INTEGER is 1
-	wxJOY_BUTTON1 : INTEGER is 1
-	wxJOY_BUTTON2 : INTEGER is 2
-	wxJOY_BUTTON3 : INTEGER is 4
-	wxJOY_BUTTON4 : INTEGER is 8
-	wxUNKNOWN_PLATFORM : INTEGER is 1
-	wxCURSES : INTEGER is 2
-	wxXVIEW_X : INTEGER is 3
-	wxMOTIF_X : INTEGER is 4
-	wxCOSE_X : INTEGER is 5
-	wxNEXTSTEP : INTEGER is 6
-	wxMACINTOSH : INTEGER is 7
-	wxBEOS : INTEGER is 8
-	wxGTK : INTEGER is 9
-	wxGTK_WIN32 : INTEGER is 10
-	wxGTK_OS2 : INTEGER is 11
-	wxGTK_BEOS : INTEGER is 12
-	wxQT : INTEGER is 13
-	wxGEOS : INTEGER is 14
-	wxOS2_PM : INTEGER is 15
-	wxWINDOWS : INTEGER is 16
-	wxPENWINDOWS : INTEGER is 17
-	wxWINDOWS_NT : INTEGER is 18
-	wxWIN32S : INTEGER is 19
-	wxWIN95 : INTEGER is 20
-	wxWIN386 : INTEGER is 21
-	wxMGL_UNIX : INTEGER is 22
-	wxMGL_X : INTEGER is 23
-	wxMGL_WIN32 : INTEGER is 24
-	wxMGL_OS2 : INTEGER is 25
-	wxWINDOWS_OS2 : INTEGER is 26
-	wxUNIX : INTEGER is 27
-	wxBIG_ENDIAN : INTEGER is 4321
-	wxLITTLE_ENDIAN : INTEGER is 1234
-	wxPDP_ENDIAN : INTEGER is 3412
-	wxCENTRE : INTEGER is 1
-	wxCENTER : INTEGER is 1
-	wxCENTER_FRAME : INTEGER is 0
-	wxCENTRE_ON_SCREEN : INTEGER is 2
-	wxHORIZONTAL : INTEGER is 4
-	wxVERTICAL : INTEGER is 8
-	wxBOTH : INTEGER is 12
-	wxLEFT : INTEGER is 16
-	wxRIGHT : INTEGER is 32
-	wxUP : INTEGER is 64
-	wxDOWN : INTEGER is 128
-	wxTOP : INTEGER is 64
-	wxBOTTOM : INTEGER is 128
-	wxNORTH : INTEGER is 64
-	wxSOUTH : INTEGER is 128
-	wxWEST : INTEGER is 16
-	wxEAST : INTEGER is 32
-	wxALL : INTEGER is 240
-	wxALIGN_NOT : INTEGER is 0
-	wxALIGN_CENTER_HORIZONTAL : INTEGER is 256
-	wxALIGN_CENTRE_HORIZONTAL : INTEGER is 256
-	wxALIGN_LEFT : INTEGER is 0
-	wxALIGN_TOP : INTEGER is 0
-	wxALIGN_RIGHT : INTEGER is 512
-	wxALIGN_BOTTOM : INTEGER is 1024
-	wxALIGN_CENTER_VERTICAL : INTEGER is 2048
-	wxALIGN_CENTRE_VERTICAL : INTEGER is 2048
-	wxALIGN_CENTER : INTEGER is 2304
-	wxALIGN_CENTRE : INTEGER is 2304
-	wxSTRETCH_NOT : INTEGER is 0
-	wxSHRINK : INTEGER is 4096
-	wxGROW : INTEGER is 8192
-	wxEXPAND : INTEGER is 8192
-	wxSHAPED : INTEGER is 16384
-	wxVSCROLL : INTEGER is -2147483648
-	wxHSCROLL : INTEGER is 1073741824
-	wxCAPTION : INTEGER is 536870912
-	wxDOUBLE_BORDER : INTEGER is 268435456
-	wxSUNKEN_BORDER : INTEGER is 134217728
-	wxRAISED_BORDER : INTEGER is 67108864
-	wxSTATIC_BORDER : INTEGER is 16777216
-	wxBORDER :        INTEGER is 33554432
-	wxTRANSPARENT_WINDOW : INTEGER is 1048576
-	wxNO_BORDER : INTEGER is 2097152
-	wxUSER_COLOURS : INTEGER is 8388608
-	wxNO_3D : INTEGER is 8388608
-	wxCLIP_CHILDREN : INTEGER is 4194304
-	wxTAB_TRAVERSAL : INTEGER is 524288
-	wxWANTS_CHARS : INTEGER is 262144
-	wxRETAINED : INTEGER is 131072
-	wxNO_FULL_REPAINT_ON_RESIZE : INTEGER is 65536
-	wxWS_EX_VALIDATE_RECURSIVELY : INTEGER is 1
-	wxSTAY_ON_TOP : INTEGER is 32768
-	wxICONIZE : INTEGER is 16384
-	wxMAXIMIZE : INTEGER is 8192
-	wxSYSTEM_MENU : INTEGER is 2048
-	wxMINIMIZE_BOX : INTEGER is 1024
-	wxMAXIMIZE_BOX : INTEGER is 512
-	wxDEFAULT_FRAME_STYLE : INTEGER is 536878656
-
-	wxTINY_CAPTION_HORIZ : INTEGER is 256
-	wxTINY_CAPTION_VERT : INTEGER is 128
-	wxRESIZE_BORDER : INTEGER is 64
-	wxDIALOG_MODAL : INTEGER is 32
-	wxDIALOG_MODELESS : INTEGER is 0
-	wxFRAME_FLOAT_ON_PARENT : INTEGER is 8
-	wxFRAME_NO_WINDOW_MENU : INTEGER is 256
-	wxED_CLIENT_MARGIN : INTEGER is 4
-	wxED_BUTTONS_BOTTOM : INTEGER is 0
-	wxED_BUTTONS_RIGHT : INTEGER is 2
-	wxED_STATIC_LINE : INTEGER is 1
-	wxTB_3DBUTTONS : INTEGER is 16
-	wxTB_FLAT : INTEGER is 32
-	wxTB_DOCKABLE : INTEGER is 64
-	wxMB_DOCKABLE : INTEGER is 1
-	wxMENU_TEAROFF : INTEGER is 1
-	wxCOLOURED : INTEGER is 2048
-	wxFIXED_LENGTH : INTEGER is 1024
-	wxLB_SORT : INTEGER is 16
-	wxLB_SINGLE : INTEGER is 32
-	wxLB_MULTIPLE : INTEGER is 64
-	wxLB_EXTENDED : INTEGER is 128
-	wxLB_OWNERDRAW : INTEGER is 256
-	wxLB_NEEDED_SB : INTEGER is 512
-	wxLB_ALWAYS_SB : INTEGER is 1024
-	wxTE_READONLY : INTEGER is 16
-	wxTE_MULTILINE : INTEGER is 32
-	wxTE_PROCESS_TAB : INTEGER is 64
-	wxTE_RICH : INTEGER is 128
-	wxTE_NO_VSCROLL : INTEGER is 256
-	wxTE_AUTO_SCROLL : INTEGER is 512
-	wxPROCESS_ENTER : INTEGER is 1024
-	wxPASSWORD : INTEGER is 2048
-	wxCB_SIMPLE : INTEGER is 4
-	wxCB_SORT : INTEGER is 8
-	wxCB_READONLY : INTEGER is 16
-	wxCB_DROPDOWN : INTEGER is 32
-	wxRB_GROUP : INTEGER is 4
-	wxGA_PROGRESSBAR : INTEGER is 16
-	wxGA_SMOOTH : INTEGER is 32
-	wxSL_NOTIFY_DRAG : INTEGER is 0
-	wxSL_AUTOTICKS : INTEGER is 16
-	wxSL_LABELS : INTEGER is 32
-	wxSL_LEFT : INTEGER is 64
-	wxSL_TOP : INTEGER is 128
-	wxSL_RIGHT : INTEGER is 256
-	wxSL_BOTTOM : INTEGER is 512
-	wxSL_BOTH : INTEGER is 1024
-	wxSL_SELRANGE : INTEGER is 2048
-	wxBU_AUTODRAW : INTEGER is 4
-	wxBU_NOAUTODRAW : INTEGER is 0
-	wxBU_LEFT : INTEGER is 64
-	wxBU_TOP : INTEGER is 128
-	wxBU_RIGHT : INTEGER is 256
-	wxBU_BOTTOM : INTEGER is 512
-	wxLC_ICON : INTEGER is 4
-	wxLC_SMALL_ICON : INTEGER is 8
-	wxLC_LIST : INTEGER is 16
-	wxLC_REPORT : INTEGER is 32
-	wxLC_ALIGN_TOP : INTEGER is 64
-	wxLC_ALIGN_LEFT : INTEGER is 128
-	wxLC_AUTOARRANGE : INTEGER is 256
-	wxLC_USER_TEXT : INTEGER is 512
-	wxLC_EDIT_LABELS : INTEGER is 1024
-	wxLC_NO_HEADER : INTEGER is 2048
-	wxLC_NO_SORT_HEADER : INTEGER is 4096
-	wxLC_SINGLE_SEL : INTEGER is 8192
-	wxLC_SORT_ASCENDING : INTEGER is 16384
-	wxLC_SORT_DESCENDING : INTEGER is 32768
-	wxSP_ARROW_KEYS : INTEGER is 4096
-	wxSP_WRAP : INTEGER is 8192
-	wxSP_NOBORDER : INTEGER is 0
-	wxSP_NOSASH : INTEGER is 16
-	wxSP_BORDER : INTEGER is 32
-	wxSP_PERMIT_UNSPLIT : INTEGER is 64
-	wxSP_LIVE_UPDATE : INTEGER is 128
-	wxSP_3DSASH :   INTEGER is 256
-	wxSP_3DBORDER : INTEGER is 512
-	wxSP_3D :   INTEGER is 768
-	wxSP_FULLSASH : INTEGER is 1024
-	wxFRAME_TOOL_WINDOW : INTEGER is 4
-	wxTC_MULTILINE : INTEGER is 0
-	wxTC_RIGHTJUSTIFY : INTEGER is 16
-	wxTC_FIXEDWIDTH : INTEGER is 32
-	wxTC_OWNERDRAW : INTEGER is 64
-	wxNB_FIXEDWIDTH : INTEGER is 16
-	wxNB_LEFT : INTEGER is 32
-	wxNB_RIGHT : INTEGER is 64
-	wxNB_BOTTOM : INTEGER is 128
-	wxST_SIZEGRIP : INTEGER is 16
-	wxST_NO_AUTORESIZE : INTEGER is 1
-	wxPD_CAN_ABORT : INTEGER is 1
-	wxPD_APP_MODAL : INTEGER is 2
-	wxPD_AUTO_HIDE : INTEGER is 4
-	wxPD_ELAPSED_TIME : INTEGER is 8
-	wxPD_ESTIMATED_TIME : INTEGER is 16
-	wxPD_REMAINING_TIME : INTEGER is 64
-	wxHW_SCROLLBAR_NEVER : INTEGER is 2
-	wxHW_SCROLLBAR_AUTO : INTEGER is 4
-	wxCAL_SUNDAY_FIRST : INTEGER is 0
-	wxCAL_MONDAY_FIRST : INTEGER is 1
-	wxCAL_SHOW_HOLIDAYS : INTEGER is 2
-	wxCAL_NO_YEAR_CHANGE : INTEGER is 4
-	wxCAL_NO_MONTH_CHANGE : INTEGER is 12
-	wxICON_EXCLAMATION : INTEGER is 256
-	wxICON_HAND : INTEGER is 512
-	wxICON_QUESTION : INTEGER is 1024
-	wxICON_INFORMATION : INTEGER is 2048
-	wxFORWARD : INTEGER is 4096
-	wxBACKWARD : INTEGER is 8192
-	wxRESET : INTEGER is 16384
-	wxHELP : INTEGER is 32768
-	wxMORE : INTEGER is 65536
-	wxSETUP : INTEGER is 131072
-	wxID_LOWEST : INTEGER is 4999
-	wxID_OPEN : INTEGER is 5000
-	wxID_CLOSE : INTEGER is 5001
-	wxID_NEW : INTEGER is 5002
-	wxID_SAVE : INTEGER is 5003
-	wxID_SAVEAS : INTEGER is 5004
-	wxID_REVERT : INTEGER is 5005
-	wxID_EXIT : INTEGER is 5006
-	wxID_UNDO : INTEGER is 5007
-	wxID_REDO : INTEGER is 5008
-	wxID_HELP : INTEGER is 5009
-	wxID_PRINT : INTEGER is 5010
-	wxID_PRINT_SETUP : INTEGER is 5011
-	wxID_PREVIEW : INTEGER is 5012
-	wxID_ABOUT : INTEGER is 5013
-	wxID_HELP_CONTENTS : INTEGER is 5014
-	wxID_HELP_COMMANDS : INTEGER is 5015
-	wxID_HELP_PROCEDURES : INTEGER is 5016
-	wxID_HELP_CONTEXT : INTEGER is 5017
-	wxID_CUT : INTEGER is 5030
-	wxID_COPY : INTEGER is 5031
-	wxID_PASTE : INTEGER is 5032
-	wxID_CLEAR : INTEGER is 5033
-	wxID_FIND : INTEGER is 5034
-	wxID_DUPLICATE : INTEGER is 5035
-	wxID_SELECTALL : INTEGER is 5036
-	wxID_FILE1 : INTEGER is 5050
-	wxID_FILE2 : INTEGER is 5051
-	wxID_FILE3 : INTEGER is 5052
-	wxID_FILE4 : INTEGER is 5053
-	wxID_FILE5 : INTEGER is 5054
-	wxID_FILE6 : INTEGER is 5055
-	wxID_FILE7 : INTEGER is 5056
-	wxID_FILE8 : INTEGER is 5057
-	wxID_FILE9 : INTEGER is 5058
-	wxID_OK : INTEGER is 5100
-	wxID_CANCEL : INTEGER is 5101
-	wxID_APPLY : INTEGER is 5102
-	wxID_YES : INTEGER is 5103
-	wxID_NO : INTEGER is 5104
-	wxID_STATIC : INTEGER is 5105
-	wxID_FORWARD : INTEGER is 5106
-	wxID_BACKWARD : INTEGER is 5107
-	wxID_DEFAULT : INTEGER is 5108
-	wxID_MORE : INTEGER is 5109
-	wxID_SETUP : INTEGER is 5110
-	wxID_RESET : INTEGER is 5111
-	wxID_FILEDLGG : INTEGER is 5900
-	wxID_HIGHEST : INTEGER is 5999
-	wxSIZE_AUTO_WIDTH : INTEGER is 1
-	wxSIZE_AUTO_HEIGHT : INTEGER is 2
-	wxSIZE_USE_EXISTING : INTEGER is 0
-	wxSIZE_ALLOW_MINUS_ONE : INTEGER is 4
-	wxSIZE_NO_ADJUSTMENTS : INTEGER is 8
-	wxSOLID : INTEGER is 100
-	wxDOT : INTEGER is 101
-	wxLONG_DASH : INTEGER is 102
-	wxSHORT_DASH : INTEGER is 103
-	wxDOT_DASH : INTEGER is 104
-	wxUSER_DASH : INTEGER is 105
-	wxTRANSPARENT : INTEGER is 106
-	wxSTIPPLE_MASK_OPAQUE : INTEGER is 107
-	wxSTIPPLE_MASK : INTEGER is 108
-	wxSTIPPLE : INTEGER is 110
-	wxBDIAGONAL_HATCH : INTEGER is 111
-	wxCROSSDIAG_HATCH : INTEGER is 112
-	wxFDIAGONAL_HATCH : INTEGER is 113
-	wxCROSS_HATCH : INTEGER is 114
-	wxHORIZONTAL_HATCH : INTEGER is 115
-	wxVERTICAL_HATCH : INTEGER is 116
-	wxJOIN_BEVEL : INTEGER is 120
-	wxJOIN_MITER : INTEGER is 121
-	wxJOIN_ROUND : INTEGER is 122
-	wxCAP_ROUND : INTEGER is 130
-	wxCAP_PROJECTING : INTEGER is 131
-	wxCAP_BUTT : INTEGER is 132
-	wxCLEAR : INTEGER is 0
-	wxXOR : INTEGER is 1
-	wxINVERT : INTEGER is 2
-	wxOR_REVERSE : INTEGER is 3
-	wxAND_REVERSE : INTEGER is 4
-	wxCOPY : INTEGER is 5
-	wxAND : INTEGER is 6
-	wxAND_INVERT : INTEGER is 7
-	wxNO_OP : INTEGER is 8
-	wxNOR : INTEGER is 9
-	wxEQUIV : INTEGER is 10
-	wxSRC_INVERT : INTEGER is 11
-	wxOR_INVERT : INTEGER is 12
-	wxNAND : INTEGER is 13
-	wxOR : INTEGER is 14
-	wxSET : INTEGER is 15
-	wxFLOOD_SURFACE : INTEGER is 1
-	wxFLOOD_BORDER : INTEGER is 2
-	wxODDEVEN_RULE : INTEGER is 1
-	wxWINDING_RULE : INTEGER is 2
-	wxTOOL_TOP : INTEGER is 1
-	wxTOOL_BOTTOM : INTEGER is 2
-	wxTOOL_LEFT : INTEGER is 3
-	wxTOOL_RIGHT : INTEGER is 4
-	wxDF_INVALID : INTEGER is 1
-	wxDF_TEXT : INTEGER is 2
-	wxDF_BITMAP : INTEGER is 3
-	wxDF_METAFILE : INTEGER is 4
-	wxDF_SYLK : INTEGER is 5
-	wxDF_DIF : INTEGER is 6
-	wxDF_TIFF : INTEGER is 7
-	wxDF_OEMTEXT : INTEGER is 8
-	wxDF_DIB : INTEGER is 9
-	wxDF_PALETTE : INTEGER is 10
-	wxDF_PENDATA : INTEGER is 11
-	wxDF_RIFF : INTEGER is 12
-	wxDF_WAVE : INTEGER is 13
-	wxDF_UNICODETEXT : INTEGER is 14
-	wxDF_ENHMETAFILE : INTEGER is 15
-	wxDF_FILENAME : INTEGER is 16
-	wxDF_LOCALE : INTEGER is 17
-	wxDF_PRIVATE : INTEGER is 18
-	wxDF_MAX : INTEGER is 19
-	WXK_BACK : INTEGER is 8
-	WXK_TAB : INTEGER is 9
-	WXK_RETURN : INTEGER is 13
-	WXK_ESCAPE : INTEGER is 27
-	WXK_SPACE : INTEGER is 32
-	WXK_DELETE : INTEGER is 127
-	WXK_START : INTEGER is 300
-	WXK_LBUTTON : INTEGER is 301
-	WXK_RBUTTON : INTEGER is 302
-	WXK_CANCEL : INTEGER is 303
-	WXK_MBUTTON : INTEGER is 304
-	WXK_CLEAR : INTEGER is 305
-	WXK_SHIFT : INTEGER is 306
-	WXK_ALT : INTEGER is 307
-	WXK_CONTROL : INTEGER is 308
-	WXK_MENU : INTEGER is 309
-	WXK_PAUSE : INTEGER is 310
-	WXK_CAPITAL : INTEGER is 311
-	WXK_PRIOR : INTEGER is 312
-	WXK_NEXT : INTEGER is 313
-	WXK_END : INTEGER is 314
-	WXK_HOME : INTEGER is 315
-	WXK_LEFT : INTEGER is 316
-	WXK_UP : INTEGER is 317
-	WXK_RIGHT : INTEGER is 318
-	WXK_DOWN : INTEGER is 319
-	WXK_SELECT : INTEGER is 320
-	WXK_PRINT : INTEGER is 321
-	WXK_EXECUTE : INTEGER is 322
-	WXK_SNAPSHOT : INTEGER is 323
-	WXK_INSERT : INTEGER is 324
-	WXK_HELP : INTEGER is 325
-	WXK_NUMPAD0 : INTEGER is 326
-	WXK_NUMPAD1 : INTEGER is 327
-	WXK_NUMPAD2 : INTEGER is 328
-	WXK_NUMPAD3 : INTEGER is 329
-	WXK_NUMPAD4 : INTEGER is 330
-	WXK_NUMPAD5 : INTEGER is 331
-	WXK_NUMPAD6 : INTEGER is 332
-	WXK_NUMPAD7 : INTEGER is 333
-	WXK_NUMPAD8 : INTEGER is 334
-	WXK_NUMPAD9 : INTEGER is 335
-	WXK_MULTIPLY : INTEGER is 336
-	WXK_ADD : INTEGER is 337
-	WXK_SEPARATOR : INTEGER is 338
-	WXK_SUBTRACT : INTEGER is 339
-	WXK_DECIMAL : INTEGER is 340
-	WXK_DIVIDE : INTEGER is 341
-	WXK_F1 : INTEGER is 342
-	WXK_F2 : INTEGER is 343
-	WXK_F3 : INTEGER is 344
-	WXK_F4 : INTEGER is 345
-	WXK_F5 : INTEGER is 346
-	WXK_F6 : INTEGER is 347
-	WXK_F7 : INTEGER is 348
-	WXK_F8 : INTEGER is 349
-	WXK_F9 : INTEGER is 350
-	WXK_F10 : INTEGER is 351
-	WXK_F11 : INTEGER is 352
-	WXK_F12 : INTEGER is 353
-	WXK_F13 : INTEGER is 354
-	WXK_F14 : INTEGER is 355
-	WXK_F15 : INTEGER is 356
-	WXK_F16 : INTEGER is 357
-	WXK_F17 : INTEGER is 358
-	WXK_F18 : INTEGER is 359
-	WXK_F19 : INTEGER is 360
-	WXK_F20 : INTEGER is 361
-	WXK_F21 : INTEGER is 362
-	WXK_F22 : INTEGER is 363
-	WXK_F23 : INTEGER is 364
-	WXK_F24 : INTEGER is 365
-	WXK_NUMLOCK : INTEGER is 366
-	WXK_SCROLL : INTEGER is 367
-	WXK_PAGEUP : INTEGER is 368
-	WXK_PAGEDOWN : INTEGER is 369
-	WXK_NUMPAD_SPACE : INTEGER is 370
-	WXK_NUMPAD_TAB : INTEGER is 371
-	WXK_NUMPAD_ENTER : INTEGER is 372
-	WXK_NUMPAD_F1 : INTEGER is 373
-	WXK_NUMPAD_F2 : INTEGER is 374
-	WXK_NUMPAD_F3 : INTEGER is 375
-	WXK_NUMPAD_F4 : INTEGER is 376
-	WXK_NUMPAD_HOME : INTEGER is 377
-	WXK_NUMPAD_LEFT : INTEGER is 378
-	WXK_NUMPAD_UP : INTEGER is 379
-	WXK_NUMPAD_RIGHT : INTEGER is 380
-	WXK_NUMPAD_DOWN : INTEGER is 381
-	WXK_NUMPAD_PRIOR : INTEGER is 382
-	WXK_NUMPAD_PAGEUP : INTEGER is 383
-	WXK_NUMPAD_NEXT : INTEGER is 384
-	WXK_NUMPAD_PAGEDOWN : INTEGER is 385
-	WXK_NUMPAD_END : INTEGER is 386
-	WXK_NUMPAD_BEGIN : INTEGER is 387
-	WXK_NUMPAD_INSERT : INTEGER is 388
-	WXK_NUMPAD_DELETE : INTEGER is 389
-	WXK_NUMPAD_EQUAL : INTEGER is 390
-	WXK_NUMPAD_MULTIPLY : INTEGER is 391
-	WXK_NUMPAD_ADD : INTEGER is 392
-	WXK_NUMPAD_SEPARATOR : INTEGER is 393
-	WXK_NUMPAD_SUBTRACT : INTEGER is 394
-	WXK_NUMPAD_DECIMAL : INTEGER is 395
-	WXK_NUMPAD_DIVIDE : INTEGER is 396
-	wxMM_TEXT : INTEGER is 1
-	wxMM_LOMETRIC : INTEGER is 2
-	wxMM_HIMETRIC : INTEGER is 3
-	wxMM_LOENGLISH : INTEGER is 4
-	wxMM_HIENGLISH : INTEGER is 5
-	wxMM_TWIPS : INTEGER is 6
-	wxMM_ISOTROPIC : INTEGER is 7
-	wxMM_ANISOTROPIC : INTEGER is 8
-	wxMM_POINTS : INTEGER is 9
-	wxMM_METRIC : INTEGER is 10
-	wxPAPER_NONE : INTEGER is 0
-	wxPAPER_LETTER : INTEGER is 1
-	wxPAPER_LEGAL : INTEGER is 2
-	wxPAPER_A4 : INTEGER is 3
-	wxPAPER_CSHEET : INTEGER is 4
-	wxPAPER_DSHEET : INTEGER is 5
-	wxPAPER_ESHEET : INTEGER is 6
-	wxPAPER_LETTERSMALL : INTEGER is 7
-	wxPAPER_TABLOID : INTEGER is 8
-	wxPAPER_LEDGER : INTEGER is 9
-	wxPAPER_STATEMENT : INTEGER is 10
-	wxPAPER_EXECUTIVE : INTEGER is 11
-	wxPAPER_A3 : INTEGER is 12
-	wxPAPER_A4SMALL : INTEGER is 13
-	wxPAPER_A5 : INTEGER is 14
-	wxPAPER_B4 : INTEGER is 15
-	wxPAPER_B5 : INTEGER is 16
-	wxPAPER_FOLIO : INTEGER is 17
-	wxPAPER_QUARTO : INTEGER is 18
-	wxPAPER_10X14 : INTEGER is 19
-	wxPAPER_11X17 : INTEGER is 20
-	wxPAPER_NOTE : INTEGER is 21
-	wxPAPER_ENV_9 : INTEGER is 22
-	wxPAPER_ENV_10 : INTEGER is 23
-	wxPAPER_ENV_11 : INTEGER is 24
-	wxPAPER_ENV_12 : INTEGER is 25
-	wxPAPER_ENV_14 : INTEGER is 26
-	wxPAPER_ENV_DL : INTEGER is 27
-	wxPAPER_ENV_C5 : INTEGER is 28
-	wxPAPER_ENV_C3 : INTEGER is 29
-	wxPAPER_ENV_C4 : INTEGER is 30
-	wxPAPER_ENV_C6 : INTEGER is 31
-	wxPAPER_ENV_C65 : INTEGER is 32
-	wxPAPER_ENV_B4 : INTEGER is 33
-	wxPAPER_ENV_B5 : INTEGER is 34
-	wxPAPER_ENV_B6 : INTEGER is 35
-	wxPAPER_ENV_ITALY : INTEGER is 36
-	wxPAPER_ENV_MONARCH : INTEGER is 37
-	wxPAPER_ENV_PERSONAL : INTEGER is 38
-	wxPAPER_FANFOLD_US : INTEGER is 39
-	wxPAPER_FANFOLD_STD_GERMAN : INTEGER is 40
-	wxPAPER_FANFOLD_LGL_GERMAN : INTEGER is 41
-	wxPAPER_ISO_B4 : INTEGER is 42
-	wxPAPER_JAPANESE_POSTCARD : INTEGER is 43
-	wxPAPER_9X11 : INTEGER is 44
-	wxPAPER_10X11 : INTEGER is 45
-	wxPAPER_15X11 : INTEGER is 46
-	wxPAPER_ENV_INVITE : INTEGER is 47
-	wxPAPER_LETTER_EXTRA : INTEGER is 48
-	wxPAPER_LEGAL_EXTRA : INTEGER is 49
-	wxPAPER_TABLOID_EXTRA : INTEGER is 50
-	wxPAPER_A4_EXTRA : INTEGER is 51
-	wxPAPER_LETTER_TRANSVERSE : INTEGER is 52
-	wxPAPER_A4_TRANSVERSE : INTEGER is 53
-	wxPAPER_LETTER_EXTRA_TRANSVERSE : INTEGER is 54
-	wxPAPER_A_PLUS : INTEGER is 55
-	wxPAPER_B_PLUS : INTEGER is 56
-	wxPAPER_LETTER_PLUS : INTEGER is 57
-	wxPAPER_A4_PLUS : INTEGER is 58
-	wxPAPER_A5_TRANSVERSE : INTEGER is 59
-	wxPAPER_B5_TRANSVERSE : INTEGER is 60
-	wxPAPER_A3_EXTRA : INTEGER is 61
-	wxPAPER_A5_EXTRA : INTEGER is 62
-	wxPAPER_B5_EXTRA : INTEGER is 63
-	wxPAPER_A2 : INTEGER is 64
-	wxPAPER_A3_TRANSVERSE : INTEGER is 65
-	wxPAPER_A3_EXTRA_TRANSVERSE : INTEGER is 66
-	wxPORTRAIT : INTEGER is 1
-	wxLANDSCAPE : INTEGER is 2
-	wxDUPLEX_SIMPLEX : INTEGER is 0
-	wxDUPLEX_HORIZONTAL : INTEGER is 1
-	wxDUPLEX_VERTICAL : INTEGER is 2
-	wxPRINT_MODE_NONE : INTEGER is 0
-	wxPRINT_MODE_PREVIEW : INTEGER is 1
-	wxPRINT_MODE_FILE : INTEGER is 2
-	wxPRINT_MODE_PRINTER : INTEGER is 3
-
-	-- from: frame.h
-
-	wxFULLSCREEN_NOMENUBAR : INTEGER is 1
-	wxFULLSCREEN_NOTOOLBAR : INTEGER is 2
-	wxFULLSCREEN_NOSTATUSBAR : INTEGER is 4
-	wxFULLSCREEN_NOBORDER : INTEGER is 8
-	wxFULLSCREEN_NOCAPTION : INTEGER is 16
-
-	-- from: layout.h
-
-	wxLAYOUT_DEFAULT_MARGIN : INTEGER is 0
-	wxEDGE_LEFT             : INTEGER is 0
-	wxEDGE_TOP              : INTEGER is 1
-	wxEDGE_RIGHT            : INTEGER is 2
-	wxEDGE_BOTTOM           : INTEGER is 3 
-	wxEDGE_WIDTH            : INTEGER is 4
-	wxEDGE_HEIGHT           : INTEGER is 5
-	wxEDGE_CENTER           : INTEGER is 6
-	wxEDGE_CENTREX          : INTEGER is 7
-	wxEDGE_CENTREY          : INTEGER is 8
-	
-	wxRELATIONSHIP_UNCONSTRAINED : INTEGER is 0
-	wxRELATIONSHIP_ASIS          : INTEGER is 1
-	wxRELATIONSHIP_PERCENTOF     : INTEGER is 2
-	wxRELATIONSHIP_ABOVE         : INTEGER is 3
-	wxRELATIONSHIP_BELOW         : INTEGER is 4
-	wxRELATIONSHIP_LEFTOF        : INTEGER is 5
-	wxRELATIONSHIP_RIGHTOF       : INTEGER is 6
-	wxRELATIONSHIP_SAMEAS        : INTEGER is 7
-	wxRELATIONSHIP_ABSOLUTE      : INTEGER is 8
-
-	-- from: fontenc.h
-
-	wxFONTENCODING_SYSTEM : INTEGER is -1
-	wxFONTENCODING_DEFAULT : INTEGER is 0
-	wxFONTENCODING_ISO8859_1 : INTEGER is 1
-	wxFONTENCODING_ISO8859_2 : INTEGER is 2
-	wxFONTENCODING_ISO8859_3 : INTEGER is 3
-	wxFONTENCODING_ISO8859_4 : INTEGER is 4
-	wxFONTENCODING_ISO8859_5 : INTEGER is 5
-	wxFONTENCODING_ISO8859_6 : INTEGER is 6
-	wxFONTENCODING_ISO8859_7 : INTEGER is 7
-	wxFONTENCODING_ISO8859_8 : INTEGER is 8
-	wxFONTENCODING_ISO8859_9 : INTEGER is 9
-	wxFONTENCODING_ISO8859_10 : INTEGER is 10
-	wxFONTENCODING_ISO8859_11 : INTEGER is 11
-	wxFONTENCODING_ISO8859_12 : INTEGER is 12
-	wxFONTENCODING_ISO8859_13 : INTEGER is 13
-	wxFONTENCODING_ISO8859_14 : INTEGER is 14
-	wxFONTENCODING_ISO8859_15 : INTEGER is 15
-	wxFONTENCODING_ISO8859_MAX : INTEGER is 16
-	wxFONTENCODING_KOI8 : INTEGER is 17
-	wxFONTENCODING_ALTERNATIVE : INTEGER is 18
-	wxFONTENCODING_BULGARIAN : INTEGER is 19
-	wxFONTENCODING_CP437 : INTEGER is 20
-	wxFONTENCODING_CP850 : INTEGER is 21
-	wxFONTENCODING_CP852 : INTEGER is 22
-	wxFONTENCODING_CP855 : INTEGER is 23
-	wxFONTENCODING_CP866 : INTEGER is 24
-	wxFONTENCODING_CP874 : INTEGER is 25
-	wxFONTENCODING_CP1250 : INTEGER is 26
-	wxFONTENCODING_CP1251 : INTEGER is 27
-	wxFONTENCODING_CP1252 : INTEGER is 28
-	wxFONTENCODING_CP1253 : INTEGER is 29
-	wxFONTENCODING_CP1254 : INTEGER is 30
-	wxFONTENCODING_CP1255 : INTEGER is 31
-	wxFONTENCODING_CP1256 : INTEGER is 32
-	wxFONTENCODING_CP1257 : INTEGER is 33
-	wxFONTENCODING_CP12_MAX : INTEGER is 34
-	wxFONTENCODING_UNICODE : INTEGER is 35
-	wxFONTENCODING_MAX : INTEGER is 36
-
-    wxGRIDTABLE_REQUEST_VIEW_GET_VALUES : INTEGER is 2000
-    wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES : INTEGER is 2001
-    wxGRIDTABLE_NOTIFY_ROWS_INSERTED : INTEGER is 2002
-    wxGRIDTABLE_NOTIFY_ROWS_APPENDED : INTEGER is 2003
-    wxGRIDTABLE_NOTIFY_ROWS_DELETED : INTEGER is 2004
-    wxGRIDTABLE_NOTIFY_COLS_INSERTED : INTEGER is 2005
-    wxGRIDTABLE_NOTIFY_COLS_APPENDED : INTEGER is 2006
-    wxGRIDTABLE_NOTIFY_COLS_DELETED : INTEGER is 2007
-	
-	wxGridSelectCells: INTEGER is 0
-	wxGridSelectRows: INTEGER is 1
-	wxGridSelectColumns: INTEGER is 2
-	
-	wxFILTER_NONE : INTEGER is 0
-	wxFILTER_ASCII : INTEGER is 1
-	wxFILTER_ALPHA : INTEGER is 2
-	wxFILTER_ALPHANUMERIC : INTEGER is 4
-	wxFILTER_NUMERIC : INTEGER is 8
-	wxFILTER_INCLUDE_LIST : INTEGER is 16
-	wxFILTER_EXCLUDE_LIST : INTEGER is 32
-	wxFILTER_UPPER_CASE : INTEGER is 64
-	wxFILTER_LOWER_CASE : INTEGER is 128
-
-    wxBITMAP_TYPE_INVALID: INTEGER is 0
-    wxBITMAP_TYPE_BMP: INTEGER is 1
-    wxBITMAP_TYPE_BMP_RESOURCE: INTEGER is 2
-    wxBITMAP_TYPE_RESOURCE: INTEGER is 2
-    wxBITMAP_TYPE_ICO: INTEGER is 3
-    wxBITMAP_TYPE_ICO_RESOURCE: INTEGER is 4
-    wxBITMAP_TYPE_CUR: INTEGER is 5
-    wxBITMAP_TYPE_CUR_RESOURCE: INTEGER is 6
-    wxBITMAP_TYPE_XBM: INTEGER is 7
-    wxBITMAP_TYPE_XBM_DATA: INTEGER is 8
-    wxBITMAP_TYPE_XPM: INTEGER is 9
-    wxBITMAP_TYPE_XPM_DATA: INTEGER is 10
-    wxBITMAP_TYPE_TIF: INTEGER is 11
-    wxBITMAP_TYPE_TIF_RESOURCE: INTEGER is 12
-    wxBITMAP_TYPE_GIF: INTEGER is 13
-    wxBITMAP_TYPE_GIF_RESOURCE: INTEGER is 14
-    wxBITMAP_TYPE_PNG: INTEGER is 15
-    wxBITMAP_TYPE_PNG_RESOURCE: INTEGER is 16
-    wxBITMAP_TYPE_JPEG: INTEGER is 17
-    wxBITMAP_TYPE_JPEG_RESOURCE: INTEGER is 18
-    wxBITMAP_TYPE_PNM: INTEGER is 19
-    wxBITMAP_TYPE_PNM_RESOURCE: INTEGER is 20
-    wxBITMAP_TYPE_PCX: INTEGER is 21
-    wxBITMAP_TYPE_PCX_RESOURCE: INTEGER is 22
-    wxBITMAP_TYPE_PICT: INTEGER is 23
-    wxBITMAP_TYPE_PICT_RESOURCE: INTEGER is 24
-    wxBITMAP_TYPE_ICON: INTEGER is 25
-    wxBITMAP_TYPE_ICON_RESOURCE: INTEGER is 26
-    wxBITMAP_TYPE_MACCURSOR: INTEGER is 27
-    wxBITMAP_TYPE_MACCURSOR_RESOURCE: INTEGER is 28
-    wxBITMAP_TYPE_ANY: INTEGER is 50
-	
-    wxCURSOR_NONE: INTEGER is 0
-    wxCURSOR_ARROW: INTEGER is 1
-    wxCURSOR_RIGHT_ARROW: INTEGER is 2
-    wxCURSOR_BULLSEYE: INTEGER is 3
-    wxCURSOR_CHAR: INTEGER is 4
-    wxCURSOR_CROSS: INTEGER is 5
-    wxCURSOR_HAND: INTEGER is 6
-    wxCURSOR_IBEAM: INTEGER is 7
-    wxCURSOR_LEFT_BUTTON: INTEGER is 8
-    wxCURSOR_MAGNIFIER: INTEGER is 9
-    wxCURSOR_MIDDLE_BUTTON: INTEGER is 10
-    wxCURSOR_NO_ENTRY: INTEGER is 11
-    wxCURSOR_PAINT_BRUSH: INTEGER is 12
-    wxCURSOR_PENCIL: INTEGER is 13
-    wxCURSOR_POINT_LEFT: INTEGER is 14
-    wxCURSOR_POINT_RIGHT: INTEGER is 15
-    wxCURSOR_QUESTION_ARROW: INTEGER is 16
-    wxCURSOR_RIGHT_BUTTON: INTEGER is 17
-    wxCURSOR_SIZENESW: INTEGER is 18
-    wxCURSOR_SIZENS: INTEGER is 19
-    wxCURSOR_SIZENWSE: INTEGER is 20
-    wxCURSOR_SIZEWE: INTEGER is 21
-    wxCURSOR_SIZING: INTEGER is 22
-    wxCURSOR_SPRAYCAN: INTEGER is 23
-    wxCURSOR_WAIT: INTEGER is 24
-    wxCURSOR_WATCH: INTEGER is 25
-    wxCURSOR_BLANK: INTEGER is 26
-
-    wxOPEN : INTEGER is 1
-    wxSAVE : INTEGER is 2
-    wxOVERWRITE_PROMPT : INTEGER is 4
-    wxHIDE_READONLY : INTEGER is 8
-    wxFILE_MUST_EXIST : INTEGER is 16
-    wxMULTIPLE : INTEGER is 32
-	wxCHANGE_DIR : INTEGER is 64
-	
-	wxDRAG_ERROR: INTEGER is 0
-	wxDRAG_NONE: INTEGER is 1
-	wxDRAG_COPY: INTEGER is 2
-	wxDRAG_MOVE: INTEGER is 3
-	wxDRAG_LINK: INTEGER is 4
-	wxDRAG_CANCEL: INTEGER is 5
-
-    wxSPLIT_HORIZONTAL: INTEGER is 1
-    wxSPLIT_VERTICAL: INTEGER is 2
-
-    wxLIST_FORMAT_LEFT: INTEGER is 0
-    wxLIST_FORMAT_RIGHT: INTEGER is 1
-    wxLIST_FORMAT_CENTRE: INTEGER is 2
-    wxLIST_FORMAT_CENTER: INTEGER is 2
-
-	wxLIST_STATE_DONTCARE : INTEGER is 0
-	wxLIST_STATE_DROPHILITED : INTEGER is 1
-	wxLIST_STATE_FOCUSED : INTEGER is 2
-	wxLIST_STATE_SELECTED : INTEGER is 4
-	wxLIST_STATE_CUT : INTEGER is 8
-
-	wxLIST_MASK_STATE : INTEGER is 1
-	wxLIST_MASK_TEXT : INTEGER is 2
-	wxLIST_MASK_IMAGE : INTEGER is 4
-	wxLIST_MASK_DATA : INTEGER is 8
-	wxLIST_MASK_WIDTH : INTEGER is 16
-	wxLIST_MASK_FORMAT : INTEGER is 32
-
-	wxLIST_NEXT_ABOVE: INTEGER is 0
-	wxLIST_NEXT_ALL: INTEGER is 1
-	wxLIST_NEXT_BELOW: INTEGER is 2
-	wxLIST_NEXT_LEFT: INTEGER is 3
-	wxLIST_NEXT_RIGHT: INTEGER is 4
-	
-	wxRA_SPECIFY_COLS : INTEGER is 4
-	wxRA_SPECIFY_ROWS : INTEGER is 8
-
-	wxTREE_HITTEST_ABOVE : INTEGER is 1
-	wxTREE_HITTEST_BELOW : INTEGER is 2
-	wxTREE_HITTEST_NOWHERE : INTEGER is 4
-	wxTREE_HITTEST_ONITEMBUTTON : INTEGER is 8
-	wxTREE_HITTEST_ONITEMICON : INTEGER is 16
-	wxTREE_HITTEST_ONITEMINDENT : INTEGER is 32
-	wxTREE_HITTEST_ONITEMLABEL : INTEGER is 64
-	wxTREE_HITTEST_ONITEMRIGHT : INTEGER is 128
-	wxTREE_HITTEST_ONITEMSTATEICON : INTEGER is 256
-	wxTREE_HITTEST_TOLEFT : INTEGER is 512
-	wxTREE_HITTEST_TORIGHT : INTEGER is 1024
-	wxTREE_HITTEST_ONITEMUPPERPART : INTEGER is 2048
-	wxTREE_HITTEST_ONITEMLOWERPART : INTEGER is 4096
-	wxTREE_HITTEST_ONITEM : INTEGER is 80
-	
-	wxDEFAULT:    INTEGER is 70
-	wxDECORATIVE: INTEGER is 71
-	wxROMAN:      INTEGER is 72
-	wxSCRIPT:     INTEGER is 73
-	wxSWISS:      INTEGER is 74
-	wxMODERN:     INTEGER is 75
-	wxTELETYPE:   INTEGER is 76
-	wxVARIABLE:   INTEGER is 80
-	wxFIXED:      INTEGER is 81
-	wxNORMAL:     INTEGER is 90
-	wxLIGHT:      INTEGER is 91
-	wxBOLD:       INTEGER is 92
-	wxITALIC:     INTEGER is 93
-	wxSLANT:      INTEGER is 94
-	
-	wxBLUE_BRUSH:        INTEGER is 0
-	wxGREEN_BRUSH:       INTEGER is 1
-	wxWHITE_BRUSH:       INTEGER is 2
-	wxBLACK_BRUSH:       INTEGER is 3
-	wxGREY_BRUSH:        INTEGER is 4
-	wxMEDIUM_GREY_BRUSH: INTEGER is 5
-	wxLIGHT_GREY_BRUSH:  INTEGER is 6
-	wxTRANSPARENT_BRUSH: INTEGER is 7
-	wxCYAN_BRUSH:        INTEGER is 8
-	wxRED_BRUSH:         INTEGER is 9
-
-	wxBLACK:      INTEGER is 0
-	wxWHITE:      INTEGER is 1
-	wxRED:        INTEGER is 2
-	wxBLUE:       INTEGER is 3
-	wxGREEN:      INTEGER is 4
-	wxCYAN:       INTEGER is 5
-	wxLIGHT_GREY: INTEGER is 6
-
-	wxRED_PEN:          INTEGER is 0
-	wxCYAN_PEN:         INTEGER is 1
-	wxGREEN_PEN:        INTEGER is 2
-	wxBLACK_PEN:        INTEGER is 3
-	wxWHITE_PEN:        INTEGER is 4
-	wxTRANSPARENT_PEN:  INTEGER is 5
-	wxBLACK_DASHED_PEN: INTEGER is 6
-	wxGREY_PEN:         INTEGER is 7
-	wxMEDIUM_GREY_PEN:  INTEGER is 8
-	wxLIGHT_GREY_PEN:   INTEGER is 9
-	
-	wxNOT_FOUND: INTEGER is -1
-
-    wxPRINTER_NO_ERROR:  INTEGER is 0
-    wxPRINTER_CANCELLED: INTEGER is 1
-    wxPRINTER_ERROR:     INTEGER is 2
-
-	wxPREVIEW_PRINT    : INTEGER is 1
-	wxPREVIEW_PREVIOUS : INTEGER is 2
-	wxPREVIEW_NEXT     : INTEGER is 4
-	wxPREVIEW_ZOOM     : INTEGER is 8
-	wxPREVIEW_FIRST    : INTEGER is 8
-	wxPREVIEW_LAST     : INTEGER is 32
-	wxPREVIEW_GOTO     : INTEGER is 64
-	wxPREVIEW_DEFAULT  : INTEGER is 126
-
-	wxID_PREVIEW_CLOSE:    INTEGER is 1
-	wxID_PREVIEW_NEXT:     INTEGER is 2
-	wxID_PREVIEW_PREVIOUS: INTEGER is 3
-	wxID_PREVIEW_PRINT:    INTEGER is 4
-	wxID_PREVIEW_ZOOM:     INTEGER is 5
-	wxID_PREVIEW_FIRST: INTEGER is 6
-	wxID_PREVIEW_LAST: INTEGER is 7
-	wxID_PREVIEW_GOTO: INTEGER is 8
-
-    wxPRINTID_STATIC:      INTEGER is 10
-    wxPRINTID_RANGE:       INTEGER is 11
-    wxPRINTID_FROM:        INTEGER is 12
-    wxPRINTID_TO:          INTEGER is 13
-    wxPRINTID_COPIES:      INTEGER is 14
-    wxPRINTID_PRINTTOFILE: INTEGER is 15
-    wxPRINTID_SETUP:       INTEGER is 16
-
-    wxPRINTID_LEFTMARGIN:   INTEGER is 30
-    wxPRINTID_RIGHTMARGIN:  INTEGER is 31
-    wxPRINTID_TOPMARGIN:    INTEGER is 32
-    wxPRINTID_BOTTOMMARGIN: INTEGER is 33
-
-    wxPRINTID_PRINTCOLOUR: INTEGER is 10
-    wxPRINTID_ORIENTATION: INTEGER is 11
-    wxPRINTID_COMMAND:     INTEGER is 12
-    wxPRINTID_OPTIONS:     INTEGER is 13
-    wxPRINTID_PAPERSIZE:   INTEGER is 14
-
-	wxHF_TOOLBAR      : INTEGER is 1
-	wxHF_CONTENTS     : INTEGER is 2
-	wxHF_INDEX        : INTEGER is 4
-	wxHF_SEARCH       : INTEGER is 8
-	wxHF_BOOKMARKS    : INTEGER is 16
-	wxHF_OPENFILES    : INTEGER is 32
-	wxHF_PRINT        : INTEGER is 64
-	wxHF_FLATTOOLBAR  : INTEGER is 128
-	wxHF_DEFAULTSTYLE : INTEGER is 95
-	
-    wxLAYOUT_HORIZONTAL:	INTEGER is 0
-    wxLAYOUT_VERTICAL:		INTEGER is 1
-
-    wxLAYOUT_NONE:		INTEGER is 0
-    wxLAYOUT_TOP:		INTEGER is 1
-    wxLAYOUT_LEFT:		INTEGER is 2
-    wxLAYOUT_RIGHT:		INTEGER is 3
-    wxLAYOUT_BOTTOM:	INTEGER is 4
-
-	wxSASH_DRAG_NONE:		INTEGER is 0
-	wxSASH_DRAG_DRAGGING:	INTEGER is 1
-	wxSASH_DRAG_LEFT_DOWN:	INTEGER is 2
-
-    wxSASH_TOP:		INTEGER is 0
-    wxSASH_RIGHT:	INTEGER is 1
-    wxSASH_BOTTOM:	INTEGER is 2
-    wxSASH_LEFT:	INTEGER is 3
-    wxSASH_NONE:	INTEGER is 100
-
-	wxSW_NOBORDER:	INTEGER is 0
-	wxSW_BORDER:	INTEGER is 32
-	wxSW_3DSASH:	INTEGER is 64
-	wxSW_3DBORDER:	INTEGER is 128
-	wxSW_3D:		INTEGER is 192
-
-    wxSASH_STATUS_OK:			INTEGER is 0
-    wxSASH_STATUS_OUT_OF_RANGE:	INTEGER is 1
-
-	-- from: settings.h
-
-	wxSYS_WHITE_BRUSH         : INTEGER is 0
-	wxSYS_LTGRAY_BRUSH        : INTEGER is 1
-	wxSYS_GRAY_BRUSH          : INTEGER is 2
-	wxSYS_DKGRAY_BRUSH        : INTEGER is 3
-	wxSYS_BLACK_BRUSH         : INTEGER is 4
-	wxSYS_NULL_BRUSH          : INTEGER is 5
-	wxSYS_HOLLOW_BRUSH        : INTEGER is 5
-	wxSYS_WHITE_PEN           : INTEGER is 6
-	wxSYS_BLACK_PEN           : INTEGER is 7
-	wxSYS_NULL_PEN            : INTEGER is 8
-	wxSYS_OEM_FIXED_FONT      : INTEGER is 10
-	wxSYS_ANSI_FIXED_FONT     : INTEGER is 11
-	wxSYS_ANSI_VAR_FONT       : INTEGER is 12
-	wxSYS_SYSTEM_FONT         : INTEGER is 13
-	wxSYS_DEVICE_DEFAULT_FONT : INTEGER is 14
-	wxSYS_DEFAULT_PALETTE     : INTEGER is 15
-	wxSYS_SYSTEM_FIXED_FONT   : INTEGER is 16
-	wxSYS_DEFAULT_GUI_FONT    : INTEGER is 17
-
-	wxSYS_COLOUR_SCROLLBAR         : INTEGER is 0
-	wxSYS_COLOUR_BACKGROUND        : INTEGER is 1
-	wxSYS_COLOUR_ACTIVECAPTION     : INTEGER is 2
-	wxSYS_COLOUR_INACTIVECAPTION   : INTEGER is 3
-	wxSYS_COLOUR_MENU              : INTEGER is 4
-	wxSYS_COLOUR_WINDOW            : INTEGER is 5
-	wxSYS_COLOUR_WINDOWFRAME       : INTEGER is 6
-	wxSYS_COLOUR_MENUTEXT          : INTEGER is 7
-	wxSYS_COLOUR_WINDOWTEXT        : INTEGER is 8
-	wxSYS_COLOUR_CAPTIONTEXT       : INTEGER is 9
-	wxSYS_COLOUR_ACTIVEBORDER      : INTEGER is 10
-	wxSYS_COLOUR_INACTIVEBORDER    : INTEGER is 11
-	wxSYS_COLOUR_APPWORKSPACE      : INTEGER is 12
-	wxSYS_COLOUR_HIGHLIGHT         : INTEGER is 13
-	wxSYS_COLOUR_HIGHLIGHTTEXT     : INTEGER is 14
-	wxSYS_COLOUR_BTNFACE           : INTEGER is 15
-	wxSYS_COLOUR_BTNSHADOW         : INTEGER is 16
-	wxSYS_COLOUR_GRAYTEXT          : INTEGER is 17
-	wxSYS_COLOUR_BTNTEXT           : INTEGER is 18
-	wxSYS_COLOUR_INACTIVECAPTIONTEXT : INTEGER is 19
-	wxSYS_COLOUR_BTNHIGHLIGHT      : INTEGER is 20
-
-	wxSYS_COLOUR_3DDKSHADOW        : INTEGER is 21
-	wxSYS_COLOUR_3DLIGHT           : INTEGER is 22
-	wxSYS_COLOUR_INFOTEXT          : INTEGER is 23
-	wxSYS_COLOUR_INFOBK            : INTEGER is 24
-
-	wxSYS_COLOUR_LISTBOX           : INTEGER is 25
-
-	wxSYS_COLOUR_DESKTOP           : INTEGER is 1
-	wxSYS_COLOUR_3DFACE            : INTEGER is 15
-	wxSYS_COLOUR_3DSHADOW          : INTEGER is 16
-	wxSYS_COLOUR_3DHIGHLIGHT       : INTEGER is 20
-	wxSYS_COLOUR_3DHILIGHT         : INTEGER is 20
-	wxSYS_COLOUR_BTNHILIGHT        : INTEGER is 20
-
-	wxSYS_MOUSE_BUTTONS           : INTEGER is 1
-	wxSYS_BORDER_X                : INTEGER is 2
-	wxSYS_BORDER_Y                : INTEGER is 3
-	wxSYS_CURSOR_X                : INTEGER is 4
-	wxSYS_CURSOR_Y                : INTEGER is 5
-	wxSYS_DCLICK_X                : INTEGER is 6
-	wxSYS_DCLICK_Y                : INTEGER is 7
-	wxSYS_DRAG_X                  : INTEGER is 8
-	wxSYS_DRAG_Y                  : INTEGER is 9
-	wxSYS_EDGE_X                  : INTEGER is 10
-	wxSYS_EDGE_Y                  : INTEGER is 11
-	wxSYS_HSCROLL_ARROW_X         : INTEGER is 12
-	wxSYS_HSCROLL_ARROW_Y         : INTEGER is 13
-	wxSYS_HTHUMB_X                : INTEGER is 14
-	wxSYS_ICON_X                  : INTEGER is 15
-	wxSYS_ICON_Y                  : INTEGER is 16
-	wxSYS_ICONSPACING_X           : INTEGER is 17
-	wxSYS_ICONSPACING_Y           : INTEGER is 18
-	wxSYS_WINDOWMIN_X             : INTEGER is 19
-	wxSYS_WINDOWMIN_Y             : INTEGER is 20
-	wxSYS_SCREEN_X                : INTEGER is 21
-	wxSYS_SCREEN_Y                : INTEGER is 22
-	wxSYS_FRAMESIZE_X             : INTEGER is 23
-	wxSYS_FRAMESIZE_Y             : INTEGER is 24
-	wxSYS_SMALLICON_X             : INTEGER is 25
-	wxSYS_SMALLICON_Y             : INTEGER is 26
-	wxSYS_HSCROLL_Y               : INTEGER is 27
-	wxSYS_VSCROLL_X               : INTEGER is 28
-	wxSYS_VSCROLL_ARROW_X         : INTEGER is 29
-	wxSYS_VSCROLL_ARROW_Y         : INTEGER is 30
-	wxSYS_VTHUMB_Y                : INTEGER is 31
-	wxSYS_CAPTION_Y               : INTEGER is 32
-	wxSYS_MENU_Y                  : INTEGER is 33
-	wxSYS_NETWORK_PRESENT         : INTEGER is 34
-	wxSYS_PENWINDOWS_PRESENT      : INTEGER is 35
-	wxSYS_SHOW_SOUNDS             : INTEGER is 36
-	wxSYS_SWAP_BUTTONS            : INTEGER is 37	
-
-	wxCAL_BORDER_NONE:		INTEGER is 0
-	wxCAL_BORDER_SQUARE:	INTEGER is 1
-	wxCAL_BORDER_ROUND:		INTEGER is 2
-	
-	wxCAL_HITTEST_NOWHERE:	INTEGER is 0
-	wxCAL_HITTEST_HEADER:	INTEGER is 1
-	wxCAL_HITTEST_DAY:		INTEGER is 2
-	
-	wxUNKNOWN:	INTEGER is 0
-	wxSTRING:	INTEGER is 1
-	wxBOOLEAN:	INTEGER is 2
-	wxINTEGER:	INTEGER is 3
-	wxFLOAT:	INTEGER is 4
-
-    wxMUTEX_NO_ERROR:	INTEGER is 0
-    wxMUTEX_DEAD_LOCK:	INTEGER is 1
-    wxMUTEX_BUSY:	    INTEGER is 2 
-    wxMUTEX_UNLOCKED:	INTEGER is 3
-    wxMUTEX_MISC_ERROR:	INTEGER is 4
-
-    wxPLATFORM_CURRENT: INTEGER is -1
-    wxPLATFORM_UNIX:    INTEGER is 0
-    wxPLATFORM_WINDOWS: INTEGER is 1
-    wxPLATFORM_OS2:     INTEGER is 2
-    wxPLATFORM_MAC:     INTEGER is 3
-
-    wxLED_ALIGN_LEFT: INTEGER is 1
-    wxLED_ALIGN_RIGHT: INTEGER is 2
-    wxLED_ALIGN_CENTER: INTEGER is 4
-
-    wxLED_ALIGN_MASK: INTEGER is 4
-
-	wxLED_DRAW_FADED: INTEGER is 8
-	
-	wxDS_MANAGE_SCROLLBARS: INTEGER is 16
-	wxDS_DRAG_CORNER: INTEGER is 32
-
-	wxEL_ALLOW_NEW: INTEGER is 256
-	wxEL_ALLOW_EDIT: INTEGER is 512
-	wxEL_ALLOW_DELETE: INTEGER is 1024
-
-    wxEVT_COMMAND_BUTTON_CLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_BUTTON_CLICKED"
-		end
-
-    wxEVT_COMMAND_CHECKBOX_CLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_CHECKBOX_CLICKED"
-		end
-
-    wxEVT_COMMAND_CHOICE_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_CHOICE_SELECTED"
-		end
-
-    wxEVT_COMMAND_LISTBOX_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LISTBOX_SELECTED"
-		end
-
-    wxEVT_COMMAND_LISTBOX_DOUBLECLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LISTBOX_DOUBLECLICKED"
-		end
-
-    wxEVT_COMMAND_CHECKLISTBOX_TOGGLED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_CHECKLISTBOX_TOGGLED"
-		end
-
-    wxEVT_COMMAND_TEXT_UPDATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TEXT_UPDATED"
-		end
-
-    wxEVT_COMMAND_TEXT_ENTER : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TEXT_ENTER"
-		end
-
-    wxEVT_COMMAND_MENU_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_MENU_SELECTED"
-		end
-
-    wxEVT_COMMAND_TOOL_CLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TOOL_CLICKED"
-		end
-
-    wxEVT_COMMAND_SLIDER_UPDATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SLIDER_UPDATED"
-		end
-
-    wxEVT_COMMAND_RADIOBOX_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_RADIOBOX_SELECTED"
-		end
-
-    wxEVT_COMMAND_RADIOBUTTON_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_RADIOBUTTON_SELECTED"
-		end
-
-    wxEVT_COMMAND_SCROLLBAR_UPDATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SCROLLBAR_UPDATED"
-		end
-
-    wxEVT_COMMAND_VLBOX_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_VLBOX_SELECTED"
-		end
-
-    wxEVT_COMMAND_COMBOBOX_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_COMBOBOX_SELECTED"
-		end
-
-    wxEVT_COMMAND_TOOL_RCLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TOOL_RCLICKED"
-		end
-
-    wxEVT_COMMAND_TOOL_ENTER : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TOOL_ENTER"
-		end
-
-    wxEVT_COMMAND_SPINCTRL_UPDATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SPINCTRL_UPDATED"
-		end
-
-    wxEVT_SOCKET : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SOCKET"
-		end
-
-    wxEVT_TIMER  : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_TIMER "
-		end
-
-    wxEVT_LEFT_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_LEFT_DOWN"
-		end
-
-    wxEVT_LEFT_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_LEFT_UP"
-		end
-
-    wxEVT_MIDDLE_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MIDDLE_DOWN"
-		end
-
-    wxEVT_MIDDLE_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MIDDLE_UP"
-		end
-
-    wxEVT_RIGHT_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_RIGHT_DOWN"
-		end
-
-    wxEVT_RIGHT_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_RIGHT_UP"
-		end
-
-    wxEVT_MOTION : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MOTION"
-		end
-
-    wxEVT_ENTER_WINDOW : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_ENTER_WINDOW"
-		end
-
-    wxEVT_LEAVE_WINDOW : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_LEAVE_WINDOW"
-		end
-
-    wxEVT_LEFT_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_LEFT_DCLICK"
-		end
-
-    wxEVT_MIDDLE_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MIDDLE_DCLICK"
-		end
-
-    wxEVT_RIGHT_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_RIGHT_DCLICK"
-		end
-
-    wxEVT_SET_FOCUS : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SET_FOCUS"
-		end
-
-    wxEVT_KILL_FOCUS : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_KILL_FOCUS"
-		end
-
-    wxEVT_NC_LEFT_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_LEFT_DOWN"
-		end
-
-    wxEVT_NC_LEFT_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_LEFT_UP"
-		end
-
-    wxEVT_NC_MIDDLE_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_MIDDLE_DOWN"
-		end
-
-    wxEVT_NC_MIDDLE_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_MIDDLE_UP"
-		end
-
-    wxEVT_NC_RIGHT_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_RIGHT_DOWN"
-		end
-
-    wxEVT_NC_RIGHT_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_RIGHT_UP"
-		end
-
-    wxEVT_NC_MOTION : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_MOTION"
-		end
-
-    wxEVT_NC_ENTER_WINDOW : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_ENTER_WINDOW"
-		end
-
-    wxEVT_NC_LEAVE_WINDOW : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_LEAVE_WINDOW"
-		end
-
-    wxEVT_NC_LEFT_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_LEFT_DCLICK"
-		end
-
-    wxEVT_NC_MIDDLE_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_MIDDLE_DCLICK"
-		end
-
-    wxEVT_NC_RIGHT_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_RIGHT_DCLICK"
-		end
-
-    wxEVT_CHAR : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CHAR"
-		end
-
-    wxEVT_CHAR_HOOK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CHAR_HOOK"
-		end
-
-    wxEVT_NAVIGATION_KEY : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NAVIGATION_KEY"
-		end
-
-    wxEVT_KEY_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_KEY_DOWN"
-		end
-
-    wxEVT_KEY_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_KEY_UP"
-		end
-
-    wxEVT_SET_CURSOR : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SET_CURSOR"
-		end
-
-    wxEVT_SCROLL_TOP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_TOP"
-		end
-
-    wxEVT_SCROLL_BOTTOM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_BOTTOM"
-		end
-
-    wxEVT_SCROLL_LINEUP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_LINEUP"
-		end
-
-    wxEVT_SCROLL_LINEDOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_LINEDOWN"
-		end
-
-    wxEVT_SCROLL_PAGEUP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_PAGEUP"
-		end
-
-    wxEVT_SCROLL_PAGEDOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_PAGEDOWN"
-		end
-
-    wxEVT_SCROLL_THUMBTRACK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_THUMBTRACK"
-		end
-
-    wxEVT_SCROLL_THUMBRELEASE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLL_THUMBRELEASE"
-		end
-
-    wxEVT_SCROLLWIN_TOP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_TOP"
-		end
-
-    wxEVT_SCROLLWIN_BOTTOM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_BOTTOM"
-		end
-
-    wxEVT_SCROLLWIN_LINEUP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_LINEUP"
-		end
-
-    wxEVT_SCROLLWIN_LINEDOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_LINEDOWN"
-		end
-
-    wxEVT_SCROLLWIN_PAGEUP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_PAGEUP"
-		end
-
-    wxEVT_SCROLLWIN_PAGEDOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_PAGEDOWN"
-		end
-
-    wxEVT_SCROLLWIN_THUMBTRACK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_THUMBTRACK"
-		end
-
-    wxEVT_SCROLLWIN_THUMBRELEASE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SCROLLWIN_THUMBRELEASE"
-		end
-
-    wxEVT_SIZE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SIZE"
-		end
-
-    wxEVT_MOVE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MOVE"
-		end
-
-    wxEVT_CLOSE_WINDOW : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CLOSE_WINDOW"
-		end
-
-    wxEVT_END_SESSION : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_END_SESSION"
-		end
-
-    wxEVT_QUERY_END_SESSION : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_QUERY_END_SESSION"
-		end
-
-    wxEVT_ACTIVATE_APP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_ACTIVATE_APP"
-		end
-
-    wxEVT_POWER : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_POWER"
-		end
-
-    wxEVT_ACTIVATE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_ACTIVATE"
-		end
-
-    wxEVT_CREATE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CREATE"
-		end
-
-    wxEVT_DESTROY : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DESTROY"
-		end
-
-    wxEVT_SHOW : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SHOW"
-		end
-
-    wxEVT_ICONIZE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_ICONIZE"
-		end
-
-    wxEVT_MAXIMIZE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MAXIMIZE"
-		end
-
-    wxEVT_MOUSE_CAPTURE_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MOUSE_CAPTURE_CHANGED"
-		end
-
-    wxEVT_PAINT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PAINT"
-		end
-
-    wxEVT_ERASE_BACKGROUND : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_ERASE_BACKGROUND"
-		end
-
-    wxEVT_NC_PAINT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_NC_PAINT"
-		end
-
-    wxEVT_PAINT_ICON : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PAINT_ICON"
-		end
-
-    wxEVT_MENU_CHAR : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MENU_CHAR"
-		end
-
-    wxEVT_MENU_INIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MENU_INIT"
-		end
-
-    wxEVT_MENU_HIGHLIGHT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MENU_HIGHLIGHT"
-		end
-
-    wxEVT_POPUP_MENU_INIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_POPUP_MENU_INIT"
-		end
-
-    wxEVT_CONTEXT_MENU : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CONTEXT_MENU"
-		end
-
-    wxEVT_SYS_COLOUR_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SYS_COLOUR_CHANGED"
-		end
-
-    wxEVT_SETTING_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_SETTING_CHANGED"
-		end
-
-    wxEVT_QUERY_NEW_PALETTE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_QUERY_NEW_PALETTE"
-		end
-
-    wxEVT_PALETTE_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PALETTE_CHANGED"
-		end
-
-    wxEVT_JOY_BUTTON_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_JOY_BUTTON_DOWN"
-		end
-
-    wxEVT_JOY_BUTTON_UP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_JOY_BUTTON_UP"
-		end
-
-    wxEVT_JOY_MOVE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_JOY_MOVE"
-		end
-
-    wxEVT_JOY_ZMOVE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_JOY_ZMOVE"
-		end
-
-    wxEVT_DROP_FILES : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DROP_FILES"
-		end
-
-    wxEVT_DRAW_ITEM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DRAW_ITEM"
-		end
-
-    wxEVT_MEASURE_ITEM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_MEASURE_ITEM"
-		end
-
-    wxEVT_COMPARE_ITEM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMPARE_ITEM"
-		end
-
-    wxEVT_INIT_DIALOG : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_INIT_DIALOG"
-		end
-
-    wxEVT_IDLE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_IDLE"
-		end
-
-    wxEVT_UPDATE_UI : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_UPDATE_UI"
-		end
-
-    wxEVT_END_PROCESS : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_END_PROCESS"
-		end
-
-    wxEVT_DIALUP_CONNECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DIALUP_CONNECTED"
-		end
-
-    wxEVT_DIALUP_DISCONNECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DIALUP_DISCONNECTED"
-		end
-
-    wxEVT_COMMAND_LEFT_CLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LEFT_CLICK"
-		end
-
-    wxEVT_COMMAND_LEFT_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LEFT_DCLICK"
-		end
-
-    wxEVT_COMMAND_RIGHT_CLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_RIGHT_CLICK"
-		end
-
-    wxEVT_COMMAND_RIGHT_DCLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_RIGHT_DCLICK"
-		end
-
-    wxEVT_COMMAND_SET_FOCUS : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SET_FOCUS"
-		end
-
-    wxEVT_COMMAND_KILL_FOCUS : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_KILL_FOCUS"
-		end
-
-    wxEVT_COMMAND_ENTER : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_ENTER"
-		end
-
-    wxEVT_COMMAND_TREE_BEGIN_DRAG : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_BEGIN_DRAG"
-		end
-
-    wxEVT_COMMAND_TREE_BEGIN_RDRAG : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_BEGIN_RDRAG"
-		end
-
-    wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_BEGIN_LABEL_EDIT"
-		end
-
-    wxEVT_COMMAND_TREE_END_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_END_LABEL_EDIT"
-		end
-
-    wxEVT_COMMAND_TREE_DELETE_ITEM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_DELETE_ITEM"
-		end
-
-    wxEVT_COMMAND_TREE_GET_INFO : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_GET_INFO"
-		end
-
-    wxEVT_COMMAND_TREE_SET_INFO : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_SET_INFO"
-		end
-
-    wxEVT_COMMAND_TREE_ITEM_EXPANDED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_ITEM_EXPANDED"
-		end
-
-    wxEVT_COMMAND_TREE_ITEM_EXPANDING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_ITEM_EXPANDING"
-		end
-
-    wxEVT_COMMAND_TREE_ITEM_COLLAPSED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_ITEM_COLLAPSED"
-		end
-
-    wxEVT_COMMAND_TREE_ITEM_COLLAPSING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_ITEM_COLLAPSING"
-		end
-
-    wxEVT_COMMAND_TREE_SEL_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_SEL_CHANGED"
-		end
-
-    wxEVT_COMMAND_TREE_SEL_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_SEL_CHANGING"
-		end
-
-    wxEVT_COMMAND_TREE_KEY_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_KEY_DOWN"
-		end
-
-    wxEVT_COMMAND_TREE_ITEM_ACTIVATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_ITEM_ACTIVATED"
-		end
-
-    wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_ITEM_RIGHT_CLICK"
-		end
-
-    wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK"
-		end
-
-    wxEVT_COMMAND_TREE_END_DRAG : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TREE_END_DRAG"
-		end
-
-    wxEVT_COMMAND_LIST_BEGIN_DRAG : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_BEGIN_DRAG"
-		end
-
-    wxEVT_COMMAND_LIST_BEGIN_RDRAG : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_BEGIN_RDRAG"
-		end
-
-    wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_BEGIN_LABEL_EDIT"
-		end
-
-    wxEVT_COMMAND_LIST_END_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_END_LABEL_EDIT"
-		end
-
-    wxEVT_COMMAND_LIST_DELETE_ITEM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_DELETE_ITEM"
-		end
-
-    wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_DELETE_ALL_ITEMS"
-		end
-
-    wxEVT_COMMAND_LIST_GET_INFO : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_GET_INFO"
-		end
-
-    wxEVT_COMMAND_LIST_SET_INFO : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_SET_INFO"
-		end
-
-    wxEVT_COMMAND_LIST_ITEM_SELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_ITEM_SELECTED"
-		end
-
-    wxEVT_COMMAND_LIST_ITEM_DESELECTED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_ITEM_DESELECTED"
-		end
-
-    wxEVT_COMMAND_LIST_KEY_DOWN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_KEY_DOWN"
-		end
-
-    wxEVT_COMMAND_LIST_INSERT_ITEM : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_INSERT_ITEM"
-		end
-
-    wxEVT_COMMAND_LIST_COL_CLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_COL_CLICK"
-		end
-
-    wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_ITEM_RIGHT_CLICK"
-		end
-
-    wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK"
-		end
-
-    wxEVT_COMMAND_LIST_ITEM_ACTIVATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_ITEM_ACTIVATED"
-		end
-
-    wxEVT_COMMAND_LIST_ITEM_FOCUSED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_LIST_ITEM_FOCUSED"
-		end
-
-    wxEVT_COMMAND_TAB_SEL_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TAB_SEL_CHANGED"
-		end
-
-    wxEVT_COMMAND_TAB_SEL_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TAB_SEL_CHANGING"
-		end
-
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_NOTEBOOK_PAGE_CHANGED"
-		end
-
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_NOTEBOOK_PAGE_CHANGING"
-		end
-
-    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SPLITTER_SASH_POS_CHANGED"
-		end
-
-    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SPLITTER_SASH_POS_CHANGING"
-		end
-
-    wxEVT_COMMAND_SPLITTER_DOUBLECLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SPLITTER_DOUBLECLICKED"
-		end
-
-    wxEVT_COMMAND_SPLITTER_UNSPLIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_SPLITTER_UNSPLIT"
-		end
-
-    wxEVT_WIZARD_PAGE_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_WIZARD_PAGE_CHANGED"
-		end
-
-    wxEVT_WIZARD_PAGE_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_WIZARD_PAGE_CHANGING"
-		end
-
-    wxEVT_WIZARD_CANCEL : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_WIZARD_CANCEL"
-		end
-
-    wxEVT_CALENDAR_SEL_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CALENDAR_SEL_CHANGED"
-		end
-
-    wxEVT_CALENDAR_DAY_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CALENDAR_DAY_CHANGED"
-		end
-
-    wxEVT_CALENDAR_MONTH_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CALENDAR_MONTH_CHANGED"
-		end
-
-    wxEVT_CALENDAR_YEAR_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CALENDAR_YEAR_CHANGED"
-		end
-
-    wxEVT_CALENDAR_DOUBLECLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CALENDAR_DOUBLECLICKED"
-		end
-
-    wxEVT_CALENDAR_WEEKDAY_CLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_CALENDAR_WEEKDAY_CLICKED"
-		end
-
-    wxEVT_PLOT_SEL_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_SEL_CHANGING"
-		end
-
-    wxEVT_PLOT_SEL_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_SEL_CHANGED"
-		end
-
-    wxEVT_PLOT_CLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_CLICKED"
-		end
-
-    wxEVT_PLOT_DOUBLECLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_DOUBLECLICKED"
-		end
-
-    wxEVT_PLOT_ZOOM_IN : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_ZOOM_IN"
-		end
-
-    wxEVT_PLOT_ZOOM_OUT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_ZOOM_OUT"
-		end
-
-    wxEVT_PLOT_VALUE_SEL_CREATING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_VALUE_SEL_CREATING"
-		end
-
-    wxEVT_PLOT_VALUE_SEL_CREATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_VALUE_SEL_CREATED"
-		end
-
-    wxEVT_PLOT_VALUE_SEL_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_VALUE_SEL_CHANGING"
-		end
-
-    wxEVT_PLOT_VALUE_SEL_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_VALUE_SEL_CHANGED"
-		end
-
-    wxEVT_PLOT_AREA_SEL_CREATING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_AREA_SEL_CREATING"
-		end
-
-    wxEVT_PLOT_AREA_SEL_CREATED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_AREA_SEL_CREATED"
-		end
-
-    wxEVT_PLOT_AREA_SEL_CHANGING : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_AREA_SEL_CHANGING"
-		end
-
-    wxEVT_PLOT_AREA_SEL_CHANGED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_AREA_SEL_CHANGED"
-		end
-
-    wxEVT_PLOT_BEGIN_X_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_BEGIN_X_LABEL_EDIT"
-		end
-
-    wxEVT_PLOT_END_X_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_END_X_LABEL_EDIT"
-		end
-
-    wxEVT_PLOT_BEGIN_Y_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_BEGIN_Y_LABEL_EDIT"
-		end
-
-    wxEVT_PLOT_END_Y_LABEL_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_END_Y_LABEL_EDIT"
-		end
-
-    wxEVT_PLOT_BEGIN_TITLE_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_BEGIN_TITLE_EDIT"
-		end
-
-    wxEVT_PLOT_END_TITLE_EDIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_END_TITLE_EDIT"
-		end
-
-    wxEVT_PLOT_AREA_CREATE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_PLOT_AREA_CREATE"
-		end
-
-    wxEVT_USER_FIRST : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_USER_FIRST"
-		end	
-
-    wxEVT_DYNAMIC_SASH_SPLIT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DYNAMIC_SASH_SPLIT"
-		end
-
-    wxEVT_DYNAMIC_SASH_UNIFY : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DYNAMIC_SASH_UNIFY"
-		end
-
-	wxEVT_COMMAND_FIND : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_FIND"
-		end
-
-	wxEVT_COMMAND_FIND_NEXT : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_FIND_NEXT"
-		end
-
-	wxEVT_COMMAND_FIND_REPLACE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_FIND_REPLACE"
-		end
-
-	wxEVT_COMMAND_FIND_REPLACE_ALL : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_FIND_REPLACE_ALL"
-		end
-
-	wxEVT_COMMAND_FIND_CLOSE : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_FIND_CLOSE"
-		end
-
-	wxEVT_COMMAND_TOGGLEBUTTON_CLICKED : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_COMMAND_TOGGLEBUTTON_CLICKED"
-		end
-
-	wxEVT_HELP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_HELP"
-		end
-
-	wxEVT_DETAILED_HELP : INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_DETAILED_HELP"
-		end
-
-	wxTR_NO_BUTTONS: INTEGER is 0
-	wxTR_HAS_BUTTONS: INTEGER is 1
-	wxTR_TWIST_BUTTONS: INTEGER is 2
-	wxTR_NO_LINES: INTEGER is 4
-	wxTR_LINES_AT_ROOT: INTEGER is 8
-	wxTR_AQUA_BUTTONS: INTEGER is 16
-
-	wxTR_SINGLE: INTEGER is 0
-	wxTR_MULTIPLE: INTEGER is 32
-	wxTR_EXTENDED: INTEGER is 64
-	wxTR_FULL_ROW_HIGHLIGHT: INTEGER is 8192
-
-	wxTR_EDIT_LABELS: INTEGER is 512
-	wxTR_ROW_LINES: INTEGER is 1024
-	wxTR_HIDE_ROOT: INTEGER is 2048
-	wxTR_HAS_VARIABLE_ROW_HEIGHT: INTEGER is 128
-
-	wxCBAR_DOCKED_HORIZONTALLY: INTEGER is 0
-	wxCBAR_DOCKED_VERTICALLY: INTEGER is 1
-	wxCBAR_FLOATING: INTEGER is 2
-	wxCBAR_HIDDEN: INTEGER is 3
-
-	FL_ALIGN_TOP: INTEGER is 0
-	FL_ALIGN_BOTTOM: INTEGER is 1
-	FL_ALIGN_LEFT: INTEGER is 2
-	FL_ALIGN_RIGHT: INTEGER is 3
-
-	FL_ALIGN_TOP_PANE: INTEGER is 1
-	FL_ALIGN_BOTTOM_PANE: INTEGER is 2
-	FL_ALIGN_LEFT_PANE: INTEGER is 4
-	FL_ALIGN_RIGHT_PANE: INTEGER is 8
-
-	wxALL_PANES: INTEGER is 15
-
-    CB_NO_ITEMS_HITTED: INTEGER is 0
-    CB_UPPER_ROW_HANDLE_HITTED: INTEGER is 1
-    CB_LOWER_ROW_HANDLE_HITTED: INTEGER is 2
-    CB_LEFT_BAR_HANDLE_HITTED: INTEGER is 3
-    CB_RIGHT_BAR_HANDLE_HITTED: INTEGER is 4
-    CB_BAR_CONTENT_HITTED: INTEGER is 5
-
-	wxOK : INTEGER is 4
-	wxYES : INTEGER is 2
-	wxNO : INTEGER is 8
-	wxYES_NO : INTEGER is 10
-	wxCANCEL : INTEGER is 16
-	wxNO_DEFAULT : INTEGER is 128
-	wxYES_DEFAULT : INTEGER is 0
-
-    wxFR_DOWN: INTEGER is 1
-    wxFR_WHOLEWORD: INTEGER is 2
-    wxFR_MATCHCASE: INTEGER is 4
-
-    wxFR_REPLACEDIALOG: INTEGER is 1
-    wxFR_NOUPDOWN: INTEGER is 2
-    wxFR_NOMATCHCASE: INTEGER is 4
-    wxFR_NOWHOLEWORD: INTEGER is 8
-
-	wxQUANTIZE_INCLUDE_WINDOWS_COLOURS: INTEGER is 1
-	wxQUANTIZE_RETURN_8BIT_DATA: INTEGER is 2
-	wxQUANTIZE_FILL_DESTINATION_IMAGE: INTEGER is 4
-
-	wxLANGUAGE_DEFAULT: INTEGER is 0
-	wxLANGUAGE_UNKNOWN: INTEGER is 1
-	wxLANGUAGE_ABKHAZIAN: INTEGER is 2
-	wxLANGUAGE_AFAR: INTEGER is 3
-	wxLANGUAGE_AFRIKAANS: INTEGER is 4
-	wxLANGUAGE_ALBANIAN: INTEGER is 5
-	wxLANGUAGE_AMHARIC: INTEGER is 6
-	wxLANGUAGE_ARABIC: INTEGER is 7
-	wxLANGUAGE_ARABIC_ALGERIA: INTEGER is 8
-	wxLANGUAGE_ARABIC_BAHRAIN: INTEGER is 9
-	wxLANGUAGE_ARABIC_EGYPT: INTEGER is 10
-	wxLANGUAGE_ARABIC_IRAQ: INTEGER is 11
-	wxLANGUAGE_ARABIC_JORDAN: INTEGER is 12
-	wxLANGUAGE_ARABIC_KUWAIT: INTEGER is 13
-	wxLANGUAGE_ARABIC_LEBANON: INTEGER is 14
-	wxLANGUAGE_ARABIC_LIBYA: INTEGER is 15
-	wxLANGUAGE_ARABIC_MOROCCO: INTEGER is 16
-	wxLANGUAGE_ARABIC_OMAN: INTEGER is 17
-	wxLANGUAGE_ARABIC_QATAR: INTEGER is 18
-	wxLANGUAGE_ARABIC_SAUDI_ARABIA: INTEGER is 19
-	wxLANGUAGE_ARABIC_SUDAN: INTEGER is 20
-	wxLANGUAGE_ARABIC_SYRIA: INTEGER is 21
-	wxLANGUAGE_ARABIC_TUNISIA: INTEGER is 22
-	wxLANGUAGE_ARABIC_UAE: INTEGER is 23
-	wxLANGUAGE_ARABIC_YEMEN: INTEGER is 24
-	wxLANGUAGE_ARMENIAN: INTEGER is 25
-	wxLANGUAGE_ASSAMESE: INTEGER is 26
-	wxLANGUAGE_AYMARA: INTEGER is 27
-	wxLANGUAGE_AZERI: INTEGER is 28
-	wxLANGUAGE_AZERI_CYRILLIC: INTEGER is 29
-	wxLANGUAGE_AZERI_LATIN: INTEGER is 30
-	wxLANGUAGE_BASHKIR: INTEGER is 31
-	wxLANGUAGE_BASQUE: INTEGER is 32
-	wxLANGUAGE_BELARUSIAN: INTEGER is 33
-	wxLANGUAGE_BENGALI: INTEGER is 34
-	wxLANGUAGE_BHUTANI: INTEGER is 35
-	wxLANGUAGE_BIHARI: INTEGER is 36
-	wxLANGUAGE_BISLAMA: INTEGER is 37
-	wxLANGUAGE_BRETON: INTEGER is 38
-	wxLANGUAGE_BULGARIAN: INTEGER is 39
-	wxLANGUAGE_BURMESE: INTEGER is 40
-	wxLANGUAGE_CAMBODIAN: INTEGER is 41
-	wxLANGUAGE_CATALAN: INTEGER is 42
-	wxLANGUAGE_CHINESE: INTEGER is 43
-	wxLANGUAGE_CHINESE_SIMPLIFIED: INTEGER is 44
-	wxLANGUAGE_CHINESE_TRADITIONAL: INTEGER is 45
-	wxLANGUAGE_CHINESE_HONGKONG: INTEGER is 46
-	wxLANGUAGE_CHINESE_MACAU: INTEGER is 47
-	wxLANGUAGE_CHINESE_SINGAPORE: INTEGER is 48
-	wxLANGUAGE_CHINESE_TAIWAN: INTEGER is 49
-	wxLANGUAGE_CORSICAN: INTEGER is 50
-	wxLANGUAGE_CROATIAN: INTEGER is 51
-	wxLANGUAGE_CZECH: INTEGER is 52
-	wxLANGUAGE_DANISH: INTEGER is 53
-	wxLANGUAGE_DUTCH: INTEGER is 54
-	wxLANGUAGE_DUTCH_BELGIAN: INTEGER is 55
-	wxLANGUAGE_ENGLISH: INTEGER is 56
-	wxLANGUAGE_ENGLISH_UK: INTEGER is 57
-	wxLANGUAGE_ENGLISH_US: INTEGER is 58
-	wxLANGUAGE_ENGLISH_AUSTRALIA: INTEGER is 59
-	wxLANGUAGE_ENGLISH_BELIZE: INTEGER is 60
-	wxLANGUAGE_ENGLISH_BOTSWANA: INTEGER is 61
-	wxLANGUAGE_ENGLISH_CANADA: INTEGER is 62
-	wxLANGUAGE_ENGLISH_CARIBBEAN: INTEGER is 63
-	wxLANGUAGE_ENGLISH_DENMARK: INTEGER is 64
-	wxLANGUAGE_ENGLISH_EIRE: INTEGER is 65
-	wxLANGUAGE_ENGLISH_JAMAICA: INTEGER is 66
-	wxLANGUAGE_ENGLISH_NEW_ZEALAND: INTEGER is 67
-	wxLANGUAGE_ENGLISH_PHILIPPINES: INTEGER is 68
-	wxLANGUAGE_ENGLISH_SOUTH_AFRICA: INTEGER is 69
-	wxLANGUAGE_ENGLISH_TRINIDAD: INTEGER is 70
-	wxLANGUAGE_ENGLISH_ZIMBABWE: INTEGER is 71
-	wxLANGUAGE_ESPERANTO: INTEGER is 72
-	wxLANGUAGE_ESTONIAN: INTEGER is 73
-	wxLANGUAGE_FAEROESE: INTEGER is 74
-	wxLANGUAGE_FARSI: INTEGER is 75
-	wxLANGUAGE_FIJI: INTEGER is 76
-	wxLANGUAGE_FINNISH: INTEGER is 77
-	wxLANGUAGE_FRENCH: INTEGER is 78
-	wxLANGUAGE_FRENCH_BELGIAN: INTEGER is 79
-	wxLANGUAGE_FRENCH_CANADIAN: INTEGER is 80
-	wxLANGUAGE_FRENCH_LUXEMBOURG: INTEGER is 81
-	wxLANGUAGE_FRENCH_MONACO: INTEGER is 82
-	wxLANGUAGE_FRENCH_SWISS: INTEGER is 83
-	wxLANGUAGE_FRISIAN: INTEGER is 84
-	wxLANGUAGE_GALICIAN: INTEGER is 85
-	wxLANGUAGE_GEORGIAN: INTEGER is 86
-	wxLANGUAGE_GERMAN: INTEGER is 87
-	wxLANGUAGE_GERMAN_AUSTRIAN: INTEGER is 88
-	wxLANGUAGE_GERMAN_BELGIUM: INTEGER is 89
-	wxLANGUAGE_GERMAN_LIECHTENSTEIN: INTEGER is 90
-	wxLANGUAGE_GERMAN_LUXEMBOURG: INTEGER is 91
-	wxLANGUAGE_GERMAN_SWISS: INTEGER is 92
-	wxLANGUAGE_GREEK: INTEGER is 93
-	wxLANGUAGE_GREENLANDIC: INTEGER is 94
-	wxLANGUAGE_GUARANI: INTEGER is 95
-	wxLANGUAGE_GUJARATI: INTEGER is 96
-	wxLANGUAGE_HAUSA: INTEGER is 97
-	wxLANGUAGE_HEBREW: INTEGER is 98
-	wxLANGUAGE_HINDI: INTEGER is 99
-	wxLANGUAGE_HUNGARIAN: INTEGER is 100
-	wxLANGUAGE_ICELANDIC: INTEGER is 101
-	wxLANGUAGE_INDONESIAN: INTEGER is 102
-	wxLANGUAGE_INTERLINGUA: INTEGER is 103
-	wxLANGUAGE_INTERLINGUE: INTEGER is 104
-	wxLANGUAGE_INUKTITUT: INTEGER is 105
-	wxLANGUAGE_INUPIAK: INTEGER is 106
-	wxLANGUAGE_IRISH: INTEGER is 107
-	wxLANGUAGE_ITALIAN: INTEGER is 108
-	wxLANGUAGE_ITALIAN_SWISS: INTEGER is 109
-	wxLANGUAGE_JAPANESE: INTEGER is 110
-	wxLANGUAGE_JAVANESE: INTEGER is 111
-	wxLANGUAGE_KANNADA: INTEGER is 112
-	wxLANGUAGE_KASHMIRI: INTEGER is 113
-	wxLANGUAGE_KASHMIRI_INDIA: INTEGER is 114
-	wxLANGUAGE_KAZAKH: INTEGER is 115
-	wxLANGUAGE_KERNEWEK: INTEGER is 116
-	wxLANGUAGE_KINYARWANDA: INTEGER is 117
-	wxLANGUAGE_KIRGHIZ: INTEGER is 118
-	wxLANGUAGE_KIRUNDI: INTEGER is 119
-	wxLANGUAGE_KONKANI: INTEGER is 120
-	wxLANGUAGE_KOREAN: INTEGER is 121
-	wxLANGUAGE_KURDISH: INTEGER is 122
-	wxLANGUAGE_LAOTHIAN: INTEGER is 123
-	wxLANGUAGE_LATIN: INTEGER is 124
-	wxLANGUAGE_LATVIAN: INTEGER is 125
-	wxLANGUAGE_LINGALA: INTEGER is 126
-	wxLANGUAGE_LITHUANIAN: INTEGER is 127
-	wxLANGUAGE_MACEDONIAN: INTEGER is 128
-	wxLANGUAGE_MALAGASY: INTEGER is 129
-	wxLANGUAGE_MALAY: INTEGER is 130
-	wxLANGUAGE_MALAYALAM: INTEGER is 131
-	wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM: INTEGER is 132
-	wxLANGUAGE_MALAY_MALAYSIA: INTEGER is 133
-	wxLANGUAGE_MALTESE: INTEGER is 134
-	wxLANGUAGE_MANIPURI: INTEGER is 135
-	wxLANGUAGE_MAORI: INTEGER is 136
-	wxLANGUAGE_MARATHI: INTEGER is 137
-	wxLANGUAGE_MOLDAVIAN: INTEGER is 138
-	wxLANGUAGE_MONGOLIAN: INTEGER is 139
-	wxLANGUAGE_NAURU: INTEGER is 140
-	wxLANGUAGE_NEPALI: INTEGER is 141
-	wxLANGUAGE_NEPALI_INDIA: INTEGER is 142
-	wxLANGUAGE_NORWEGIAN_BOKMAL: INTEGER is 143
-	wxLANGUAGE_NORWEGIAN_NYNORSK: INTEGER is 144
-	wxLANGUAGE_OCCITAN: INTEGER is 145
-	wxLANGUAGE_ORIYA: INTEGER is 146
-	wxLANGUAGE_OROMO: INTEGER is 147
-	wxLANGUAGE_PASHTO: INTEGER is 148
-	wxLANGUAGE_POLISH: INTEGER is 149
-	wxLANGUAGE_PORTUGUESE: INTEGER is 150
-	wxLANGUAGE_PORTUGUESE_BRAZILIAN: INTEGER is 151
-	wxLANGUAGE_PUNJABI: INTEGER is 152
-	wxLANGUAGE_QUECHUA: INTEGER is 153
-	wxLANGUAGE_RHAETO_ROMANCE: INTEGER is 154
-	wxLANGUAGE_ROMANIAN: INTEGER is 155
-	wxLANGUAGE_RUSSIAN: INTEGER is 156
-	wxLANGUAGE_RUSSIAN_UKRAINE: INTEGER is 157
-	wxLANGUAGE_SAMOAN: INTEGER is 158
-	wxLANGUAGE_SANGHO: INTEGER is 159
-	wxLANGUAGE_SANSKRIT: INTEGER is 160
-	wxLANGUAGE_SCOTS_GAELIC: INTEGER is 161
-	wxLANGUAGE_SERBIAN: INTEGER is 162
-	wxLANGUAGE_SERBIAN_CYRILLIC: INTEGER is 163
-	wxLANGUAGE_SERBIAN_LATIN: INTEGER is 164
-	wxLANGUAGE_SERBO_CROATIAN: INTEGER is 165
-	wxLANGUAGE_SESOTHO: INTEGER is 166
-	wxLANGUAGE_SETSWANA: INTEGER is 167
-	wxLANGUAGE_SHONA: INTEGER is 168
-	wxLANGUAGE_SINDHI: INTEGER is 169
-	wxLANGUAGE_SINHALESE: INTEGER is 170
-	wxLANGUAGE_SISWATI: INTEGER is 171
-	wxLANGUAGE_SLOVAK: INTEGER is 172
-	wxLANGUAGE_SLOVENIAN: INTEGER is 173
-	wxLANGUAGE_SOMALI: INTEGER is 174
-	wxLANGUAGE_SPANISH: INTEGER is 175
-	wxLANGUAGE_SPANISH_ARGENTINA: INTEGER is 176
-	wxLANGUAGE_SPANISH_BOLIVIA: INTEGER is 177
-	wxLANGUAGE_SPANISH_CHILE: INTEGER is 178
-	wxLANGUAGE_SPANISH_COLOMBIA: INTEGER is 179
-	wxLANGUAGE_SPANISH_COSTA_RICA: INTEGER is 180
-	wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC: INTEGER is 181
-	wxLANGUAGE_SPANISH_ECUADOR: INTEGER is 182
-	wxLANGUAGE_SPANISH_EL_SALVADOR: INTEGER is 183
-	wxLANGUAGE_SPANISH_GUATEMALA: INTEGER is 184
-	wxLANGUAGE_SPANISH_HONDURAS: INTEGER is 185
-	wxLANGUAGE_SPANISH_MEXICAN: INTEGER is 186
-	wxLANGUAGE_SPANISH_MODERN: INTEGER is 187
-	wxLANGUAGE_SPANISH_NICARAGUA: INTEGER is 188
-	wxLANGUAGE_SPANISH_PANAMA: INTEGER is 189
-	wxLANGUAGE_SPANISH_PARAGUAY: INTEGER is 190
-	wxLANGUAGE_SPANISH_PERU: INTEGER is 191
-	wxLANGUAGE_SPANISH_PUERTO_RICO: INTEGER is 192
-	wxLANGUAGE_SPANISH_URUGUAY: INTEGER is 193
-	wxLANGUAGE_SPANISH_US: INTEGER is 194
-	wxLANGUAGE_SPANISH_VENEZUELA: INTEGER is 195
-	wxLANGUAGE_SUNDANESE: INTEGER is 196
-	wxLANGUAGE_SWAHILI: INTEGER is 197
-	wxLANGUAGE_SWEDISH: INTEGER is 198
-	wxLANGUAGE_SWEDISH_FINLAND: INTEGER is 199
-	wxLANGUAGE_TAGALOG: INTEGER is 200
-	wxLANGUAGE_TAJIK: INTEGER is 201
-	wxLANGUAGE_TAMIL: INTEGER is 202
-	wxLANGUAGE_TATAR: INTEGER is 203
-	wxLANGUAGE_TELUGU: INTEGER is 204
-	wxLANGUAGE_THAI: INTEGER is 205
-	wxLANGUAGE_TIBETAN: INTEGER is 206
-	wxLANGUAGE_TIGRINYA: INTEGER is 207
-	wxLANGUAGE_TONGA: INTEGER is 208
-	wxLANGUAGE_TSONGA: INTEGER is 209
-	wxLANGUAGE_TURKISH: INTEGER is 210
-	wxLANGUAGE_TURKMEN: INTEGER is 211
-	wxLANGUAGE_TWI: INTEGER is 212
-	wxLANGUAGE_UIGHUR: INTEGER is 213
-	wxLANGUAGE_UKRAINIAN: INTEGER is 214
-	wxLANGUAGE_URDU: INTEGER is 215
-	wxLANGUAGE_URDU_INDIA: INTEGER is 216
-	wxLANGUAGE_URDU_PAKISTAN: INTEGER is 217
-	wxLANGUAGE_UZBEK: INTEGER is 218
-	wxLANGUAGE_UZBEK_CYRILLIC: INTEGER is 219
-	wxLANGUAGE_UZBEK_LATIN: INTEGER is 220
-	wxLANGUAGE_VIETNAMESE: INTEGER is 221
-	wxLANGUAGE_VOLAPUK: INTEGER is 222
-	wxLANGUAGE_WELSH: INTEGER is 223
-	wxLANGUAGE_WOLOF: INTEGER is 224
-	wxLANGUAGE_XHOSA: INTEGER is 225
-	wxLANGUAGE_YIDDISH: INTEGER is 226
-	wxLANGUAGE_YORUBA: INTEGER is 227
-	wxLANGUAGE_ZHUANG: INTEGER is 228
-	wxLANGUAGE_ZULU: INTEGER is 229
-	wxLANGUAGE_USER_DEFINE: INTEGER is 230
-
-    wxLOCALE_THOUSANDS_SEP: INTEGER is 0
-    wxLOCALE_DECIMAL_POINT: INTEGER is 1
-
-    wxLOCALE_LOAD_DEFAULT: INTEGER is 1
-    wxLOCALE_CONV_ENCODING: INTEGER is 2
-
-	wxEVT_GRID_CELL_LEFT_CLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_CELL_LEFT_CLICK"
-		end
-
-	wxEVT_GRID_CELL_RIGHT_CLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_CELL_RIGHT_CLICK"
-		end
-
-	wxEVT_GRID_CELL_LEFT_DCLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_CELL_LEFT_DCLICK"
-		end
-
-	wxEVT_GRID_CELL_RIGHT_DCLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_CELL_RIGHT_DCLICK"
-		end
-
-	wxEVT_GRID_LABEL_LEFT_CLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_LABEL_LEFT_CLICK"
-		end
-
-	wxEVT_GRID_LABEL_RIGHT_CLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_LABEL_RIGHT_CLICK"
-		end
-
-	wxEVT_GRID_LABEL_LEFT_DCLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_LABEL_LEFT_DCLICK"
-		end
-
-	wxEVT_GRID_LABEL_RIGHT_DCLICK: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_LABEL_RIGHT_DCLICK"
-		end
-
-	wxEVT_GRID_ROW_SIZE: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_ROW_SIZE"
-		end
-
-	wxEVT_GRID_COL_SIZE: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_COL_SIZE"
-		end
-
-	wxEVT_GRID_RANGE_SELECT: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_RANGE_SELECT"
-		end
-
-	wxEVT_GRID_CELL_CHANGE: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_CELL_CHANGE"
-		end
-
-	wxEVT_GRID_SELECT_CELL: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_SELECT_CELL"
-		end
-
-	wxEVT_GRID_EDITOR_SHOWN: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_EDITOR_SHOWN"
-		end
-
-	wxEVT_GRID_EDITOR_HIDDEN: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_EDITOR_HIDDEN"
-		end
-
-	wxEVT_GRID_EDITOR_CREATED: INTEGER is
-		external "C use %"ewxw_glue.h%""
-		alias "expEVT_GRID_EDITOR_CREATED"
-		end
-
-end
diff --git a/wxc/eiffel/wx_defs.e b/wxc/eiffel/wx_defs.e
new file mode 100644
--- /dev/null
+++ b/wxc/eiffel/wx_defs.e
@@ -0,0 +1,2395 @@
+class WX_DEFS
+
+feature {NONE}
+	-- from: event.h
+
+	wxACCEL_ALT    : INTEGER is 1
+	wxACCEL_CTRL   : INTEGER is 2
+	wxACCEL_SHIFT  : INTEGER is 4
+	wxACCEL_NORMAL : INTEGER is 0
+
+	wxNULL_FLAG : INTEGER is 0
+	wxEVT_NULL : INTEGER is 0
+	wxEVT_FIRST : INTEGER is 10000
+	wxJOYSTICK1 : INTEGER is 0
+	wxJOYSTICK2 : INTEGER is 1
+	wxJOY_BUTTON1 : INTEGER is 1
+	wxJOY_BUTTON2 : INTEGER is 2
+	wxJOY_BUTTON3 : INTEGER is 4
+	wxJOY_BUTTON4 : INTEGER is 8
+	wxUNKNOWN_PLATFORM : INTEGER is 1
+	wxCURSES : INTEGER is 2
+	wxXVIEW_X : INTEGER is 3
+	wxMOTIF_X : INTEGER is 4
+	wxCOSE_X : INTEGER is 5
+	wxNEXTSTEP : INTEGER is 6
+	wxMACINTOSH : INTEGER is 7
+	wxBEOS : INTEGER is 8
+	wxGTK : INTEGER is 9
+	wxGTK_WIN32 : INTEGER is 10
+	wxGTK_OS2 : INTEGER is 11
+	wxGTK_BEOS : INTEGER is 12
+	wxQT : INTEGER is 13
+	wxGEOS : INTEGER is 14
+	wxOS2_PM : INTEGER is 15
+	wxWINDOWS : INTEGER is 16
+	wxPENWINDOWS : INTEGER is 17
+	wxWINDOWS_NT : INTEGER is 18
+	wxWIN32S : INTEGER is 19
+	wxWIN95 : INTEGER is 20
+	wxWIN386 : INTEGER is 21
+	wxMGL_UNIX : INTEGER is 22
+	wxMGL_X : INTEGER is 23
+	wxMGL_WIN32 : INTEGER is 24
+	wxMGL_OS2 : INTEGER is 25
+	wxWINDOWS_OS2 : INTEGER is 26
+	wxUNIX : INTEGER is 27
+	wxBIG_ENDIAN : INTEGER is 4321
+	wxLITTLE_ENDIAN : INTEGER is 1234
+	wxPDP_ENDIAN : INTEGER is 3412
+	wxCENTRE : INTEGER is 1
+	wxCENTER : INTEGER is 1
+	wxCENTER_FRAME : INTEGER is 0
+	wxCENTRE_ON_SCREEN : INTEGER is 2
+	wxHORIZONTAL : INTEGER is 4
+	wxVERTICAL : INTEGER is 8
+	wxBOTH : INTEGER is 12
+	wxLEFT : INTEGER is 16
+	wxRIGHT : INTEGER is 32
+	wxUP : INTEGER is 64
+	wxDOWN : INTEGER is 128
+	wxTOP : INTEGER is 64
+	wxBOTTOM : INTEGER is 128
+	wxNORTH : INTEGER is 64
+	wxSOUTH : INTEGER is 128
+	wxWEST : INTEGER is 16
+	wxEAST : INTEGER is 32
+	wxALL : INTEGER is 240
+	wxALIGN_NOT : INTEGER is 0
+	wxALIGN_CENTER_HORIZONTAL : INTEGER is 256
+	wxALIGN_CENTRE_HORIZONTAL : INTEGER is 256
+	wxALIGN_LEFT : INTEGER is 0
+	wxALIGN_TOP : INTEGER is 0
+	wxALIGN_RIGHT : INTEGER is 512
+	wxALIGN_BOTTOM : INTEGER is 1024
+	wxALIGN_CENTER_VERTICAL : INTEGER is 2048
+	wxALIGN_CENTRE_VERTICAL : INTEGER is 2048
+	wxALIGN_CENTER : INTEGER is 2304
+	wxALIGN_CENTRE : INTEGER is 2304
+	wxSTRETCH_NOT : INTEGER is 0
+	wxSHRINK : INTEGER is 4096
+	wxGROW : INTEGER is 8192
+	wxEXPAND : INTEGER is 8192
+	wxSHAPED : INTEGER is 16384
+	wxVSCROLL : INTEGER is -2147483648
+	wxHSCROLL : INTEGER is 1073741824
+	wxCAPTION : INTEGER is 536870912
+	wxDOUBLE_BORDER : INTEGER is 268435456
+	wxSUNKEN_BORDER : INTEGER is 134217728
+	wxRAISED_BORDER : INTEGER is 67108864
+	wxSTATIC_BORDER : INTEGER is 16777216
+	wxBORDER :        INTEGER is 33554432
+	wxTRANSPARENT_WINDOW : INTEGER is 1048576
+	wxNO_BORDER : INTEGER is 2097152
+	wxUSER_COLOURS : INTEGER is 8388608
+	wxNO_3D : INTEGER is 8388608
+	wxCLIP_CHILDREN : INTEGER is 4194304
+	wxTAB_TRAVERSAL : INTEGER is 524288
+	wxWANTS_CHARS : INTEGER is 262144
+	wxRETAINED : INTEGER is 131072
+	wxNO_FULL_REPAINT_ON_RESIZE : INTEGER is 65536
+	wxWS_EX_VALIDATE_RECURSIVELY : INTEGER is 1
+	wxSTAY_ON_TOP : INTEGER is 32768
+	wxICONIZE : INTEGER is 16384
+	wxMAXIMIZE : INTEGER is 8192
+	wxSYSTEM_MENU : INTEGER is 2048
+	wxMINIMIZE_BOX : INTEGER is 1024
+	wxMAXIMIZE_BOX : INTEGER is 512
+	wxDEFAULT_FRAME_STYLE : INTEGER is 536878656
+
+	wxTINY_CAPTION_HORIZ : INTEGER is 256
+	wxTINY_CAPTION_VERT : INTEGER is 128
+	wxRESIZE_BORDER : INTEGER is 64
+	wxDIALOG_MODAL : INTEGER is 32
+	wxDIALOG_MODELESS : INTEGER is 0
+	wxFRAME_FLOAT_ON_PARENT : INTEGER is 8
+	wxFRAME_NO_WINDOW_MENU : INTEGER is 256
+	wxED_CLIENT_MARGIN : INTEGER is 4
+	wxED_BUTTONS_BOTTOM : INTEGER is 0
+	wxED_BUTTONS_RIGHT : INTEGER is 2
+	wxED_STATIC_LINE : INTEGER is 1
+	wxTB_3DBUTTONS : INTEGER is 16
+	wxTB_FLAT : INTEGER is 32
+	wxTB_DOCKABLE : INTEGER is 64
+	wxMB_DOCKABLE : INTEGER is 1
+	wxMENU_TEAROFF : INTEGER is 1
+	wxCOLOURED : INTEGER is 2048
+	wxFIXED_LENGTH : INTEGER is 1024
+	wxLB_SORT : INTEGER is 16
+	wxLB_SINGLE : INTEGER is 32
+	wxLB_MULTIPLE : INTEGER is 64
+	wxLB_EXTENDED : INTEGER is 128
+	wxLB_OWNERDRAW : INTEGER is 256
+	wxLB_NEEDED_SB : INTEGER is 512
+	wxLB_ALWAYS_SB : INTEGER is 1024
+	wxTE_READONLY : INTEGER is 16
+	wxTE_MULTILINE : INTEGER is 32
+	wxTE_PROCESS_TAB : INTEGER is 64
+	wxTE_RICH : INTEGER is 128
+	wxTE_NO_VSCROLL : INTEGER is 256
+	wxTE_AUTO_SCROLL : INTEGER is 512
+	wxPROCESS_ENTER : INTEGER is 1024
+	wxPASSWORD : INTEGER is 2048
+	wxCB_SIMPLE : INTEGER is 4
+	wxCB_SORT : INTEGER is 8
+	wxCB_READONLY : INTEGER is 16
+	wxCB_DROPDOWN : INTEGER is 32
+	wxRB_GROUP : INTEGER is 4
+	wxGA_PROGRESSBAR : INTEGER is 16
+	wxGA_SMOOTH : INTEGER is 32
+	wxSL_NOTIFY_DRAG : INTEGER is 0
+	wxSL_AUTOTICKS : INTEGER is 16
+	wxSL_LABELS : INTEGER is 32
+	wxSL_LEFT : INTEGER is 64
+	wxSL_TOP : INTEGER is 128
+	wxSL_RIGHT : INTEGER is 256
+	wxSL_BOTTOM : INTEGER is 512
+	wxSL_BOTH : INTEGER is 1024
+	wxSL_SELRANGE : INTEGER is 2048
+	wxBU_AUTODRAW : INTEGER is 4
+	wxBU_NOAUTODRAW : INTEGER is 0
+	wxBU_LEFT : INTEGER is 64
+	wxBU_TOP : INTEGER is 128
+	wxBU_RIGHT : INTEGER is 256
+	wxBU_BOTTOM : INTEGER is 512
+	wxLC_ICON : INTEGER is 4
+	wxLC_SMALL_ICON : INTEGER is 8
+	wxLC_LIST : INTEGER is 16
+	wxLC_REPORT : INTEGER is 32
+	wxLC_ALIGN_TOP : INTEGER is 64
+	wxLC_ALIGN_LEFT : INTEGER is 128
+	wxLC_AUTOARRANGE : INTEGER is 256
+	wxLC_USER_TEXT : INTEGER is 512
+	wxLC_EDIT_LABELS : INTEGER is 1024
+	wxLC_NO_HEADER : INTEGER is 2048
+	wxLC_NO_SORT_HEADER : INTEGER is 4096
+	wxLC_SINGLE_SEL : INTEGER is 8192
+	wxLC_SORT_ASCENDING : INTEGER is 16384
+	wxLC_SORT_DESCENDING : INTEGER is 32768
+	wxSP_ARROW_KEYS : INTEGER is 4096
+	wxSP_WRAP : INTEGER is 8192
+	wxSP_NOBORDER : INTEGER is 0
+	wxSP_NOSASH : INTEGER is 16
+	wxSP_BORDER : INTEGER is 32
+	wxSP_PERMIT_UNSPLIT : INTEGER is 64
+	wxSP_LIVE_UPDATE : INTEGER is 128
+	wxSP_3DSASH :   INTEGER is 256
+	wxSP_3DBORDER : INTEGER is 512
+	wxSP_3D :   INTEGER is 768
+	wxSP_FULLSASH : INTEGER is 1024
+	wxFRAME_TOOL_WINDOW : INTEGER is 4
+	wxTC_MULTILINE : INTEGER is 0
+	wxTC_RIGHTJUSTIFY : INTEGER is 16
+	wxTC_FIXEDWIDTH : INTEGER is 32
+	wxTC_OWNERDRAW : INTEGER is 64
+	wxNB_FIXEDWIDTH : INTEGER is 16
+	wxNB_LEFT : INTEGER is 32
+	wxNB_RIGHT : INTEGER is 64
+	wxNB_BOTTOM : INTEGER is 128
+	wxST_SIZEGRIP : INTEGER is 16
+	wxST_NO_AUTORESIZE : INTEGER is 1
+	wxPD_CAN_ABORT : INTEGER is 1
+	wxPD_APP_MODAL : INTEGER is 2
+	wxPD_AUTO_HIDE : INTEGER is 4
+	wxPD_ELAPSED_TIME : INTEGER is 8
+	wxPD_ESTIMATED_TIME : INTEGER is 16
+	wxPD_REMAINING_TIME : INTEGER is 64
+	wxHW_SCROLLBAR_NEVER : INTEGER is 2
+	wxHW_SCROLLBAR_AUTO : INTEGER is 4
+	wxCAL_SUNDAY_FIRST : INTEGER is 0
+	wxCAL_MONDAY_FIRST : INTEGER is 1
+	wxCAL_SHOW_HOLIDAYS : INTEGER is 2
+	wxCAL_NO_YEAR_CHANGE : INTEGER is 4
+	wxCAL_NO_MONTH_CHANGE : INTEGER is 12
+	wxICON_EXCLAMATION : INTEGER is 256
+	wxICON_HAND : INTEGER is 512
+	wxICON_QUESTION : INTEGER is 1024
+	wxICON_INFORMATION : INTEGER is 2048
+	wxFORWARD : INTEGER is 4096
+	wxBACKWARD : INTEGER is 8192
+	wxRESET : INTEGER is 16384
+	wxHELP : INTEGER is 32768
+	wxMORE : INTEGER is 65536
+	wxSETUP : INTEGER is 131072
+	wxID_LOWEST : INTEGER is 4999
+	wxID_OPEN : INTEGER is 5000
+	wxID_CLOSE : INTEGER is 5001
+	wxID_NEW : INTEGER is 5002
+	wxID_SAVE : INTEGER is 5003
+	wxID_SAVEAS : INTEGER is 5004
+	wxID_REVERT : INTEGER is 5005
+	wxID_EXIT : INTEGER is 5006
+	wxID_UNDO : INTEGER is 5007
+	wxID_REDO : INTEGER is 5008
+	wxID_HELP : INTEGER is 5009
+	wxID_PRINT : INTEGER is 5010
+	wxID_PRINT_SETUP : INTEGER is 5011
+	wxID_PREVIEW : INTEGER is 5012
+	wxID_ABOUT : INTEGER is 5013
+	wxID_HELP_CONTENTS : INTEGER is 5014
+	wxID_HELP_COMMANDS : INTEGER is 5015
+	wxID_HELP_PROCEDURES : INTEGER is 5016
+	wxID_HELP_CONTEXT : INTEGER is 5017
+	wxID_CUT : INTEGER is 5030
+	wxID_COPY : INTEGER is 5031
+	wxID_PASTE : INTEGER is 5032
+	wxID_CLEAR : INTEGER is 5033
+	wxID_FIND : INTEGER is 5034
+	wxID_DUPLICATE : INTEGER is 5035
+	wxID_SELECTALL : INTEGER is 5036
+	wxID_FILE1 : INTEGER is 5050
+	wxID_FILE2 : INTEGER is 5051
+	wxID_FILE3 : INTEGER is 5052
+	wxID_FILE4 : INTEGER is 5053
+	wxID_FILE5 : INTEGER is 5054
+	wxID_FILE6 : INTEGER is 5055
+	wxID_FILE7 : INTEGER is 5056
+	wxID_FILE8 : INTEGER is 5057
+	wxID_FILE9 : INTEGER is 5058
+	wxID_OK : INTEGER is 5100
+	wxID_CANCEL : INTEGER is 5101
+	wxID_APPLY : INTEGER is 5102
+	wxID_YES : INTEGER is 5103
+	wxID_NO : INTEGER is 5104
+	wxID_STATIC : INTEGER is 5105
+	wxID_FORWARD : INTEGER is 5106
+	wxID_BACKWARD : INTEGER is 5107
+	wxID_DEFAULT : INTEGER is 5108
+	wxID_MORE : INTEGER is 5109
+	wxID_SETUP : INTEGER is 5110
+	wxID_RESET : INTEGER is 5111
+	wxID_FILEDLGG : INTEGER is 5900
+	wxID_HIGHEST : INTEGER is 5999
+	wxSIZE_AUTO_WIDTH : INTEGER is 1
+	wxSIZE_AUTO_HEIGHT : INTEGER is 2
+	wxSIZE_USE_EXISTING : INTEGER is 0
+	wxSIZE_ALLOW_MINUS_ONE : INTEGER is 4
+	wxSIZE_NO_ADJUSTMENTS : INTEGER is 8
+	wxSOLID : INTEGER is 100
+	wxDOT : INTEGER is 101
+	wxLONG_DASH : INTEGER is 102
+	wxSHORT_DASH : INTEGER is 103
+	wxDOT_DASH : INTEGER is 104
+	wxUSER_DASH : INTEGER is 105
+	wxTRANSPARENT : INTEGER is 106
+	wxSTIPPLE_MASK_OPAQUE : INTEGER is 107
+	wxSTIPPLE_MASK : INTEGER is 108
+	wxSTIPPLE : INTEGER is 110
+	wxBDIAGONAL_HATCH : INTEGER is 111
+	wxCROSSDIAG_HATCH : INTEGER is 112
+	wxFDIAGONAL_HATCH : INTEGER is 113
+	wxCROSS_HATCH : INTEGER is 114
+	wxHORIZONTAL_HATCH : INTEGER is 115
+	wxVERTICAL_HATCH : INTEGER is 116
+	wxJOIN_BEVEL : INTEGER is 120
+	wxJOIN_MITER : INTEGER is 121
+	wxJOIN_ROUND : INTEGER is 122
+	wxCAP_ROUND : INTEGER is 130
+	wxCAP_PROJECTING : INTEGER is 131
+	wxCAP_BUTT : INTEGER is 132
+	wxCLEAR : INTEGER is 0
+	wxXOR : INTEGER is 1
+	wxINVERT : INTEGER is 2
+	wxOR_REVERSE : INTEGER is 3
+	wxAND_REVERSE : INTEGER is 4
+	wxCOPY : INTEGER is 5
+	wxAND : INTEGER is 6
+	wxAND_INVERT : INTEGER is 7
+	wxNO_OP : INTEGER is 8
+	wxNOR : INTEGER is 9
+	wxEQUIV : INTEGER is 10
+	wxSRC_INVERT : INTEGER is 11
+	wxOR_INVERT : INTEGER is 12
+	wxNAND : INTEGER is 13
+	wxOR : INTEGER is 14
+	wxSET : INTEGER is 15
+	wxFLOOD_SURFACE : INTEGER is 1
+	wxFLOOD_BORDER : INTEGER is 2
+	wxODDEVEN_RULE : INTEGER is 1
+	wxWINDING_RULE : INTEGER is 2
+	wxTOOL_TOP : INTEGER is 1
+	wxTOOL_BOTTOM : INTEGER is 2
+	wxTOOL_LEFT : INTEGER is 3
+	wxTOOL_RIGHT : INTEGER is 4
+	wxDF_INVALID : INTEGER is 1
+	wxDF_TEXT : INTEGER is 2
+	wxDF_BITMAP : INTEGER is 3
+	wxDF_METAFILE : INTEGER is 4
+	wxDF_SYLK : INTEGER is 5
+	wxDF_DIF : INTEGER is 6
+	wxDF_TIFF : INTEGER is 7
+	wxDF_OEMTEXT : INTEGER is 8
+	wxDF_DIB : INTEGER is 9
+	wxDF_PALETTE : INTEGER is 10
+	wxDF_PENDATA : INTEGER is 11
+	wxDF_RIFF : INTEGER is 12
+	wxDF_WAVE : INTEGER is 13
+	wxDF_UNICODETEXT : INTEGER is 14
+	wxDF_ENHMETAFILE : INTEGER is 15
+	wxDF_FILENAME : INTEGER is 16
+	wxDF_LOCALE : INTEGER is 17
+	wxDF_PRIVATE : INTEGER is 18
+	wxDF_MAX : INTEGER is 19
+	WXK_BACK : INTEGER is 8
+	WXK_TAB : INTEGER is 9
+	WXK_RETURN : INTEGER is 13
+	WXK_ESCAPE : INTEGER is 27
+	WXK_SPACE : INTEGER is 32
+	WXK_DELETE : INTEGER is 127
+	WXK_START : INTEGER is 300
+	WXK_LBUTTON : INTEGER is 301
+	WXK_RBUTTON : INTEGER is 302
+	WXK_CANCEL : INTEGER is 303
+	WXK_MBUTTON : INTEGER is 304
+	WXK_CLEAR : INTEGER is 305
+	WXK_SHIFT : INTEGER is 306
+	WXK_ALT : INTEGER is 307
+	WXK_CONTROL : INTEGER is 308
+	WXK_MENU : INTEGER is 309
+	WXK_PAUSE : INTEGER is 310
+	WXK_CAPITAL : INTEGER is 311
+	WXK_PRIOR : INTEGER is 312
+	WXK_NEXT : INTEGER is 313
+	WXK_END : INTEGER is 314
+	WXK_HOME : INTEGER is 315
+	WXK_LEFT : INTEGER is 316
+	WXK_UP : INTEGER is 317
+	WXK_RIGHT : INTEGER is 318
+	WXK_DOWN : INTEGER is 319
+	WXK_SELECT : INTEGER is 320
+	WXK_PRINT : INTEGER is 321
+	WXK_EXECUTE : INTEGER is 322
+	WXK_SNAPSHOT : INTEGER is 323
+	WXK_INSERT : INTEGER is 324
+	WXK_HELP : INTEGER is 325
+	WXK_NUMPAD0 : INTEGER is 326
+	WXK_NUMPAD1 : INTEGER is 327
+	WXK_NUMPAD2 : INTEGER is 328
+	WXK_NUMPAD3 : INTEGER is 329
+	WXK_NUMPAD4 : INTEGER is 330
+	WXK_NUMPAD5 : INTEGER is 331
+	WXK_NUMPAD6 : INTEGER is 332
+	WXK_NUMPAD7 : INTEGER is 333
+	WXK_NUMPAD8 : INTEGER is 334
+	WXK_NUMPAD9 : INTEGER is 335
+	WXK_MULTIPLY : INTEGER is 336
+	WXK_ADD : INTEGER is 337
+	WXK_SEPARATOR : INTEGER is 338
+	WXK_SUBTRACT : INTEGER is 339
+	WXK_DECIMAL : INTEGER is 340
+	WXK_DIVIDE : INTEGER is 341
+	WXK_F1 : INTEGER is 342
+	WXK_F2 : INTEGER is 343
+	WXK_F3 : INTEGER is 344
+	WXK_F4 : INTEGER is 345
+	WXK_F5 : INTEGER is 346
+	WXK_F6 : INTEGER is 347
+	WXK_F7 : INTEGER is 348
+	WXK_F8 : INTEGER is 349
+	WXK_F9 : INTEGER is 350
+	WXK_F10 : INTEGER is 351
+	WXK_F11 : INTEGER is 352
+	WXK_F12 : INTEGER is 353
+	WXK_F13 : INTEGER is 354
+	WXK_F14 : INTEGER is 355
+	WXK_F15 : INTEGER is 356
+	WXK_F16 : INTEGER is 357
+	WXK_F17 : INTEGER is 358
+	WXK_F18 : INTEGER is 359
+	WXK_F19 : INTEGER is 360
+	WXK_F20 : INTEGER is 361
+	WXK_F21 : INTEGER is 362
+	WXK_F22 : INTEGER is 363
+	WXK_F23 : INTEGER is 364
+	WXK_F24 : INTEGER is 365
+	WXK_NUMLOCK : INTEGER is 366
+	WXK_SCROLL : INTEGER is 367
+	WXK_PAGEUP : INTEGER is 368
+	WXK_PAGEDOWN : INTEGER is 369
+	WXK_NUMPAD_SPACE : INTEGER is 370
+	WXK_NUMPAD_TAB : INTEGER is 371
+	WXK_NUMPAD_ENTER : INTEGER is 372
+	WXK_NUMPAD_F1 : INTEGER is 373
+	WXK_NUMPAD_F2 : INTEGER is 374
+	WXK_NUMPAD_F3 : INTEGER is 375
+	WXK_NUMPAD_F4 : INTEGER is 376
+	WXK_NUMPAD_HOME : INTEGER is 377
+	WXK_NUMPAD_LEFT : INTEGER is 378
+	WXK_NUMPAD_UP : INTEGER is 379
+	WXK_NUMPAD_RIGHT : INTEGER is 380
+	WXK_NUMPAD_DOWN : INTEGER is 381
+	WXK_NUMPAD_PRIOR : INTEGER is 382
+	WXK_NUMPAD_PAGEUP : INTEGER is 383
+	WXK_NUMPAD_NEXT : INTEGER is 384
+	WXK_NUMPAD_PAGEDOWN : INTEGER is 385
+	WXK_NUMPAD_END : INTEGER is 386
+	WXK_NUMPAD_BEGIN : INTEGER is 387
+	WXK_NUMPAD_INSERT : INTEGER is 388
+	WXK_NUMPAD_DELETE : INTEGER is 389
+	WXK_NUMPAD_EQUAL : INTEGER is 390
+	WXK_NUMPAD_MULTIPLY : INTEGER is 391
+	WXK_NUMPAD_ADD : INTEGER is 392
+	WXK_NUMPAD_SEPARATOR : INTEGER is 393
+	WXK_NUMPAD_SUBTRACT : INTEGER is 394
+	WXK_NUMPAD_DECIMAL : INTEGER is 395
+	WXK_NUMPAD_DIVIDE : INTEGER is 396
+	wxMM_TEXT : INTEGER is 1
+	wxMM_LOMETRIC : INTEGER is 2
+	wxMM_HIMETRIC : INTEGER is 3
+	wxMM_LOENGLISH : INTEGER is 4
+	wxMM_HIENGLISH : INTEGER is 5
+	wxMM_TWIPS : INTEGER is 6
+	wxMM_ISOTROPIC : INTEGER is 7
+	wxMM_ANISOTROPIC : INTEGER is 8
+	wxMM_POINTS : INTEGER is 9
+	wxMM_METRIC : INTEGER is 10
+	wxPAPER_NONE : INTEGER is 0
+	wxPAPER_LETTER : INTEGER is 1
+	wxPAPER_LEGAL : INTEGER is 2
+	wxPAPER_A4 : INTEGER is 3
+	wxPAPER_CSHEET : INTEGER is 4
+	wxPAPER_DSHEET : INTEGER is 5
+	wxPAPER_ESHEET : INTEGER is 6
+	wxPAPER_LETTERSMALL : INTEGER is 7
+	wxPAPER_TABLOID : INTEGER is 8
+	wxPAPER_LEDGER : INTEGER is 9
+	wxPAPER_STATEMENT : INTEGER is 10
+	wxPAPER_EXECUTIVE : INTEGER is 11
+	wxPAPER_A3 : INTEGER is 12
+	wxPAPER_A4SMALL : INTEGER is 13
+	wxPAPER_A5 : INTEGER is 14
+	wxPAPER_B4 : INTEGER is 15
+	wxPAPER_B5 : INTEGER is 16
+	wxPAPER_FOLIO : INTEGER is 17
+	wxPAPER_QUARTO : INTEGER is 18
+	wxPAPER_10X14 : INTEGER is 19
+	wxPAPER_11X17 : INTEGER is 20
+	wxPAPER_NOTE : INTEGER is 21
+	wxPAPER_ENV_9 : INTEGER is 22
+	wxPAPER_ENV_10 : INTEGER is 23
+	wxPAPER_ENV_11 : INTEGER is 24
+	wxPAPER_ENV_12 : INTEGER is 25
+	wxPAPER_ENV_14 : INTEGER is 26
+	wxPAPER_ENV_DL : INTEGER is 27
+	wxPAPER_ENV_C5 : INTEGER is 28
+	wxPAPER_ENV_C3 : INTEGER is 29
+	wxPAPER_ENV_C4 : INTEGER is 30
+	wxPAPER_ENV_C6 : INTEGER is 31
+	wxPAPER_ENV_C65 : INTEGER is 32
+	wxPAPER_ENV_B4 : INTEGER is 33
+	wxPAPER_ENV_B5 : INTEGER is 34
+	wxPAPER_ENV_B6 : INTEGER is 35
+	wxPAPER_ENV_ITALY : INTEGER is 36
+	wxPAPER_ENV_MONARCH : INTEGER is 37
+	wxPAPER_ENV_PERSONAL : INTEGER is 38
+	wxPAPER_FANFOLD_US : INTEGER is 39
+	wxPAPER_FANFOLD_STD_GERMAN : INTEGER is 40
+	wxPAPER_FANFOLD_LGL_GERMAN : INTEGER is 41
+	wxPAPER_ISO_B4 : INTEGER is 42
+	wxPAPER_JAPANESE_POSTCARD : INTEGER is 43
+	wxPAPER_9X11 : INTEGER is 44
+	wxPAPER_10X11 : INTEGER is 45
+	wxPAPER_15X11 : INTEGER is 46
+	wxPAPER_ENV_INVITE : INTEGER is 47
+	wxPAPER_LETTER_EXTRA : INTEGER is 48
+	wxPAPER_LEGAL_EXTRA : INTEGER is 49
+	wxPAPER_TABLOID_EXTRA : INTEGER is 50
+	wxPAPER_A4_EXTRA : INTEGER is 51
+	wxPAPER_LETTER_TRANSVERSE : INTEGER is 52
+	wxPAPER_A4_TRANSVERSE : INTEGER is 53
+	wxPAPER_LETTER_EXTRA_TRANSVERSE : INTEGER is 54
+	wxPAPER_A_PLUS : INTEGER is 55
+	wxPAPER_B_PLUS : INTEGER is 56
+	wxPAPER_LETTER_PLUS : INTEGER is 57
+	wxPAPER_A4_PLUS : INTEGER is 58
+	wxPAPER_A5_TRANSVERSE : INTEGER is 59
+	wxPAPER_B5_TRANSVERSE : INTEGER is 60
+	wxPAPER_A3_EXTRA : INTEGER is 61
+	wxPAPER_A5_EXTRA : INTEGER is 62
+	wxPAPER_B5_EXTRA : INTEGER is 63
+	wxPAPER_A2 : INTEGER is 64
+	wxPAPER_A3_TRANSVERSE : INTEGER is 65
+	wxPAPER_A3_EXTRA_TRANSVERSE : INTEGER is 66
+	wxPORTRAIT : INTEGER is 1
+	wxLANDSCAPE : INTEGER is 2
+	wxDUPLEX_SIMPLEX : INTEGER is 0
+	wxDUPLEX_HORIZONTAL : INTEGER is 1
+	wxDUPLEX_VERTICAL : INTEGER is 2
+	wxPRINT_MODE_NONE : INTEGER is 0
+	wxPRINT_MODE_PREVIEW : INTEGER is 1
+	wxPRINT_MODE_FILE : INTEGER is 2
+	wxPRINT_MODE_PRINTER : INTEGER is 3
+
+	-- from: frame.h
+
+	wxFULLSCREEN_NOMENUBAR : INTEGER is 1
+	wxFULLSCREEN_NOTOOLBAR : INTEGER is 2
+	wxFULLSCREEN_NOSTATUSBAR : INTEGER is 4
+	wxFULLSCREEN_NOBORDER : INTEGER is 8
+	wxFULLSCREEN_NOCAPTION : INTEGER is 16
+
+	-- from: layout.h
+
+	wxLAYOUT_DEFAULT_MARGIN : INTEGER is 0
+	wxEDGE_LEFT             : INTEGER is 0
+	wxEDGE_TOP              : INTEGER is 1
+	wxEDGE_RIGHT            : INTEGER is 2
+	wxEDGE_BOTTOM           : INTEGER is 3 
+	wxEDGE_WIDTH            : INTEGER is 4
+	wxEDGE_HEIGHT           : INTEGER is 5
+	wxEDGE_CENTER           : INTEGER is 6
+	wxEDGE_CENTREX          : INTEGER is 7
+	wxEDGE_CENTREY          : INTEGER is 8
+	
+	wxRELATIONSHIP_UNCONSTRAINED : INTEGER is 0
+	wxRELATIONSHIP_ASIS          : INTEGER is 1
+	wxRELATIONSHIP_PERCENTOF     : INTEGER is 2
+	wxRELATIONSHIP_ABOVE         : INTEGER is 3
+	wxRELATIONSHIP_BELOW         : INTEGER is 4
+	wxRELATIONSHIP_LEFTOF        : INTEGER is 5
+	wxRELATIONSHIP_RIGHTOF       : INTEGER is 6
+	wxRELATIONSHIP_SAMEAS        : INTEGER is 7
+	wxRELATIONSHIP_ABSOLUTE      : INTEGER is 8
+
+	-- from: fontenc.h
+
+	wxFONTENCODING_SYSTEM : INTEGER is -1
+	wxFONTENCODING_DEFAULT : INTEGER is 0
+	wxFONTENCODING_ISO8859_1 : INTEGER is 1
+	wxFONTENCODING_ISO8859_2 : INTEGER is 2
+	wxFONTENCODING_ISO8859_3 : INTEGER is 3
+	wxFONTENCODING_ISO8859_4 : INTEGER is 4
+	wxFONTENCODING_ISO8859_5 : INTEGER is 5
+	wxFONTENCODING_ISO8859_6 : INTEGER is 6
+	wxFONTENCODING_ISO8859_7 : INTEGER is 7
+	wxFONTENCODING_ISO8859_8 : INTEGER is 8
+	wxFONTENCODING_ISO8859_9 : INTEGER is 9
+	wxFONTENCODING_ISO8859_10 : INTEGER is 10
+	wxFONTENCODING_ISO8859_11 : INTEGER is 11
+	wxFONTENCODING_ISO8859_12 : INTEGER is 12
+	wxFONTENCODING_ISO8859_13 : INTEGER is 13
+	wxFONTENCODING_ISO8859_14 : INTEGER is 14
+	wxFONTENCODING_ISO8859_15 : INTEGER is 15
+	wxFONTENCODING_ISO8859_MAX : INTEGER is 16
+	wxFONTENCODING_KOI8 : INTEGER is 17
+	wxFONTENCODING_ALTERNATIVE : INTEGER is 18
+	wxFONTENCODING_BULGARIAN : INTEGER is 19
+	wxFONTENCODING_CP437 : INTEGER is 20
+	wxFONTENCODING_CP850 : INTEGER is 21
+	wxFONTENCODING_CP852 : INTEGER is 22
+	wxFONTENCODING_CP855 : INTEGER is 23
+	wxFONTENCODING_CP866 : INTEGER is 24
+	wxFONTENCODING_CP874 : INTEGER is 25
+	wxFONTENCODING_CP1250 : INTEGER is 26
+	wxFONTENCODING_CP1251 : INTEGER is 27
+	wxFONTENCODING_CP1252 : INTEGER is 28
+	wxFONTENCODING_CP1253 : INTEGER is 29
+	wxFONTENCODING_CP1254 : INTEGER is 30
+	wxFONTENCODING_CP1255 : INTEGER is 31
+	wxFONTENCODING_CP1256 : INTEGER is 32
+	wxFONTENCODING_CP1257 : INTEGER is 33
+	wxFONTENCODING_CP12_MAX : INTEGER is 34
+	wxFONTENCODING_UNICODE : INTEGER is 35
+	wxFONTENCODING_MAX : INTEGER is 36
+
+    wxGRIDTABLE_REQUEST_VIEW_GET_VALUES : INTEGER is 2000
+    wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES : INTEGER is 2001
+    wxGRIDTABLE_NOTIFY_ROWS_INSERTED : INTEGER is 2002
+    wxGRIDTABLE_NOTIFY_ROWS_APPENDED : INTEGER is 2003
+    wxGRIDTABLE_NOTIFY_ROWS_DELETED : INTEGER is 2004
+    wxGRIDTABLE_NOTIFY_COLS_INSERTED : INTEGER is 2005
+    wxGRIDTABLE_NOTIFY_COLS_APPENDED : INTEGER is 2006
+    wxGRIDTABLE_NOTIFY_COLS_DELETED : INTEGER is 2007
+	
+	wxGridSelectCells: INTEGER is 0
+	wxGridSelectRows: INTEGER is 1
+	wxGridSelectColumns: INTEGER is 2
+	
+	wxFILTER_NONE : INTEGER is 0
+	wxFILTER_ASCII : INTEGER is 1
+	wxFILTER_ALPHA : INTEGER is 2
+	wxFILTER_ALPHANUMERIC : INTEGER is 4
+	wxFILTER_NUMERIC : INTEGER is 8
+	wxFILTER_INCLUDE_LIST : INTEGER is 16
+	wxFILTER_EXCLUDE_LIST : INTEGER is 32
+	wxFILTER_UPPER_CASE : INTEGER is 64
+	wxFILTER_LOWER_CASE : INTEGER is 128
+
+    wxBITMAP_TYPE_INVALID: INTEGER is 0
+    wxBITMAP_TYPE_BMP: INTEGER is 1
+    wxBITMAP_TYPE_BMP_RESOURCE: INTEGER is 2
+    wxBITMAP_TYPE_RESOURCE: INTEGER is 2
+    wxBITMAP_TYPE_ICO: INTEGER is 3
+    wxBITMAP_TYPE_ICO_RESOURCE: INTEGER is 4
+    wxBITMAP_TYPE_CUR: INTEGER is 5
+    wxBITMAP_TYPE_CUR_RESOURCE: INTEGER is 6
+    wxBITMAP_TYPE_XBM: INTEGER is 7
+    wxBITMAP_TYPE_XBM_DATA: INTEGER is 8
+    wxBITMAP_TYPE_XPM: INTEGER is 9
+    wxBITMAP_TYPE_XPM_DATA: INTEGER is 10
+    wxBITMAP_TYPE_TIF: INTEGER is 11
+    wxBITMAP_TYPE_TIF_RESOURCE: INTEGER is 12
+    wxBITMAP_TYPE_GIF: INTEGER is 13
+    wxBITMAP_TYPE_GIF_RESOURCE: INTEGER is 14
+    wxBITMAP_TYPE_PNG: INTEGER is 15
+    wxBITMAP_TYPE_PNG_RESOURCE: INTEGER is 16
+    wxBITMAP_TYPE_JPEG: INTEGER is 17
+    wxBITMAP_TYPE_JPEG_RESOURCE: INTEGER is 18
+    wxBITMAP_TYPE_PNM: INTEGER is 19
+    wxBITMAP_TYPE_PNM_RESOURCE: INTEGER is 20
+    wxBITMAP_TYPE_PCX: INTEGER is 21
+    wxBITMAP_TYPE_PCX_RESOURCE: INTEGER is 22
+    wxBITMAP_TYPE_PICT: INTEGER is 23
+    wxBITMAP_TYPE_PICT_RESOURCE: INTEGER is 24
+    wxBITMAP_TYPE_ICON: INTEGER is 25
+    wxBITMAP_TYPE_ICON_RESOURCE: INTEGER is 26
+    wxBITMAP_TYPE_MACCURSOR: INTEGER is 27
+    wxBITMAP_TYPE_MACCURSOR_RESOURCE: INTEGER is 28
+    wxBITMAP_TYPE_ANY: INTEGER is 50
+	
+    wxCURSOR_NONE: INTEGER is 0
+    wxCURSOR_ARROW: INTEGER is 1
+    wxCURSOR_RIGHT_ARROW: INTEGER is 2
+    wxCURSOR_BULLSEYE: INTEGER is 3
+    wxCURSOR_CHAR: INTEGER is 4
+    wxCURSOR_CROSS: INTEGER is 5
+    wxCURSOR_HAND: INTEGER is 6
+    wxCURSOR_IBEAM: INTEGER is 7
+    wxCURSOR_LEFT_BUTTON: INTEGER is 8
+    wxCURSOR_MAGNIFIER: INTEGER is 9
+    wxCURSOR_MIDDLE_BUTTON: INTEGER is 10
+    wxCURSOR_NO_ENTRY: INTEGER is 11
+    wxCURSOR_PAINT_BRUSH: INTEGER is 12
+    wxCURSOR_PENCIL: INTEGER is 13
+    wxCURSOR_POINT_LEFT: INTEGER is 14
+    wxCURSOR_POINT_RIGHT: INTEGER is 15
+    wxCURSOR_QUESTION_ARROW: INTEGER is 16
+    wxCURSOR_RIGHT_BUTTON: INTEGER is 17
+    wxCURSOR_SIZENESW: INTEGER is 18
+    wxCURSOR_SIZENS: INTEGER is 19
+    wxCURSOR_SIZENWSE: INTEGER is 20
+    wxCURSOR_SIZEWE: INTEGER is 21
+    wxCURSOR_SIZING: INTEGER is 22
+    wxCURSOR_SPRAYCAN: INTEGER is 23
+    wxCURSOR_WAIT: INTEGER is 24
+    wxCURSOR_WATCH: INTEGER is 25
+    wxCURSOR_BLANK: INTEGER is 26
+
+    wxOPEN : INTEGER is 1
+    wxSAVE : INTEGER is 2
+    wxOVERWRITE_PROMPT : INTEGER is 4
+    wxHIDE_READONLY : INTEGER is 8
+    wxFILE_MUST_EXIST : INTEGER is 16
+    wxMULTIPLE : INTEGER is 32
+	wxCHANGE_DIR : INTEGER is 64
+	
+	wxDRAG_ERROR: INTEGER is 0
+	wxDRAG_NONE: INTEGER is 1
+	wxDRAG_COPY: INTEGER is 2
+	wxDRAG_MOVE: INTEGER is 3
+	wxDRAG_LINK: INTEGER is 4
+	wxDRAG_CANCEL: INTEGER is 5
+
+    wxSPLIT_HORIZONTAL: INTEGER is 1
+    wxSPLIT_VERTICAL: INTEGER is 2
+
+    wxLIST_FORMAT_LEFT: INTEGER is 0
+    wxLIST_FORMAT_RIGHT: INTEGER is 1
+    wxLIST_FORMAT_CENTRE: INTEGER is 2
+    wxLIST_FORMAT_CENTER: INTEGER is 2
+
+	wxLIST_STATE_DONTCARE : INTEGER is 0
+	wxLIST_STATE_DROPHILITED : INTEGER is 1
+	wxLIST_STATE_FOCUSED : INTEGER is 2
+	wxLIST_STATE_SELECTED : INTEGER is 4
+	wxLIST_STATE_CUT : INTEGER is 8
+
+	wxLIST_MASK_STATE : INTEGER is 1
+	wxLIST_MASK_TEXT : INTEGER is 2
+	wxLIST_MASK_IMAGE : INTEGER is 4
+	wxLIST_MASK_DATA : INTEGER is 8
+	wxLIST_MASK_WIDTH : INTEGER is 16
+	wxLIST_MASK_FORMAT : INTEGER is 32
+
+	wxLIST_NEXT_ABOVE: INTEGER is 0
+	wxLIST_NEXT_ALL: INTEGER is 1
+	wxLIST_NEXT_BELOW: INTEGER is 2
+	wxLIST_NEXT_LEFT: INTEGER is 3
+	wxLIST_NEXT_RIGHT: INTEGER is 4
+	
+	wxRA_SPECIFY_COLS : INTEGER is 4
+	wxRA_SPECIFY_ROWS : INTEGER is 8
+
+	wxTREE_HITTEST_ABOVE : INTEGER is 1
+	wxTREE_HITTEST_BELOW : INTEGER is 2
+	wxTREE_HITTEST_NOWHERE : INTEGER is 4
+	wxTREE_HITTEST_ONITEMBUTTON : INTEGER is 8
+	wxTREE_HITTEST_ONITEMICON : INTEGER is 16
+	wxTREE_HITTEST_ONITEMINDENT : INTEGER is 32
+	wxTREE_HITTEST_ONITEMLABEL : INTEGER is 64
+	wxTREE_HITTEST_ONITEMRIGHT : INTEGER is 128
+	wxTREE_HITTEST_ONITEMSTATEICON : INTEGER is 256
+	wxTREE_HITTEST_TOLEFT : INTEGER is 512
+	wxTREE_HITTEST_TORIGHT : INTEGER is 1024
+	wxTREE_HITTEST_ONITEMUPPERPART : INTEGER is 2048
+	wxTREE_HITTEST_ONITEMLOWERPART : INTEGER is 4096
+	wxTREE_HITTEST_ONITEM : INTEGER is 80
+	
+	wxDEFAULT:    INTEGER is 70
+	wxDECORATIVE: INTEGER is 71
+	wxROMAN:      INTEGER is 72
+	wxSCRIPT:     INTEGER is 73
+	wxSWISS:      INTEGER is 74
+	wxMODERN:     INTEGER is 75
+	wxTELETYPE:   INTEGER is 76
+	wxVARIABLE:   INTEGER is 80
+	wxFIXED:      INTEGER is 81
+	wxNORMAL:     INTEGER is 90
+	wxLIGHT:      INTEGER is 91
+	wxBOLD:       INTEGER is 92
+	wxITALIC:     INTEGER is 93
+	wxSLANT:      INTEGER is 94
+	
+	wxBLUE_BRUSH:        INTEGER is 0
+	wxGREEN_BRUSH:       INTEGER is 1
+	wxWHITE_BRUSH:       INTEGER is 2
+	wxBLACK_BRUSH:       INTEGER is 3
+	wxGREY_BRUSH:        INTEGER is 4
+	wxMEDIUM_GREY_BRUSH: INTEGER is 5
+	wxLIGHT_GREY_BRUSH:  INTEGER is 6
+	wxTRANSPARENT_BRUSH: INTEGER is 7
+	wxCYAN_BRUSH:        INTEGER is 8
+	wxRED_BRUSH:         INTEGER is 9
+
+	wxBLACK:      INTEGER is 0
+	wxWHITE:      INTEGER is 1
+	wxRED:        INTEGER is 2
+	wxBLUE:       INTEGER is 3
+	wxGREEN:      INTEGER is 4
+	wxCYAN:       INTEGER is 5
+	wxLIGHT_GREY: INTEGER is 6
+
+	wxRED_PEN:          INTEGER is 0
+	wxCYAN_PEN:         INTEGER is 1
+	wxGREEN_PEN:        INTEGER is 2
+	wxBLACK_PEN:        INTEGER is 3
+	wxWHITE_PEN:        INTEGER is 4
+	wxTRANSPARENT_PEN:  INTEGER is 5
+	wxBLACK_DASHED_PEN: INTEGER is 6
+	wxGREY_PEN:         INTEGER is 7
+	wxMEDIUM_GREY_PEN:  INTEGER is 8
+	wxLIGHT_GREY_PEN:   INTEGER is 9
+	
+	wxNOT_FOUND: INTEGER is -1
+
+    wxPRINTER_NO_ERROR:  INTEGER is 0
+    wxPRINTER_CANCELLED: INTEGER is 1
+    wxPRINTER_ERROR:     INTEGER is 2
+
+	wxPREVIEW_PRINT    : INTEGER is 1
+	wxPREVIEW_PREVIOUS : INTEGER is 2
+	wxPREVIEW_NEXT     : INTEGER is 4
+	wxPREVIEW_ZOOM     : INTEGER is 8
+	wxPREVIEW_FIRST    : INTEGER is 8
+	wxPREVIEW_LAST     : INTEGER is 32
+	wxPREVIEW_GOTO     : INTEGER is 64
+	wxPREVIEW_DEFAULT  : INTEGER is 126
+
+	wxID_PREVIEW_CLOSE:    INTEGER is 1
+	wxID_PREVIEW_NEXT:     INTEGER is 2
+	wxID_PREVIEW_PREVIOUS: INTEGER is 3
+	wxID_PREVIEW_PRINT:    INTEGER is 4
+	wxID_PREVIEW_ZOOM:     INTEGER is 5
+	wxID_PREVIEW_FIRST: INTEGER is 6
+	wxID_PREVIEW_LAST: INTEGER is 7
+	wxID_PREVIEW_GOTO: INTEGER is 8
+
+    wxPRINTID_STATIC:      INTEGER is 10
+    wxPRINTID_RANGE:       INTEGER is 11
+    wxPRINTID_FROM:        INTEGER is 12
+    wxPRINTID_TO:          INTEGER is 13
+    wxPRINTID_COPIES:      INTEGER is 14
+    wxPRINTID_PRINTTOFILE: INTEGER is 15
+    wxPRINTID_SETUP:       INTEGER is 16
+
+    wxPRINTID_LEFTMARGIN:   INTEGER is 30
+    wxPRINTID_RIGHTMARGIN:  INTEGER is 31
+    wxPRINTID_TOPMARGIN:    INTEGER is 32
+    wxPRINTID_BOTTOMMARGIN: INTEGER is 33
+
+    wxPRINTID_PRINTCOLOUR: INTEGER is 10
+    wxPRINTID_ORIENTATION: INTEGER is 11
+    wxPRINTID_COMMAND:     INTEGER is 12
+    wxPRINTID_OPTIONS:     INTEGER is 13
+    wxPRINTID_PAPERSIZE:   INTEGER is 14
+
+	wxHF_TOOLBAR      : INTEGER is 1
+	wxHF_CONTENTS     : INTEGER is 2
+	wxHF_INDEX        : INTEGER is 4
+	wxHF_SEARCH       : INTEGER is 8
+	wxHF_BOOKMARKS    : INTEGER is 16
+	wxHF_OPENFILES    : INTEGER is 32
+	wxHF_PRINT        : INTEGER is 64
+	wxHF_FLATTOOLBAR  : INTEGER is 128
+	wxHF_DEFAULTSTYLE : INTEGER is 95
+	
+    wxLAYOUT_HORIZONTAL:	INTEGER is 0
+    wxLAYOUT_VERTICAL:		INTEGER is 1
+
+    wxLAYOUT_NONE:		INTEGER is 0
+    wxLAYOUT_TOP:		INTEGER is 1
+    wxLAYOUT_LEFT:		INTEGER is 2
+    wxLAYOUT_RIGHT:		INTEGER is 3
+    wxLAYOUT_BOTTOM:	INTEGER is 4
+
+	wxSASH_DRAG_NONE:		INTEGER is 0
+	wxSASH_DRAG_DRAGGING:	INTEGER is 1
+	wxSASH_DRAG_LEFT_DOWN:	INTEGER is 2
+
+    wxSASH_TOP:		INTEGER is 0
+    wxSASH_RIGHT:	INTEGER is 1
+    wxSASH_BOTTOM:	INTEGER is 2
+    wxSASH_LEFT:	INTEGER is 3
+    wxSASH_NONE:	INTEGER is 100
+
+	wxSW_NOBORDER:	INTEGER is 0
+	wxSW_BORDER:	INTEGER is 32
+	wxSW_3DSASH:	INTEGER is 64
+	wxSW_3DBORDER:	INTEGER is 128
+	wxSW_3D:		INTEGER is 192
+
+    wxSASH_STATUS_OK:			INTEGER is 0
+    wxSASH_STATUS_OUT_OF_RANGE:	INTEGER is 1
+
+	-- from: settings.h
+
+	wxSYS_WHITE_BRUSH         : INTEGER is 0
+	wxSYS_LTGRAY_BRUSH        : INTEGER is 1
+	wxSYS_GRAY_BRUSH          : INTEGER is 2
+	wxSYS_DKGRAY_BRUSH        : INTEGER is 3
+	wxSYS_BLACK_BRUSH         : INTEGER is 4
+	wxSYS_NULL_BRUSH          : INTEGER is 5
+	wxSYS_HOLLOW_BRUSH        : INTEGER is 5
+	wxSYS_WHITE_PEN           : INTEGER is 6
+	wxSYS_BLACK_PEN           : INTEGER is 7
+	wxSYS_NULL_PEN            : INTEGER is 8
+	wxSYS_OEM_FIXED_FONT      : INTEGER is 10
+	wxSYS_ANSI_FIXED_FONT     : INTEGER is 11
+	wxSYS_ANSI_VAR_FONT       : INTEGER is 12
+	wxSYS_SYSTEM_FONT         : INTEGER is 13
+	wxSYS_DEVICE_DEFAULT_FONT : INTEGER is 14
+	wxSYS_DEFAULT_PALETTE     : INTEGER is 15
+	wxSYS_SYSTEM_FIXED_FONT   : INTEGER is 16
+	wxSYS_DEFAULT_GUI_FONT    : INTEGER is 17
+
+	wxSYS_COLOUR_SCROLLBAR         : INTEGER is 0
+	wxSYS_COLOUR_BACKGROUND        : INTEGER is 1
+	wxSYS_COLOUR_ACTIVECAPTION     : INTEGER is 2
+	wxSYS_COLOUR_INACTIVECAPTION   : INTEGER is 3
+	wxSYS_COLOUR_MENU              : INTEGER is 4
+	wxSYS_COLOUR_WINDOW            : INTEGER is 5
+	wxSYS_COLOUR_WINDOWFRAME       : INTEGER is 6
+	wxSYS_COLOUR_MENUTEXT          : INTEGER is 7
+	wxSYS_COLOUR_WINDOWTEXT        : INTEGER is 8
+	wxSYS_COLOUR_CAPTIONTEXT       : INTEGER is 9
+	wxSYS_COLOUR_ACTIVEBORDER      : INTEGER is 10
+	wxSYS_COLOUR_INACTIVEBORDER    : INTEGER is 11
+	wxSYS_COLOUR_APPWORKSPACE      : INTEGER is 12
+	wxSYS_COLOUR_HIGHLIGHT         : INTEGER is 13
+	wxSYS_COLOUR_HIGHLIGHTTEXT     : INTEGER is 14
+	wxSYS_COLOUR_BTNFACE           : INTEGER is 15
+	wxSYS_COLOUR_BTNSHADOW         : INTEGER is 16
+	wxSYS_COLOUR_GRAYTEXT          : INTEGER is 17
+	wxSYS_COLOUR_BTNTEXT           : INTEGER is 18
+	wxSYS_COLOUR_INACTIVECAPTIONTEXT : INTEGER is 19
+	wxSYS_COLOUR_BTNHIGHLIGHT      : INTEGER is 20
+
+	wxSYS_COLOUR_3DDKSHADOW        : INTEGER is 21
+	wxSYS_COLOUR_3DLIGHT           : INTEGER is 22
+	wxSYS_COLOUR_INFOTEXT          : INTEGER is 23
+	wxSYS_COLOUR_INFOBK            : INTEGER is 24
+
+	wxSYS_COLOUR_LISTBOX           : INTEGER is 25
+
+	wxSYS_COLOUR_DESKTOP           : INTEGER is 1
+	wxSYS_COLOUR_3DFACE            : INTEGER is 15
+	wxSYS_COLOUR_3DSHADOW          : INTEGER is 16
+	wxSYS_COLOUR_3DHIGHLIGHT       : INTEGER is 20
+	wxSYS_COLOUR_3DHILIGHT         : INTEGER is 20
+	wxSYS_COLOUR_BTNHILIGHT        : INTEGER is 20
+
+	wxSYS_MOUSE_BUTTONS           : INTEGER is 1
+	wxSYS_BORDER_X                : INTEGER is 2
+	wxSYS_BORDER_Y                : INTEGER is 3
+	wxSYS_CURSOR_X                : INTEGER is 4
+	wxSYS_CURSOR_Y                : INTEGER is 5
+	wxSYS_DCLICK_X                : INTEGER is 6
+	wxSYS_DCLICK_Y                : INTEGER is 7
+	wxSYS_DRAG_X                  : INTEGER is 8
+	wxSYS_DRAG_Y                  : INTEGER is 9
+	wxSYS_EDGE_X                  : INTEGER is 10
+	wxSYS_EDGE_Y                  : INTEGER is 11
+	wxSYS_HSCROLL_ARROW_X         : INTEGER is 12
+	wxSYS_HSCROLL_ARROW_Y         : INTEGER is 13
+	wxSYS_HTHUMB_X                : INTEGER is 14
+	wxSYS_ICON_X                  : INTEGER is 15
+	wxSYS_ICON_Y                  : INTEGER is 16
+	wxSYS_ICONSPACING_X           : INTEGER is 17
+	wxSYS_ICONSPACING_Y           : INTEGER is 18
+	wxSYS_WINDOWMIN_X             : INTEGER is 19
+	wxSYS_WINDOWMIN_Y             : INTEGER is 20
+	wxSYS_SCREEN_X                : INTEGER is 21
+	wxSYS_SCREEN_Y                : INTEGER is 22
+	wxSYS_FRAMESIZE_X             : INTEGER is 23
+	wxSYS_FRAMESIZE_Y             : INTEGER is 24
+	wxSYS_SMALLICON_X             : INTEGER is 25
+	wxSYS_SMALLICON_Y             : INTEGER is 26
+	wxSYS_HSCROLL_Y               : INTEGER is 27
+	wxSYS_VSCROLL_X               : INTEGER is 28
+	wxSYS_VSCROLL_ARROW_X         : INTEGER is 29
+	wxSYS_VSCROLL_ARROW_Y         : INTEGER is 30
+	wxSYS_VTHUMB_Y                : INTEGER is 31
+	wxSYS_CAPTION_Y               : INTEGER is 32
+	wxSYS_MENU_Y                  : INTEGER is 33
+	wxSYS_NETWORK_PRESENT         : INTEGER is 34
+	wxSYS_PENWINDOWS_PRESENT      : INTEGER is 35
+	wxSYS_SHOW_SOUNDS             : INTEGER is 36
+	wxSYS_SWAP_BUTTONS            : INTEGER is 37	
+
+	wxCAL_BORDER_NONE:		INTEGER is 0
+	wxCAL_BORDER_SQUARE:	INTEGER is 1
+	wxCAL_BORDER_ROUND:		INTEGER is 2
+	
+	wxCAL_HITTEST_NOWHERE:	INTEGER is 0
+	wxCAL_HITTEST_HEADER:	INTEGER is 1
+	wxCAL_HITTEST_DAY:		INTEGER is 2
+	
+	wxUNKNOWN:	INTEGER is 0
+	wxSTRING:	INTEGER is 1
+	wxBOOLEAN:	INTEGER is 2
+	wxINTEGER:	INTEGER is 3
+	wxFLOAT:	INTEGER is 4
+
+    wxMUTEX_NO_ERROR:	INTEGER is 0
+    wxMUTEX_DEAD_LOCK:	INTEGER is 1
+    wxMUTEX_BUSY:	    INTEGER is 2 
+    wxMUTEX_UNLOCKED:	INTEGER is 3
+    wxMUTEX_MISC_ERROR:	INTEGER is 4
+
+    wxPLATFORM_CURRENT: INTEGER is -1
+    wxPLATFORM_UNIX:    INTEGER is 0
+    wxPLATFORM_WINDOWS: INTEGER is 1
+    wxPLATFORM_OS2:     INTEGER is 2
+    wxPLATFORM_MAC:     INTEGER is 3
+
+    wxLED_ALIGN_LEFT: INTEGER is 1
+    wxLED_ALIGN_RIGHT: INTEGER is 2
+    wxLED_ALIGN_CENTER: INTEGER is 4
+
+    wxLED_ALIGN_MASK: INTEGER is 4
+
+	wxLED_DRAW_FADED: INTEGER is 8
+	
+	wxDS_MANAGE_SCROLLBARS: INTEGER is 16
+	wxDS_DRAG_CORNER: INTEGER is 32
+
+	wxEL_ALLOW_NEW: INTEGER is 256
+	wxEL_ALLOW_EDIT: INTEGER is 512
+	wxEL_ALLOW_DELETE: INTEGER is 1024
+
+    wxEVT_COMMAND_BUTTON_CLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_BUTTON_CLICKED"
+		end
+
+    wxEVT_COMMAND_CHECKBOX_CLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_CHECKBOX_CLICKED"
+		end
+
+    wxEVT_COMMAND_CHOICE_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_CHOICE_SELECTED"
+		end
+
+    wxEVT_COMMAND_LISTBOX_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LISTBOX_SELECTED"
+		end
+
+    wxEVT_COMMAND_LISTBOX_DOUBLECLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LISTBOX_DOUBLECLICKED"
+		end
+
+    wxEVT_COMMAND_CHECKLISTBOX_TOGGLED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_CHECKLISTBOX_TOGGLED"
+		end
+
+    wxEVT_COMMAND_TEXT_UPDATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TEXT_UPDATED"
+		end
+
+    wxEVT_COMMAND_TEXT_ENTER : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TEXT_ENTER"
+		end
+
+    wxEVT_COMMAND_MENU_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_MENU_SELECTED"
+		end
+
+    wxEVT_COMMAND_TOOL_CLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TOOL_CLICKED"
+		end
+
+    wxEVT_COMMAND_SLIDER_UPDATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SLIDER_UPDATED"
+		end
+
+    wxEVT_COMMAND_RADIOBOX_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_RADIOBOX_SELECTED"
+		end
+
+    wxEVT_COMMAND_RADIOBUTTON_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_RADIOBUTTON_SELECTED"
+		end
+
+    wxEVT_COMMAND_SCROLLBAR_UPDATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SCROLLBAR_UPDATED"
+		end
+
+    wxEVT_COMMAND_VLBOX_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_VLBOX_SELECTED"
+		end
+
+    wxEVT_COMMAND_COMBOBOX_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_COMBOBOX_SELECTED"
+		end
+
+    wxEVT_COMMAND_TOOL_RCLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TOOL_RCLICKED"
+		end
+
+    wxEVT_COMMAND_TOOL_ENTER : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TOOL_ENTER"
+		end
+
+    wxEVT_COMMAND_SPINCTRL_UPDATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SPINCTRL_UPDATED"
+		end
+
+    wxEVT_SOCKET : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SOCKET"
+		end
+
+    wxEVT_TIMER  : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_TIMER "
+		end
+
+    wxEVT_LEFT_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_LEFT_DOWN"
+		end
+
+    wxEVT_LEFT_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_LEFT_UP"
+		end
+
+    wxEVT_MIDDLE_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MIDDLE_DOWN"
+		end
+
+    wxEVT_MIDDLE_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MIDDLE_UP"
+		end
+
+    wxEVT_RIGHT_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_RIGHT_DOWN"
+		end
+
+    wxEVT_RIGHT_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_RIGHT_UP"
+		end
+
+    wxEVT_MOTION : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MOTION"
+		end
+
+    wxEVT_ENTER_WINDOW : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_ENTER_WINDOW"
+		end
+
+    wxEVT_LEAVE_WINDOW : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_LEAVE_WINDOW"
+		end
+
+    wxEVT_LEFT_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_LEFT_DCLICK"
+		end
+
+    wxEVT_MIDDLE_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MIDDLE_DCLICK"
+		end
+
+    wxEVT_RIGHT_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_RIGHT_DCLICK"
+		end
+
+    wxEVT_SET_FOCUS : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SET_FOCUS"
+		end
+
+    wxEVT_KILL_FOCUS : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_KILL_FOCUS"
+		end
+
+    wxEVT_NC_LEFT_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_LEFT_DOWN"
+		end
+
+    wxEVT_NC_LEFT_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_LEFT_UP"
+		end
+
+    wxEVT_NC_MIDDLE_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_MIDDLE_DOWN"
+		end
+
+    wxEVT_NC_MIDDLE_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_MIDDLE_UP"
+		end
+
+    wxEVT_NC_RIGHT_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_RIGHT_DOWN"
+		end
+
+    wxEVT_NC_RIGHT_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_RIGHT_UP"
+		end
+
+    wxEVT_NC_MOTION : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_MOTION"
+		end
+
+    wxEVT_NC_ENTER_WINDOW : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_ENTER_WINDOW"
+		end
+
+    wxEVT_NC_LEAVE_WINDOW : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_LEAVE_WINDOW"
+		end
+
+    wxEVT_NC_LEFT_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_LEFT_DCLICK"
+		end
+
+    wxEVT_NC_MIDDLE_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_MIDDLE_DCLICK"
+		end
+
+    wxEVT_NC_RIGHT_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_RIGHT_DCLICK"
+		end
+
+    wxEVT_CHAR : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CHAR"
+		end
+
+    wxEVT_CHAR_HOOK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CHAR_HOOK"
+		end
+
+    wxEVT_NAVIGATION_KEY : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NAVIGATION_KEY"
+		end
+
+    wxEVT_KEY_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_KEY_DOWN"
+		end
+
+    wxEVT_KEY_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_KEY_UP"
+		end
+
+    wxEVT_SET_CURSOR : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SET_CURSOR"
+		end
+
+    wxEVT_SCROLL_TOP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_TOP"
+		end
+
+    wxEVT_SCROLL_BOTTOM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_BOTTOM"
+		end
+
+    wxEVT_SCROLL_LINEUP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_LINEUP"
+		end
+
+    wxEVT_SCROLL_LINEDOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_LINEDOWN"
+		end
+
+    wxEVT_SCROLL_PAGEUP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_PAGEUP"
+		end
+
+    wxEVT_SCROLL_PAGEDOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_PAGEDOWN"
+		end
+
+    wxEVT_SCROLL_THUMBTRACK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_THUMBTRACK"
+		end
+
+    wxEVT_SCROLL_THUMBRELEASE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLL_THUMBRELEASE"
+		end
+
+    wxEVT_SCROLLWIN_TOP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_TOP"
+		end
+
+    wxEVT_SCROLLWIN_BOTTOM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_BOTTOM"
+		end
+
+    wxEVT_SCROLLWIN_LINEUP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_LINEUP"
+		end
+
+    wxEVT_SCROLLWIN_LINEDOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_LINEDOWN"
+		end
+
+    wxEVT_SCROLLWIN_PAGEUP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_PAGEUP"
+		end
+
+    wxEVT_SCROLLWIN_PAGEDOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_PAGEDOWN"
+		end
+
+    wxEVT_SCROLLWIN_THUMBTRACK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_THUMBTRACK"
+		end
+
+    wxEVT_SCROLLWIN_THUMBRELEASE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SCROLLWIN_THUMBRELEASE"
+		end
+
+    wxEVT_SIZE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SIZE"
+		end
+
+    wxEVT_MOVE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MOVE"
+		end
+
+    wxEVT_CLOSE_WINDOW : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CLOSE_WINDOW"
+		end
+
+    wxEVT_END_SESSION : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_END_SESSION"
+		end
+
+    wxEVT_QUERY_END_SESSION : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_QUERY_END_SESSION"
+		end
+
+    wxEVT_ACTIVATE_APP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_ACTIVATE_APP"
+		end
+
+    wxEVT_POWER : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_POWER"
+		end
+
+    wxEVT_ACTIVATE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_ACTIVATE"
+		end
+
+    wxEVT_CREATE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CREATE"
+		end
+
+    wxEVT_DESTROY : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DESTROY"
+		end
+
+    wxEVT_SHOW : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SHOW"
+		end
+
+    wxEVT_ICONIZE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_ICONIZE"
+		end
+
+    wxEVT_MAXIMIZE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MAXIMIZE"
+		end
+
+    wxEVT_MOUSE_CAPTURE_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MOUSE_CAPTURE_CHANGED"
+		end
+
+    wxEVT_PAINT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PAINT"
+		end
+
+    wxEVT_ERASE_BACKGROUND : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_ERASE_BACKGROUND"
+		end
+
+    wxEVT_NC_PAINT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_NC_PAINT"
+		end
+
+    wxEVT_PAINT_ICON : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PAINT_ICON"
+		end
+
+    wxEVT_MENU_CHAR : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MENU_CHAR"
+		end
+
+    wxEVT_MENU_INIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MENU_INIT"
+		end
+
+    wxEVT_MENU_HIGHLIGHT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MENU_HIGHLIGHT"
+		end
+
+    wxEVT_POPUP_MENU_INIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_POPUP_MENU_INIT"
+		end
+
+    wxEVT_CONTEXT_MENU : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CONTEXT_MENU"
+		end
+
+    wxEVT_SYS_COLOUR_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SYS_COLOUR_CHANGED"
+		end
+
+    wxEVT_SETTING_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_SETTING_CHANGED"
+		end
+
+    wxEVT_QUERY_NEW_PALETTE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_QUERY_NEW_PALETTE"
+		end
+
+    wxEVT_PALETTE_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PALETTE_CHANGED"
+		end
+
+    wxEVT_JOY_BUTTON_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_JOY_BUTTON_DOWN"
+		end
+
+    wxEVT_JOY_BUTTON_UP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_JOY_BUTTON_UP"
+		end
+
+    wxEVT_JOY_MOVE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_JOY_MOVE"
+		end
+
+    wxEVT_JOY_ZMOVE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_JOY_ZMOVE"
+		end
+
+    wxEVT_DROP_FILES : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DROP_FILES"
+		end
+
+    wxEVT_DRAW_ITEM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DRAW_ITEM"
+		end
+
+    wxEVT_MEASURE_ITEM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_MEASURE_ITEM"
+		end
+
+    wxEVT_COMPARE_ITEM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMPARE_ITEM"
+		end
+
+    wxEVT_INIT_DIALOG : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_INIT_DIALOG"
+		end
+
+    wxEVT_IDLE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_IDLE"
+		end
+
+    wxEVT_UPDATE_UI : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_UPDATE_UI"
+		end
+
+    wxEVT_END_PROCESS : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_END_PROCESS"
+		end
+
+    wxEVT_DIALUP_CONNECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DIALUP_CONNECTED"
+		end
+
+    wxEVT_DIALUP_DISCONNECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DIALUP_DISCONNECTED"
+		end
+
+    wxEVT_COMMAND_LEFT_CLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LEFT_CLICK"
+		end
+
+    wxEVT_COMMAND_LEFT_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LEFT_DCLICK"
+		end
+
+    wxEVT_COMMAND_RIGHT_CLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_RIGHT_CLICK"
+		end
+
+    wxEVT_COMMAND_RIGHT_DCLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_RIGHT_DCLICK"
+		end
+
+    wxEVT_COMMAND_SET_FOCUS : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SET_FOCUS"
+		end
+
+    wxEVT_COMMAND_KILL_FOCUS : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_KILL_FOCUS"
+		end
+
+    wxEVT_COMMAND_ENTER : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_ENTER"
+		end
+
+    wxEVT_COMMAND_TREE_BEGIN_DRAG : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_BEGIN_DRAG"
+		end
+
+    wxEVT_COMMAND_TREE_BEGIN_RDRAG : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_BEGIN_RDRAG"
+		end
+
+    wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_BEGIN_LABEL_EDIT"
+		end
+
+    wxEVT_COMMAND_TREE_END_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_END_LABEL_EDIT"
+		end
+
+    wxEVT_COMMAND_TREE_DELETE_ITEM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_DELETE_ITEM"
+		end
+
+    wxEVT_COMMAND_TREE_GET_INFO : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_GET_INFO"
+		end
+
+    wxEVT_COMMAND_TREE_SET_INFO : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_SET_INFO"
+		end
+
+    wxEVT_COMMAND_TREE_ITEM_EXPANDED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_ITEM_EXPANDED"
+		end
+
+    wxEVT_COMMAND_TREE_ITEM_EXPANDING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_ITEM_EXPANDING"
+		end
+
+    wxEVT_COMMAND_TREE_ITEM_COLLAPSED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_ITEM_COLLAPSED"
+		end
+
+    wxEVT_COMMAND_TREE_ITEM_COLLAPSING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_ITEM_COLLAPSING"
+		end
+
+    wxEVT_COMMAND_TREE_SEL_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_SEL_CHANGED"
+		end
+
+    wxEVT_COMMAND_TREE_SEL_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_SEL_CHANGING"
+		end
+
+    wxEVT_COMMAND_TREE_KEY_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_KEY_DOWN"
+		end
+
+    wxEVT_COMMAND_TREE_ITEM_ACTIVATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_ITEM_ACTIVATED"
+		end
+
+    wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_ITEM_RIGHT_CLICK"
+		end
+
+    wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK"
+		end
+
+    wxEVT_COMMAND_TREE_END_DRAG : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TREE_END_DRAG"
+		end
+
+    wxEVT_COMMAND_LIST_BEGIN_DRAG : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_BEGIN_DRAG"
+		end
+
+    wxEVT_COMMAND_LIST_BEGIN_RDRAG : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_BEGIN_RDRAG"
+		end
+
+    wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_BEGIN_LABEL_EDIT"
+		end
+
+    wxEVT_COMMAND_LIST_END_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_END_LABEL_EDIT"
+		end
+
+    wxEVT_COMMAND_LIST_DELETE_ITEM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_DELETE_ITEM"
+		end
+
+    wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_DELETE_ALL_ITEMS"
+		end
+
+    wxEVT_COMMAND_LIST_GET_INFO : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_GET_INFO"
+		end
+
+    wxEVT_COMMAND_LIST_SET_INFO : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_SET_INFO"
+		end
+
+    wxEVT_COMMAND_LIST_ITEM_SELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_ITEM_SELECTED"
+		end
+
+    wxEVT_COMMAND_LIST_ITEM_DESELECTED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_ITEM_DESELECTED"
+		end
+
+    wxEVT_COMMAND_LIST_KEY_DOWN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_KEY_DOWN"
+		end
+
+    wxEVT_COMMAND_LIST_INSERT_ITEM : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_INSERT_ITEM"
+		end
+
+    wxEVT_COMMAND_LIST_COL_CLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_COL_CLICK"
+		end
+
+    wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_ITEM_RIGHT_CLICK"
+		end
+
+    wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK"
+		end
+
+    wxEVT_COMMAND_LIST_ITEM_ACTIVATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_ITEM_ACTIVATED"
+		end
+
+    wxEVT_COMMAND_LIST_ITEM_FOCUSED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_LIST_ITEM_FOCUSED"
+		end
+
+    wxEVT_COMMAND_TAB_SEL_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TAB_SEL_CHANGED"
+		end
+
+    wxEVT_COMMAND_TAB_SEL_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TAB_SEL_CHANGING"
+		end
+
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_NOTEBOOK_PAGE_CHANGED"
+		end
+
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_NOTEBOOK_PAGE_CHANGING"
+		end
+
+    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SPLITTER_SASH_POS_CHANGED"
+		end
+
+    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SPLITTER_SASH_POS_CHANGING"
+		end
+
+    wxEVT_COMMAND_SPLITTER_DOUBLECLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SPLITTER_DOUBLECLICKED"
+		end
+
+    wxEVT_COMMAND_SPLITTER_UNSPLIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_SPLITTER_UNSPLIT"
+		end
+
+    wxEVT_WIZARD_PAGE_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_WIZARD_PAGE_CHANGED"
+		end
+
+    wxEVT_WIZARD_PAGE_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_WIZARD_PAGE_CHANGING"
+		end
+
+    wxEVT_WIZARD_CANCEL : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_WIZARD_CANCEL"
+		end
+
+    wxEVT_CALENDAR_SEL_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CALENDAR_SEL_CHANGED"
+		end
+
+    wxEVT_CALENDAR_DAY_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CALENDAR_DAY_CHANGED"
+		end
+
+    wxEVT_CALENDAR_MONTH_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CALENDAR_MONTH_CHANGED"
+		end
+
+    wxEVT_CALENDAR_YEAR_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CALENDAR_YEAR_CHANGED"
+		end
+
+    wxEVT_CALENDAR_DOUBLECLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CALENDAR_DOUBLECLICKED"
+		end
+
+    wxEVT_CALENDAR_WEEKDAY_CLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_CALENDAR_WEEKDAY_CLICKED"
+		end
+
+    wxEVT_PLOT_SEL_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_SEL_CHANGING"
+		end
+
+    wxEVT_PLOT_SEL_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_SEL_CHANGED"
+		end
+
+    wxEVT_PLOT_CLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_CLICKED"
+		end
+
+    wxEVT_PLOT_DOUBLECLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_DOUBLECLICKED"
+		end
+
+    wxEVT_PLOT_ZOOM_IN : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_ZOOM_IN"
+		end
+
+    wxEVT_PLOT_ZOOM_OUT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_ZOOM_OUT"
+		end
+
+    wxEVT_PLOT_VALUE_SEL_CREATING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_VALUE_SEL_CREATING"
+		end
+
+    wxEVT_PLOT_VALUE_SEL_CREATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_VALUE_SEL_CREATED"
+		end
+
+    wxEVT_PLOT_VALUE_SEL_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_VALUE_SEL_CHANGING"
+		end
+
+    wxEVT_PLOT_VALUE_SEL_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_VALUE_SEL_CHANGED"
+		end
+
+    wxEVT_PLOT_AREA_SEL_CREATING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_AREA_SEL_CREATING"
+		end
+
+    wxEVT_PLOT_AREA_SEL_CREATED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_AREA_SEL_CREATED"
+		end
+
+    wxEVT_PLOT_AREA_SEL_CHANGING : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_AREA_SEL_CHANGING"
+		end
+
+    wxEVT_PLOT_AREA_SEL_CHANGED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_AREA_SEL_CHANGED"
+		end
+
+    wxEVT_PLOT_BEGIN_X_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_BEGIN_X_LABEL_EDIT"
+		end
+
+    wxEVT_PLOT_END_X_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_END_X_LABEL_EDIT"
+		end
+
+    wxEVT_PLOT_BEGIN_Y_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_BEGIN_Y_LABEL_EDIT"
+		end
+
+    wxEVT_PLOT_END_Y_LABEL_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_END_Y_LABEL_EDIT"
+		end
+
+    wxEVT_PLOT_BEGIN_TITLE_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_BEGIN_TITLE_EDIT"
+		end
+
+    wxEVT_PLOT_END_TITLE_EDIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_END_TITLE_EDIT"
+		end
+
+    wxEVT_PLOT_AREA_CREATE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_PLOT_AREA_CREATE"
+		end
+
+    wxEVT_USER_FIRST : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_USER_FIRST"
+		end	
+
+    wxEVT_DYNAMIC_SASH_SPLIT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DYNAMIC_SASH_SPLIT"
+		end
+
+    wxEVT_DYNAMIC_SASH_UNIFY : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DYNAMIC_SASH_UNIFY"
+		end
+
+	wxEVT_COMMAND_FIND : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_FIND"
+		end
+
+	wxEVT_COMMAND_FIND_NEXT : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_FIND_NEXT"
+		end
+
+	wxEVT_COMMAND_FIND_REPLACE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_FIND_REPLACE"
+		end
+
+	wxEVT_COMMAND_FIND_REPLACE_ALL : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_FIND_REPLACE_ALL"
+		end
+
+	wxEVT_COMMAND_FIND_CLOSE : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_FIND_CLOSE"
+		end
+
+	wxEVT_COMMAND_TOGGLEBUTTON_CLICKED : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_COMMAND_TOGGLEBUTTON_CLICKED"
+		end
+
+	wxEVT_HELP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_HELP"
+		end
+
+	wxEVT_DETAILED_HELP : INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_DETAILED_HELP"
+		end
+
+	wxTR_NO_BUTTONS: INTEGER is 0
+	wxTR_HAS_BUTTONS: INTEGER is 1
+	wxTR_TWIST_BUTTONS: INTEGER is 2
+	wxTR_NO_LINES: INTEGER is 4
+	wxTR_LINES_AT_ROOT: INTEGER is 8
+	wxTR_AQUA_BUTTONS: INTEGER is 16
+
+	wxTR_SINGLE: INTEGER is 0
+	wxTR_MULTIPLE: INTEGER is 32
+	wxTR_EXTENDED: INTEGER is 64
+	wxTR_FULL_ROW_HIGHLIGHT: INTEGER is 8192
+
+	wxTR_EDIT_LABELS: INTEGER is 512
+	wxTR_ROW_LINES: INTEGER is 1024
+	wxTR_HIDE_ROOT: INTEGER is 2048
+	wxTR_HAS_VARIABLE_ROW_HEIGHT: INTEGER is 128
+
+	wxCBAR_DOCKED_HORIZONTALLY: INTEGER is 0
+	wxCBAR_DOCKED_VERTICALLY: INTEGER is 1
+	wxCBAR_FLOATING: INTEGER is 2
+	wxCBAR_HIDDEN: INTEGER is 3
+
+	FL_ALIGN_TOP: INTEGER is 0
+	FL_ALIGN_BOTTOM: INTEGER is 1
+	FL_ALIGN_LEFT: INTEGER is 2
+	FL_ALIGN_RIGHT: INTEGER is 3
+
+	FL_ALIGN_TOP_PANE: INTEGER is 1
+	FL_ALIGN_BOTTOM_PANE: INTEGER is 2
+	FL_ALIGN_LEFT_PANE: INTEGER is 4
+	FL_ALIGN_RIGHT_PANE: INTEGER is 8
+
+	wxALL_PANES: INTEGER is 15
+
+    CB_NO_ITEMS_HITTED: INTEGER is 0
+    CB_UPPER_ROW_HANDLE_HITTED: INTEGER is 1
+    CB_LOWER_ROW_HANDLE_HITTED: INTEGER is 2
+    CB_LEFT_BAR_HANDLE_HITTED: INTEGER is 3
+    CB_RIGHT_BAR_HANDLE_HITTED: INTEGER is 4
+    CB_BAR_CONTENT_HITTED: INTEGER is 5
+
+	wxOK : INTEGER is 4
+	wxYES : INTEGER is 2
+	wxNO : INTEGER is 8
+	wxYES_NO : INTEGER is 10
+	wxCANCEL : INTEGER is 16
+	wxNO_DEFAULT : INTEGER is 128
+	wxYES_DEFAULT : INTEGER is 0
+
+    wxFR_DOWN: INTEGER is 1
+    wxFR_WHOLEWORD: INTEGER is 2
+    wxFR_MATCHCASE: INTEGER is 4
+
+    wxFR_REPLACEDIALOG: INTEGER is 1
+    wxFR_NOUPDOWN: INTEGER is 2
+    wxFR_NOMATCHCASE: INTEGER is 4
+    wxFR_NOWHOLEWORD: INTEGER is 8
+
+	wxQUANTIZE_INCLUDE_WINDOWS_COLOURS: INTEGER is 1
+	wxQUANTIZE_RETURN_8BIT_DATA: INTEGER is 2
+	wxQUANTIZE_FILL_DESTINATION_IMAGE: INTEGER is 4
+
+	wxLANGUAGE_DEFAULT: INTEGER is 0
+	wxLANGUAGE_UNKNOWN: INTEGER is 1
+	wxLANGUAGE_ABKHAZIAN: INTEGER is 2
+	wxLANGUAGE_AFAR: INTEGER is 3
+	wxLANGUAGE_AFRIKAANS: INTEGER is 4
+	wxLANGUAGE_ALBANIAN: INTEGER is 5
+	wxLANGUAGE_AMHARIC: INTEGER is 6
+	wxLANGUAGE_ARABIC: INTEGER is 7
+	wxLANGUAGE_ARABIC_ALGERIA: INTEGER is 8
+	wxLANGUAGE_ARABIC_BAHRAIN: INTEGER is 9
+	wxLANGUAGE_ARABIC_EGYPT: INTEGER is 10
+	wxLANGUAGE_ARABIC_IRAQ: INTEGER is 11
+	wxLANGUAGE_ARABIC_JORDAN: INTEGER is 12
+	wxLANGUAGE_ARABIC_KUWAIT: INTEGER is 13
+	wxLANGUAGE_ARABIC_LEBANON: INTEGER is 14
+	wxLANGUAGE_ARABIC_LIBYA: INTEGER is 15
+	wxLANGUAGE_ARABIC_MOROCCO: INTEGER is 16
+	wxLANGUAGE_ARABIC_OMAN: INTEGER is 17
+	wxLANGUAGE_ARABIC_QATAR: INTEGER is 18
+	wxLANGUAGE_ARABIC_SAUDI_ARABIA: INTEGER is 19
+	wxLANGUAGE_ARABIC_SUDAN: INTEGER is 20
+	wxLANGUAGE_ARABIC_SYRIA: INTEGER is 21
+	wxLANGUAGE_ARABIC_TUNISIA: INTEGER is 22
+	wxLANGUAGE_ARABIC_UAE: INTEGER is 23
+	wxLANGUAGE_ARABIC_YEMEN: INTEGER is 24
+	wxLANGUAGE_ARMENIAN: INTEGER is 25
+	wxLANGUAGE_ASSAMESE: INTEGER is 26
+	wxLANGUAGE_AYMARA: INTEGER is 27
+	wxLANGUAGE_AZERI: INTEGER is 28
+	wxLANGUAGE_AZERI_CYRILLIC: INTEGER is 29
+	wxLANGUAGE_AZERI_LATIN: INTEGER is 30
+	wxLANGUAGE_BASHKIR: INTEGER is 31
+	wxLANGUAGE_BASQUE: INTEGER is 32
+	wxLANGUAGE_BELARUSIAN: INTEGER is 33
+	wxLANGUAGE_BENGALI: INTEGER is 34
+	wxLANGUAGE_BHUTANI: INTEGER is 35
+	wxLANGUAGE_BIHARI: INTEGER is 36
+	wxLANGUAGE_BISLAMA: INTEGER is 37
+	wxLANGUAGE_BRETON: INTEGER is 38
+	wxLANGUAGE_BULGARIAN: INTEGER is 39
+	wxLANGUAGE_BURMESE: INTEGER is 40
+	wxLANGUAGE_CAMBODIAN: INTEGER is 41
+	wxLANGUAGE_CATALAN: INTEGER is 42
+	wxLANGUAGE_CHINESE: INTEGER is 43
+	wxLANGUAGE_CHINESE_SIMPLIFIED: INTEGER is 44
+	wxLANGUAGE_CHINESE_TRADITIONAL: INTEGER is 45
+	wxLANGUAGE_CHINESE_HONGKONG: INTEGER is 46
+	wxLANGUAGE_CHINESE_MACAU: INTEGER is 47
+	wxLANGUAGE_CHINESE_SINGAPORE: INTEGER is 48
+	wxLANGUAGE_CHINESE_TAIWAN: INTEGER is 49
+	wxLANGUAGE_CORSICAN: INTEGER is 50
+	wxLANGUAGE_CROATIAN: INTEGER is 51
+	wxLANGUAGE_CZECH: INTEGER is 52
+	wxLANGUAGE_DANISH: INTEGER is 53
+	wxLANGUAGE_DUTCH: INTEGER is 54
+	wxLANGUAGE_DUTCH_BELGIAN: INTEGER is 55
+	wxLANGUAGE_ENGLISH: INTEGER is 56
+	wxLANGUAGE_ENGLISH_UK: INTEGER is 57
+	wxLANGUAGE_ENGLISH_US: INTEGER is 58
+	wxLANGUAGE_ENGLISH_AUSTRALIA: INTEGER is 59
+	wxLANGUAGE_ENGLISH_BELIZE: INTEGER is 60
+	wxLANGUAGE_ENGLISH_BOTSWANA: INTEGER is 61
+	wxLANGUAGE_ENGLISH_CANADA: INTEGER is 62
+	wxLANGUAGE_ENGLISH_CARIBBEAN: INTEGER is 63
+	wxLANGUAGE_ENGLISH_DENMARK: INTEGER is 64
+	wxLANGUAGE_ENGLISH_EIRE: INTEGER is 65
+	wxLANGUAGE_ENGLISH_JAMAICA: INTEGER is 66
+	wxLANGUAGE_ENGLISH_NEW_ZEALAND: INTEGER is 67
+	wxLANGUAGE_ENGLISH_PHILIPPINES: INTEGER is 68
+	wxLANGUAGE_ENGLISH_SOUTH_AFRICA: INTEGER is 69
+	wxLANGUAGE_ENGLISH_TRINIDAD: INTEGER is 70
+	wxLANGUAGE_ENGLISH_ZIMBABWE: INTEGER is 71
+	wxLANGUAGE_ESPERANTO: INTEGER is 72
+	wxLANGUAGE_ESTONIAN: INTEGER is 73
+	wxLANGUAGE_FAEROESE: INTEGER is 74
+	wxLANGUAGE_FARSI: INTEGER is 75
+	wxLANGUAGE_FIJI: INTEGER is 76
+	wxLANGUAGE_FINNISH: INTEGER is 77
+	wxLANGUAGE_FRENCH: INTEGER is 78
+	wxLANGUAGE_FRENCH_BELGIAN: INTEGER is 79
+	wxLANGUAGE_FRENCH_CANADIAN: INTEGER is 80
+	wxLANGUAGE_FRENCH_LUXEMBOURG: INTEGER is 81
+	wxLANGUAGE_FRENCH_MONACO: INTEGER is 82
+	wxLANGUAGE_FRENCH_SWISS: INTEGER is 83
+	wxLANGUAGE_FRISIAN: INTEGER is 84
+	wxLANGUAGE_GALICIAN: INTEGER is 85
+	wxLANGUAGE_GEORGIAN: INTEGER is 86
+	wxLANGUAGE_GERMAN: INTEGER is 87
+	wxLANGUAGE_GERMAN_AUSTRIAN: INTEGER is 88
+	wxLANGUAGE_GERMAN_BELGIUM: INTEGER is 89
+	wxLANGUAGE_GERMAN_LIECHTENSTEIN: INTEGER is 90
+	wxLANGUAGE_GERMAN_LUXEMBOURG: INTEGER is 91
+	wxLANGUAGE_GERMAN_SWISS: INTEGER is 92
+	wxLANGUAGE_GREEK: INTEGER is 93
+	wxLANGUAGE_GREENLANDIC: INTEGER is 94
+	wxLANGUAGE_GUARANI: INTEGER is 95
+	wxLANGUAGE_GUJARATI: INTEGER is 96
+	wxLANGUAGE_HAUSA: INTEGER is 97
+	wxLANGUAGE_HEBREW: INTEGER is 98
+	wxLANGUAGE_HINDI: INTEGER is 99
+	wxLANGUAGE_HUNGARIAN: INTEGER is 100
+	wxLANGUAGE_ICELANDIC: INTEGER is 101
+	wxLANGUAGE_INDONESIAN: INTEGER is 102
+	wxLANGUAGE_INTERLINGUA: INTEGER is 103
+	wxLANGUAGE_INTERLINGUE: INTEGER is 104
+	wxLANGUAGE_INUKTITUT: INTEGER is 105
+	wxLANGUAGE_INUPIAK: INTEGER is 106
+	wxLANGUAGE_IRISH: INTEGER is 107
+	wxLANGUAGE_ITALIAN: INTEGER is 108
+	wxLANGUAGE_ITALIAN_SWISS: INTEGER is 109
+	wxLANGUAGE_JAPANESE: INTEGER is 110
+	wxLANGUAGE_JAVANESE: INTEGER is 111
+	wxLANGUAGE_KANNADA: INTEGER is 112
+	wxLANGUAGE_KASHMIRI: INTEGER is 113
+	wxLANGUAGE_KASHMIRI_INDIA: INTEGER is 114
+	wxLANGUAGE_KAZAKH: INTEGER is 115
+	wxLANGUAGE_KERNEWEK: INTEGER is 116
+	wxLANGUAGE_KINYARWANDA: INTEGER is 117
+	wxLANGUAGE_KIRGHIZ: INTEGER is 118
+	wxLANGUAGE_KIRUNDI: INTEGER is 119
+	wxLANGUAGE_KONKANI: INTEGER is 120
+	wxLANGUAGE_KOREAN: INTEGER is 121
+	wxLANGUAGE_KURDISH: INTEGER is 122
+	wxLANGUAGE_LAOTHIAN: INTEGER is 123
+	wxLANGUAGE_LATIN: INTEGER is 124
+	wxLANGUAGE_LATVIAN: INTEGER is 125
+	wxLANGUAGE_LINGALA: INTEGER is 126
+	wxLANGUAGE_LITHUANIAN: INTEGER is 127
+	wxLANGUAGE_MACEDONIAN: INTEGER is 128
+	wxLANGUAGE_MALAGASY: INTEGER is 129
+	wxLANGUAGE_MALAY: INTEGER is 130
+	wxLANGUAGE_MALAYALAM: INTEGER is 131
+	wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM: INTEGER is 132
+	wxLANGUAGE_MALAY_MALAYSIA: INTEGER is 133
+	wxLANGUAGE_MALTESE: INTEGER is 134
+	wxLANGUAGE_MANIPURI: INTEGER is 135
+	wxLANGUAGE_MAORI: INTEGER is 136
+	wxLANGUAGE_MARATHI: INTEGER is 137
+	wxLANGUAGE_MOLDAVIAN: INTEGER is 138
+	wxLANGUAGE_MONGOLIAN: INTEGER is 139
+	wxLANGUAGE_NAURU: INTEGER is 140
+	wxLANGUAGE_NEPALI: INTEGER is 141
+	wxLANGUAGE_NEPALI_INDIA: INTEGER is 142
+	wxLANGUAGE_NORWEGIAN_BOKMAL: INTEGER is 143
+	wxLANGUAGE_NORWEGIAN_NYNORSK: INTEGER is 144
+	wxLANGUAGE_OCCITAN: INTEGER is 145
+	wxLANGUAGE_ORIYA: INTEGER is 146
+	wxLANGUAGE_OROMO: INTEGER is 147
+	wxLANGUAGE_PASHTO: INTEGER is 148
+	wxLANGUAGE_POLISH: INTEGER is 149
+	wxLANGUAGE_PORTUGUESE: INTEGER is 150
+	wxLANGUAGE_PORTUGUESE_BRAZILIAN: INTEGER is 151
+	wxLANGUAGE_PUNJABI: INTEGER is 152
+	wxLANGUAGE_QUECHUA: INTEGER is 153
+	wxLANGUAGE_RHAETO_ROMANCE: INTEGER is 154
+	wxLANGUAGE_ROMANIAN: INTEGER is 155
+	wxLANGUAGE_RUSSIAN: INTEGER is 156
+	wxLANGUAGE_RUSSIAN_UKRAINE: INTEGER is 157
+	wxLANGUAGE_SAMOAN: INTEGER is 158
+	wxLANGUAGE_SANGHO: INTEGER is 159
+	wxLANGUAGE_SANSKRIT: INTEGER is 160
+	wxLANGUAGE_SCOTS_GAELIC: INTEGER is 161
+	wxLANGUAGE_SERBIAN: INTEGER is 162
+	wxLANGUAGE_SERBIAN_CYRILLIC: INTEGER is 163
+	wxLANGUAGE_SERBIAN_LATIN: INTEGER is 164
+	wxLANGUAGE_SERBO_CROATIAN: INTEGER is 165
+	wxLANGUAGE_SESOTHO: INTEGER is 166
+	wxLANGUAGE_SETSWANA: INTEGER is 167
+	wxLANGUAGE_SHONA: INTEGER is 168
+	wxLANGUAGE_SINDHI: INTEGER is 169
+	wxLANGUAGE_SINHALESE: INTEGER is 170
+	wxLANGUAGE_SISWATI: INTEGER is 171
+	wxLANGUAGE_SLOVAK: INTEGER is 172
+	wxLANGUAGE_SLOVENIAN: INTEGER is 173
+	wxLANGUAGE_SOMALI: INTEGER is 174
+	wxLANGUAGE_SPANISH: INTEGER is 175
+	wxLANGUAGE_SPANISH_ARGENTINA: INTEGER is 176
+	wxLANGUAGE_SPANISH_BOLIVIA: INTEGER is 177
+	wxLANGUAGE_SPANISH_CHILE: INTEGER is 178
+	wxLANGUAGE_SPANISH_COLOMBIA: INTEGER is 179
+	wxLANGUAGE_SPANISH_COSTA_RICA: INTEGER is 180
+	wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC: INTEGER is 181
+	wxLANGUAGE_SPANISH_ECUADOR: INTEGER is 182
+	wxLANGUAGE_SPANISH_EL_SALVADOR: INTEGER is 183
+	wxLANGUAGE_SPANISH_GUATEMALA: INTEGER is 184
+	wxLANGUAGE_SPANISH_HONDURAS: INTEGER is 185
+	wxLANGUAGE_SPANISH_MEXICAN: INTEGER is 186
+	wxLANGUAGE_SPANISH_MODERN: INTEGER is 187
+	wxLANGUAGE_SPANISH_NICARAGUA: INTEGER is 188
+	wxLANGUAGE_SPANISH_PANAMA: INTEGER is 189
+	wxLANGUAGE_SPANISH_PARAGUAY: INTEGER is 190
+	wxLANGUAGE_SPANISH_PERU: INTEGER is 191
+	wxLANGUAGE_SPANISH_PUERTO_RICO: INTEGER is 192
+	wxLANGUAGE_SPANISH_URUGUAY: INTEGER is 193
+	wxLANGUAGE_SPANISH_US: INTEGER is 194
+	wxLANGUAGE_SPANISH_VENEZUELA: INTEGER is 195
+	wxLANGUAGE_SUNDANESE: INTEGER is 196
+	wxLANGUAGE_SWAHILI: INTEGER is 197
+	wxLANGUAGE_SWEDISH: INTEGER is 198
+	wxLANGUAGE_SWEDISH_FINLAND: INTEGER is 199
+	wxLANGUAGE_TAGALOG: INTEGER is 200
+	wxLANGUAGE_TAJIK: INTEGER is 201
+	wxLANGUAGE_TAMIL: INTEGER is 202
+	wxLANGUAGE_TATAR: INTEGER is 203
+	wxLANGUAGE_TELUGU: INTEGER is 204
+	wxLANGUAGE_THAI: INTEGER is 205
+	wxLANGUAGE_TIBETAN: INTEGER is 206
+	wxLANGUAGE_TIGRINYA: INTEGER is 207
+	wxLANGUAGE_TONGA: INTEGER is 208
+	wxLANGUAGE_TSONGA: INTEGER is 209
+	wxLANGUAGE_TURKISH: INTEGER is 210
+	wxLANGUAGE_TURKMEN: INTEGER is 211
+	wxLANGUAGE_TWI: INTEGER is 212
+	wxLANGUAGE_UIGHUR: INTEGER is 213
+	wxLANGUAGE_UKRAINIAN: INTEGER is 214
+	wxLANGUAGE_URDU: INTEGER is 215
+	wxLANGUAGE_URDU_INDIA: INTEGER is 216
+	wxLANGUAGE_URDU_PAKISTAN: INTEGER is 217
+	wxLANGUAGE_UZBEK: INTEGER is 218
+	wxLANGUAGE_UZBEK_CYRILLIC: INTEGER is 219
+	wxLANGUAGE_UZBEK_LATIN: INTEGER is 220
+	wxLANGUAGE_VIETNAMESE: INTEGER is 221
+	wxLANGUAGE_VOLAPUK: INTEGER is 222
+	wxLANGUAGE_WELSH: INTEGER is 223
+	wxLANGUAGE_WOLOF: INTEGER is 224
+	wxLANGUAGE_XHOSA: INTEGER is 225
+	wxLANGUAGE_YIDDISH: INTEGER is 226
+	wxLANGUAGE_YORUBA: INTEGER is 227
+	wxLANGUAGE_ZHUANG: INTEGER is 228
+	wxLANGUAGE_ZULU: INTEGER is 229
+	wxLANGUAGE_USER_DEFINE: INTEGER is 230
+
+    wxLOCALE_THOUSANDS_SEP: INTEGER is 0
+    wxLOCALE_DECIMAL_POINT: INTEGER is 1
+
+    wxLOCALE_LOAD_DEFAULT: INTEGER is 1
+    wxLOCALE_CONV_ENCODING: INTEGER is 2
+
+	wxEVT_GRID_CELL_LEFT_CLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_CELL_LEFT_CLICK"
+		end
+
+	wxEVT_GRID_CELL_RIGHT_CLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_CELL_RIGHT_CLICK"
+		end
+
+	wxEVT_GRID_CELL_LEFT_DCLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_CELL_LEFT_DCLICK"
+		end
+
+	wxEVT_GRID_CELL_RIGHT_DCLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_CELL_RIGHT_DCLICK"
+		end
+
+	wxEVT_GRID_LABEL_LEFT_CLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_LABEL_LEFT_CLICK"
+		end
+
+	wxEVT_GRID_LABEL_RIGHT_CLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_LABEL_RIGHT_CLICK"
+		end
+
+	wxEVT_GRID_LABEL_LEFT_DCLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_LABEL_LEFT_DCLICK"
+		end
+
+	wxEVT_GRID_LABEL_RIGHT_DCLICK: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_LABEL_RIGHT_DCLICK"
+		end
+
+	wxEVT_GRID_ROW_SIZE: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_ROW_SIZE"
+		end
+
+	wxEVT_GRID_COL_SIZE: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_COL_SIZE"
+		end
+
+	wxEVT_GRID_RANGE_SELECT: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_RANGE_SELECT"
+		end
+
+	wxEVT_GRID_CELL_CHANGE: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_CELL_CHANGE"
+		end
+
+	wxEVT_GRID_SELECT_CELL: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_SELECT_CELL"
+		end
+
+	wxEVT_GRID_EDITOR_SHOWN: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_EDITOR_SHOWN"
+		end
+
+	wxEVT_GRID_EDITOR_HIDDEN: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_EDITOR_HIDDEN"
+		end
+
+	wxEVT_GRID_EDITOR_CREATED: INTEGER is
+		external "C use %"ewxw_glue.h%""
+		alias "expEVT_GRID_EDITOR_CREATED"
+		end
+
+end
diff --git a/wxc/include/ewxw/wxc_glue.h b/wxc/include/ewxw/wxc_glue.h
deleted file mode 100644
--- a/wxc/include/ewxw/wxc_glue.h
+++ /dev/null
@@ -1,4786 +0,0 @@
-#ifndef WXC_GLUE_H
-#define WXC_GLUE_H
-
-/* $Id: wxc_glue.h,v 1.23 2005/02/25 11:14:58 dleijen Exp $ */
-
-/* Null */
-TClass(wxAcceleratorTable) Null_AcceleratorTable(  );
-TClass(wxBitmap) Null_Bitmap(  );
-TClass(wxBrush) Null_Brush(  );
-TClass(wxColour) Null_Colour(  );
-TClass(wxCursor) Null_Cursor(  );
-TClass(wxFont) Null_Font(  );
-TClass(wxIcon) Null_Icon(  );
-TClass(wxPalette) Null_Palette(  );
-TClass(wxPen) Null_Pen(  );
-
-/* Events */
-int        expEVT_ACTIVATE(  );
-int        expEVT_ACTIVATE_APP(  );
-int        expEVT_CALENDAR_DAY_CHANGED(  );
-int        expEVT_CALENDAR_DOUBLECLICKED(  );
-int        expEVT_CALENDAR_MONTH_CHANGED(  );
-int        expEVT_CALENDAR_SEL_CHANGED(  );
-int        expEVT_CALENDAR_WEEKDAY_CLICKED(  );
-int        expEVT_CALENDAR_YEAR_CHANGED(  );
-int        expEVT_CHAR(  );
-int        expEVT_CHAR_HOOK(  );
-int        expEVT_CLOSE_WINDOW(  );
-int        expEVT_COMMAND_BUTTON_CLICKED(  );
-int        expEVT_COMMAND_CHECKBOX_CLICKED(  );
-int        expEVT_COMMAND_CHECKLISTBOX_TOGGLED(  );
-int        expEVT_COMMAND_CHOICE_SELECTED(  );
-int        expEVT_COMMAND_COMBOBOX_SELECTED(  );
-int        expEVT_COMMAND_ENTER(  );
-int        expEVT_COMMAND_FIND(  );
-int        expEVT_COMMAND_FIND_CLOSE(  );
-int        expEVT_COMMAND_FIND_NEXT(  );
-int        expEVT_COMMAND_FIND_REPLACE(  );
-int        expEVT_COMMAND_FIND_REPLACE_ALL(  );
-int        expEVT_COMMAND_KILL_FOCUS(  );
-int        expEVT_COMMAND_LEFT_CLICK(  );
-int        expEVT_COMMAND_LEFT_DCLICK(  );
-int        expEVT_COMMAND_LISTBOX_DOUBLECLICKED(  );
-int        expEVT_COMMAND_LISTBOX_SELECTED(  );
-int        expEVT_COMMAND_LIST_BEGIN_DRAG(  );
-int        expEVT_COMMAND_LIST_BEGIN_LABEL_EDIT(  );
-int        expEVT_COMMAND_LIST_BEGIN_RDRAG(  );
-int        expEVT_COMMAND_LIST_COL_CLICK(  );
-int        expEVT_COMMAND_LIST_DELETE_ALL_ITEMS(  );
-int        expEVT_COMMAND_LIST_DELETE_ITEM(  );
-int        expEVT_COMMAND_LIST_END_LABEL_EDIT(  );
-int        expEVT_COMMAND_LIST_INSERT_ITEM(  );
-int        expEVT_COMMAND_LIST_ITEM_ACTIVATED(  );
-int        expEVT_COMMAND_LIST_ITEM_DESELECTED(  );
-int        expEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK(  );
-int        expEVT_COMMAND_LIST_ITEM_RIGHT_CLICK(  );
-int        expEVT_COMMAND_LIST_ITEM_SELECTED(  );
-int        expEVT_COMMAND_LIST_ITEM_FOCUSED(  );
-int        expEVT_COMMAND_LIST_KEY_DOWN(  );
-int        expEVT_COMMAND_MENU_SELECTED(  );
-int        expEVT_COMMAND_NOTEBOOK_PAGE_CHANGED(  );
-int        expEVT_COMMAND_NOTEBOOK_PAGE_CHANGING(  );
-int        expEVT_COMMAND_RADIOBOX_SELECTED(  );
-int        expEVT_COMMAND_RADIOBUTTON_SELECTED(  );
-int        expEVT_COMMAND_RIGHT_CLICK(  );
-int        expEVT_COMMAND_RIGHT_DCLICK(  );
-int        expEVT_COMMAND_SCROLLBAR_UPDATED(  );
-int        expEVT_COMMAND_SET_FOCUS(  );
-int        expEVT_COMMAND_SLIDER_UPDATED(  );
-int        expEVT_COMMAND_SPINCTRL_UPDATED(  );
-int        expEVT_COMMAND_SPLITTER_DOUBLECLICKED(  );
-int        expEVT_COMMAND_SPLITTER_SASH_POS_CHANGED(  );
-int        expEVT_COMMAND_SPLITTER_SASH_POS_CHANGING(  );
-int        expEVT_COMMAND_SPLITTER_UNSPLIT(  );
-int        expEVT_COMMAND_TAB_SEL_CHANGED(  );
-int        expEVT_COMMAND_TAB_SEL_CHANGING(  );
-int        expEVT_COMMAND_TEXT_ENTER(  );
-int        expEVT_COMMAND_TEXT_UPDATED(  );
-int        expEVT_COMMAND_TOGGLEBUTTON_CLICKED(  );
-int        expEVT_COMMAND_TOOL_CLICKED(  );
-int        expEVT_COMMAND_TOOL_ENTER(  );
-int        expEVT_COMMAND_TOOL_RCLICKED(  );
-int        expEVT_COMMAND_TREE_BEGIN_DRAG(  );
-int        expEVT_COMMAND_TREE_BEGIN_LABEL_EDIT(  );
-int        expEVT_COMMAND_TREE_BEGIN_RDRAG(  );
-int        expEVT_COMMAND_TREE_DELETE_ITEM(  );
-int        expEVT_COMMAND_TREE_END_DRAG(  );
-int        expEVT_COMMAND_TREE_END_LABEL_EDIT(  );
-int        expEVT_COMMAND_TREE_GET_INFO(  );
-int        expEVT_COMMAND_TREE_ITEM_ACTIVATED(  );
-int        expEVT_COMMAND_TREE_ITEM_COLLAPSED(  );
-int        expEVT_COMMAND_TREE_ITEM_COLLAPSING(  );
-int        expEVT_COMMAND_TREE_ITEM_EXPANDED(  );
-int        expEVT_COMMAND_TREE_ITEM_EXPANDING(  );
-int        expEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK(  );
-int        expEVT_COMMAND_TREE_ITEM_RIGHT_CLICK(  );
-int        expEVT_COMMAND_TREE_KEY_DOWN(  );
-int        expEVT_COMMAND_TREE_SEL_CHANGED(  );
-int        expEVT_COMMAND_TREE_SEL_CHANGING(  );
-int        expEVT_COMMAND_TREE_SET_INFO(  );
-int        expEVT_COMMAND_VLBOX_SELECTED(  );
-int        expEVT_COMPARE_ITEM(  );
-int        expEVT_CONTEXT_MENU(  );
-int        expEVT_CREATE(  );
-int        expEVT_DESTROY(  );
-int        expEVT_DETAILED_HELP(  );
-int        expEVT_DIALUP_CONNECTED(  );
-int        expEVT_DIALUP_DISCONNECTED(  );
-int        expEVT_DRAW_ITEM(  );
-int        expEVT_DROP_FILES(  );
-int        expEVT_DYNAMIC_SASH_SPLIT(  );
-int        expEVT_DYNAMIC_SASH_UNIFY(  );
-int        expEVT_END_PROCESS(  );
-int        expEVT_END_SESSION(  );
-int        expEVT_ENTER_WINDOW(  );
-int        expEVT_ERASE_BACKGROUND(  );
-int        expEVT_GRID_CELL_CHANGE(  );
-int        expEVT_GRID_CELL_LEFT_CLICK(  );
-int        expEVT_GRID_CELL_LEFT_DCLICK(  );
-int        expEVT_GRID_CELL_RIGHT_CLICK(  );
-int        expEVT_GRID_CELL_RIGHT_DCLICK(  );
-int        expEVT_GRID_COL_SIZE(  );
-int        expEVT_GRID_EDITOR_CREATED(  );
-int        expEVT_GRID_EDITOR_HIDDEN(  );
-int        expEVT_GRID_EDITOR_SHOWN(  );
-int        expEVT_GRID_LABEL_LEFT_CLICK(  );
-int        expEVT_GRID_LABEL_LEFT_DCLICK(  );
-int        expEVT_GRID_LABEL_RIGHT_CLICK(  );
-int        expEVT_GRID_LABEL_RIGHT_DCLICK(  );
-int        expEVT_GRID_RANGE_SELECT(  );
-int        expEVT_GRID_ROW_SIZE(  );
-int        expEVT_GRID_SELECT_CELL(  );
-int        expEVT_HELP(  );
-int        expEVT_ICONIZE(  );
-int        expEVT_IDLE(  );
-int        expEVT_INIT_DIALOG(  );
-int        expEVT_JOY_BUTTON_DOWN(  );
-int        expEVT_JOY_BUTTON_UP(  );
-int        expEVT_JOY_MOVE(  );
-int        expEVT_JOY_ZMOVE(  );
-int        expEVT_KEY_DOWN(  );
-int        expEVT_KEY_UP(  );
-int        expEVT_KILL_FOCUS(  );
-int        expEVT_LEAVE_WINDOW(  );
-int        expEVT_LEFT_DCLICK(  );
-int        expEVT_LEFT_DOWN(  );
-int        expEVT_LEFT_UP(  );
-int        expEVT_MAXIMIZE(  );
-int        expEVT_MEASURE_ITEM(  );
-int        expEVT_MENU_CHAR(  );
-int        expEVT_MENU_HIGHLIGHT(  );
-int        expEVT_MENU_INIT(  );
-int        expEVT_MIDDLE_DCLICK(  );
-int        expEVT_MIDDLE_DOWN(  );
-int        expEVT_MIDDLE_UP(  );
-int        expEVT_MOTION(  );
-int        expEVT_MOUSE_CAPTURE_CHANGED(  );
-int        expEVT_MOVE(  );
-int        expEVT_NAVIGATION_KEY(  );
-int        expEVT_NC_ENTER_WINDOW(  );
-int        expEVT_NC_LEAVE_WINDOW(  );
-int        expEVT_NC_LEFT_DCLICK(  );
-int        expEVT_NC_LEFT_DOWN(  );
-int        expEVT_NC_LEFT_UP(  );
-int        expEVT_NC_MIDDLE_DCLICK(  );
-int        expEVT_NC_MIDDLE_DOWN(  );
-int        expEVT_NC_MIDDLE_UP(  );
-int        expEVT_NC_MOTION(  );
-int        expEVT_NC_PAINT(  );
-int        expEVT_NC_RIGHT_DCLICK(  );
-int        expEVT_NC_RIGHT_DOWN(  );
-int        expEVT_NC_RIGHT_UP(  );
-int        expEVT_PAINT(  );
-int        expEVT_PAINT_ICON(  );
-int        expEVT_PALETTE_CHANGED(  );
-int        expEVT_PLOT_AREA_CREATE(  );
-int        expEVT_PLOT_AREA_SEL_CHANGED(  );
-int        expEVT_PLOT_AREA_SEL_CHANGING(  );
-int        expEVT_PLOT_AREA_SEL_CREATED(  );
-int        expEVT_PLOT_AREA_SEL_CREATING(  );
-int        expEVT_PLOT_BEGIN_TITLE_EDIT(  );
-int        expEVT_PLOT_BEGIN_X_LABEL_EDIT(  );
-int        expEVT_PLOT_BEGIN_Y_LABEL_EDIT(  );
-int        expEVT_PLOT_CLICKED(  );
-int        expEVT_PLOT_DOUBLECLICKED(  );
-int        expEVT_PLOT_END_TITLE_EDIT(  );
-int        expEVT_PLOT_END_X_LABEL_EDIT(  );
-int        expEVT_PLOT_END_Y_LABEL_EDIT(  );
-int        expEVT_PLOT_SEL_CHANGED(  );
-int        expEVT_PLOT_SEL_CHANGING(  );
-int        expEVT_PLOT_VALUE_SEL_CHANGED(  );
-int        expEVT_PLOT_VALUE_SEL_CHANGING(  );
-int        expEVT_PLOT_VALUE_SEL_CREATED(  );
-int        expEVT_PLOT_VALUE_SEL_CREATING(  );
-int        expEVT_PLOT_ZOOM_IN(  );
-int        expEVT_PLOT_ZOOM_OUT(  );
-int        expEVT_POPUP_MENU_INIT(  );
-int        expEVT_POWER(  );
-int        expEVT_POWER_SUSPENDING(  );
-int        expEVT_POWER_SUSPENDED(  );
-int        expEVT_POWER_SUSPEND_CANCEL(  );
-int        expEVT_POWER_RESUME(  );
-int        expEVT_QUERY_END_SESSION(  );
-int        expEVT_QUERY_NEW_PALETTE(  );
-int        expEVT_RIGHT_DCLICK(  );
-int        expEVT_RIGHT_DOWN(  );
-int        expEVT_RIGHT_UP(  );
-int        expEVT_SCROLLWIN_BOTTOM(  );
-int        expEVT_SCROLLWIN_LINEDOWN(  );
-int        expEVT_SCROLLWIN_LINEUP(  );
-int        expEVT_SCROLLWIN_PAGEDOWN(  );
-int        expEVT_SCROLLWIN_PAGEUP(  );
-int        expEVT_SCROLLWIN_THUMBRELEASE(  );
-int        expEVT_SCROLLWIN_THUMBTRACK(  );
-int        expEVT_SCROLLWIN_TOP(  );
-int        expEVT_SCROLL_BOTTOM(  );
-int        expEVT_SCROLL_LINEDOWN(  );
-int        expEVT_SCROLL_LINEUP(  );
-int        expEVT_SCROLL_PAGEDOWN(  );
-int        expEVT_SCROLL_PAGEUP(  );
-int        expEVT_SCROLL_THUMBRELEASE(  );
-int        expEVT_SCROLL_THUMBTRACK(  );
-int        expEVT_SCROLL_TOP(  );
-int        expEVT_SETTING_CHANGED(  );
-int        expEVT_SET_CURSOR(  );
-int        expEVT_SET_FOCUS(  );
-int        expEVT_SHOW(  );
-int        expEVT_SIZE(  );
-int        expEVT_SOCKET(  );
-int        expEVT_SYS_COLOUR_CHANGED(  );
-int        expEVT_TASKBAR_MOVE(  );
-int        expEVT_TASKBAR_LEFT_DOWN(  );
-int        expEVT_TASKBAR_LEFT_UP(  );
-int        expEVT_TASKBAR_RIGHT_DOWN(  );
-int        expEVT_TASKBAR_RIGHT_UP(  );
-int        expEVT_TASKBAR_LEFT_DCLICK(  );
-int        expEVT_TASKBAR_RIGHT_DCLICK(  );
-int        expEVT_TIMER(  );
-int        expEVT_UPDATE_UI(  );
-int        expEVT_USER_FIRST(  );
-int        expEVT_WIZARD_CANCEL(  );
-int        expEVT_WIZARD_PAGE_CHANGED(  );
-int        expEVT_WIZARD_PAGE_CHANGING(  );
-
-
-/* Misc. */
-int        ELJSysErrorCode(  );
-void*      ELJSysErrorMsg( int nErrCode );
-void       LogErrorMsg( TStringVoid _msg );
-void       LogFatalErrorMsg( TStringVoid _msg );
-void       LogMessageMsg( TStringVoid _msg );
-void       LogWarningMsg( TStringVoid _msg );
-TBool      Quantize( TClass(wxImage) src, TClass(wxImage) dest, int desiredNoColours, void* eightBitData, int flags );
-TBool      QuantizePalette( TClass(wxImage) src, TClass(wxImage) dest, void* pPalette, int desiredNoColours, void* eightBitData, int flags );
-void       wxCFree( void* _ptr );
-TClass(ELJLocale) wxGetELJLocale(  );
-void*      wxGetELJTranslation( TStringVoid sz );
-void       wxMutexGui_Enter(  );
-void       wxMutexGui_Leave(  );
-
-/* ELJApp */
-TClassDefExtend(ELJApp,wxApp)
-void       ELJApp_Bell(  );
-TClass(ELJLog) ELJApp_CreateLogTarget(  );
-void       ELJApp_Dispatch(  );
-void       ELJApp_DisplaySize( TSizeOutVoid(_w,_h) );
-void       ELJApp_EnableTooltips( TBool _enable );
-void       ELJApp_EnableTopLevelWindows( int _enb );
-int        ELJApp_ExecuteProcess( TStringVoid _cmd, int _snc, TClass(wxProcess) _prc );
-void       ELJApp_Exit(  );
-void       ELJApp_ExitMainLoop(  );
-void*      ELJApp_FindWindowById( int _id, TClass(wxWindow) _prt );
-TClass(wxWindow) ELJApp_FindWindowByLabel( TStringVoid _lbl, TClass(wxWindow) _prt );
-TClass(wxWindow) ELJApp_FindWindowByName( TStringVoid _lbl, TClass(wxWindow) _prt );
-TClass(wxApp) ELJApp_GetApp(  );
-TStringLen ELJApp_GetAppName( TStringOutVoid _buf );
-TStringLen ELJApp_GetClassName( TStringOutVoid _buf );
-int        ELJApp_GetExitOnFrameDelete(  );
-TStringLen ELJApp_GetOsDescription( TStringOutVoid _buf );
-int        ELJApp_GetOsVersion( void* _maj, void* _min );
-TClass(wxWindow) ELJApp_GetTopWindow(  );
-int        ELJApp_GetUseBestVisual(  );
-TStringLen ELJApp_GetUserHome( void* _usr, TStringOutVoid _buf );
-TStringLen ELJApp_GetUserId( TStringOutVoid _buf );
-TStringLen ELJApp_GetUserName( TStringOutVoid _buf );
-TStringLen ELJApp_GetVendorName( TStringOutVoid _buf );
-/* int        ELJApp_GetWantDebugOutput(  ); */
-void       ELJApp_InitAllImageHandlers(  );
-int        ELJApp_Initialized(  );
-int        ELJApp_MainLoop(  );
-void       ELJApp_MousePosition( TPointOutVoid(_x,_y) );
-int        ELJApp_Pending(  );
-int        ELJApp_SafeYield( TClass(wxWindow) _win );
-/* int        ELJApp_SendIdleEvents(  ); */
-/* int        ELJApp_SendIdleEventsToWindow( TClass(wxWindow) win ); */
-void       ELJApp_SetAppName( TString name );
-void       ELJApp_SetClassName( TString name );
-void       ELJApp_SetExitOnFrameDelete( int flag );
-void       ELJApp_SetPrintMode( int mode );
-void       ELJApp_SetTooltipDelay( int _ms );
-void       ELJApp_SetTopWindow( TClass(wxWindow) _wnd );
-void       ELJApp_SetUseBestVisual( int flag );
-void       ELJApp_SetVendorName( TString name );
-void       ELJApp_Sleep( int _scs );
-void       ELJApp_USleep( int _mscs );
-int        ELJApp_Yield(  );
-TBoolInt   ELJApp_IsTerminating(  );
-
-
-/* ELJArtProv */
-TClassDefExtend(ELJArtProv,wxArtProvider)
-TClass(ELJArtProv) ELJArtProv_Create( void* _obj, void* _clb );
-void       ELJArtProv_Release( TSelf(ELJArtProv) _obj );
-
-/* ELJClient */
-TClassDefExtend(ELJClient,wxClient)
-TClass(ELJClient) ELJClient_Create( void* _eobj, void* _cnct );
-void       ELJClient_Delete( TSelf(ELJClient) _obj );
-void       ELJClient_MakeConnection( TSelf(ELJClient) _obj, void* host, TClass(wxServer) server, void* topic );
-
-/* ELJCommand */
-TClassDefExtend(ELJCommand,wxCommand)
-TBool      ELJCommand_CanUndo( TSelf(ELJCommand) _obj );
-TClass(ELJCommand) ELJCommand_Create( int _und, void* _nme, void* _obj, void* _clb );
-void       ELJCommand_Delete( TSelf(ELJCommand) _obj );
-TStringLen ELJCommand_GetName( TSelf(ELJCommand) _obj, TStringOutVoid _buf );
-
-/* ELJConnection */
-TClassDefExtend(ELJConnection,wxConnection)
-int        ELJConnection_Advise( TSelf(ELJConnection) _obj, void* item, void* data, int size, int format );
-void       ELJConnection_Compress( TSelf(ELJConnection) _obj, int on );
-TClass(ELJConnection) ELJConnection_Create( void* _obj, void* buffer, int size );
-TClass(ELJConnection) ELJConnection_CreateDefault( TSelf(ELJConnection) _obj );
-void       ELJConnection_Delete( TSelf(ELJConnection) _obj );
-int        ELJConnection_Disconnect( TSelf(ELJConnection) _obj );
-int        ELJConnection_Execute( TSelf(ELJConnection) _obj, void* data, int size, int format );
-int        ELJConnection_Poke( TSelf(ELJConnection) _obj, void* item, void* data, int size, int format );
-void*      ELJConnection_Request( TSelf(ELJConnection) _obj, void* item, TClass(wxSize) size, int format );
-void       ELJConnection_SetOnAdvise( TSelf(ELJConnection) _obj, void* _fnc );
-void       ELJConnection_SetOnDisconnect( TSelf(ELJConnection) _obj, void* _fnc );
-void       ELJConnection_SetOnExecute( TSelf(ELJConnection) _obj, void* _fnc );
-void       ELJConnection_SetOnPoke( TSelf(ELJConnection) _obj, void* _fnc );
-void       ELJConnection_SetOnRequest( TSelf(ELJConnection) _obj, void* _fnc );
-void       ELJConnection_SetOnStartAdvise( TSelf(ELJConnection) _obj, void* _fnc );
-void       ELJConnection_SetOnStopAdvise( TSelf(ELJConnection) _obj, void* _fnc );
-int        ELJConnection_StartAdvise( TSelf(ELJConnection) _obj, void* item );
-int        ELJConnection_StopAdvise( TSelf(ELJConnection) _obj, void* item );
-
-/* ELJDragDataObject */
-TClassDef(ELJDragDataObject)
-TClass(ELJDragDataObject) ELJDragDataObject_Create( void* _obj, void* _fmt, void* _func1, void* _func2, void* _func3 );
-void       ELJDragDataObject_Delete( TSelf(ELJDragDataObject) _obj );
-
-/* ELJDropTarget */
-TClassDefExtend(ELJDropTarget,wxDropTarget)
-TClass(ELJDropTarget) ELJDropTarget_Create( void* _obj );
-void       ELJDropTarget_Delete( TSelf(ELJDropTarget) _obj );
-void       ELJDropTarget_SetOnData( TSelf(ELJDropTarget) _obj, void* _func );
-void       ELJDropTarget_SetOnDragOver( TSelf(ELJDropTarget) _obj, void* _func );
-void       ELJDropTarget_SetOnDrop( TSelf(ELJDropTarget) _obj, void* _func );
-void       ELJDropTarget_SetOnEnter( TSelf(ELJDropTarget) _obj, void* _func );
-void       ELJDropTarget_SetOnLeave( TSelf(ELJDropTarget) _obj, void* _func );
-
-/* ELJFileDropTarget */
-TClassDefExtend(ELJFileDropTarget,wxFileDropTarget)
-TClass(ELJFileDropTarget) ELJFileDropTarget_Create( void* _obj, void* _func );
-void       ELJFileDropTarget_Delete( TSelf(ELJFileDropTarget) _obj );
-void       ELJFileDropTarget_SetOnData( TSelf(ELJFileDropTarget) _obj, void* _func );
-void       ELJFileDropTarget_SetOnDragOver( TSelf(ELJFileDropTarget) _obj, void* _func );
-void       ELJFileDropTarget_SetOnDrop( TSelf(ELJFileDropTarget) _obj, void* _func );
-void       ELJFileDropTarget_SetOnEnter( TSelf(ELJFileDropTarget) _obj, void* _func );
-void       ELJFileDropTarget_SetOnLeave( TSelf(ELJFileDropTarget) _obj, void* _func );
-
-/* ELJGridTable */
-TClassDefExtend(ELJGridTable,wxGridTableBase)
-TClass(ELJGridTable) ELJGridTable_Create( void* _obj, void* _EifGetNumberRows, void* _EifGetNumberCols, void* _EifGetValue, void* _EifSetValue, void* _EifIsEmptyCell, void* _EifClear, void* _EifInsertRows, void* _EifAppendRows, void* _EifDeleteRows, void* _EifInsertCols, void* _EifAppendCols, void* _EifDeleteCols, void* _EifSetRowLabelValue, void* _EifSetColLabelValue, void* _EifGetRowLabelValue, void* _EifGetColLabelValue );
-void       ELJGridTable_Delete( TSelf(ELJGridTable) _obj );
-TClass(wxView) ELJGridTable_GetView( TSelf(ELJGridTable) _obj );
-void*      ELJGridTable_SendTableMessage( TSelf(ELJGridTable) _obj, int id, int val1, int val2 );
-
-/* ELJLocale */
-TClassDefExtend(ELJLocale,wxLocale)
-
-/* ELJLog */
-TClassDefExtend(ELJLog,wxLog)
-void       ELJLog_AddTraceMask( TSelf(ELJLog) _obj, TStringVoid str );
-TClass(ELJLog) ELJLog_Create( void* _obj, void* _fnc );
-void       ELJLog_Delete( TSelf(ELJLog) _obj );
-void       ELJLog_DontCreateOnDemand( TSelf(ELJLog) _obj );
-int        ELJLog_EnableLogging( TSelf(ELJLog) _obj, TBool doIt );
-void       ELJLog_Flush( TSelf(ELJLog) _obj );
-void       ELJLog_FlushActive( TSelf(ELJLog) _obj );
-void*      ELJLog_GetActiveTarget(  );
-void*      ELJLog_GetTimestamp( TSelf(ELJLog) _obj );
-int        ELJLog_GetTraceMask( TSelf(ELJLog) _obj );
-int        ELJLog_GetVerbose( TSelf(ELJLog) _obj );
-TBool      ELJLog_HasPendingMessages( TSelf(ELJLog) _obj );
-TBool      ELJLog_IsAllowedTraceMask( TSelf(ELJLog) _obj, TClass(wxMask) mask );
-TBool      ELJLog_IsEnabled( TSelf(ELJLog) _obj );
-void       ELJLog_OnLog( TSelf(ELJLog) _obj, int level, void* szString, int t );
-void       ELJLog_RemoveTraceMask( TSelf(ELJLog) _obj, TStringVoid str );
-void       ELJLog_Resume( TSelf(ELJLog) _obj );
-void*      ELJLog_SetActiveTarget( TSelf(ELJLog) pLogger );
-void       ELJLog_SetTimestamp( TSelf(ELJLog) _obj, void* ts );
-void       ELJLog_SetTraceMask( TSelf(ELJLog) _obj, int ulMask );
-void       ELJLog_SetVerbose( TSelf(ELJLog) _obj, int bVerbose );
-void       ELJLog_Suspend( TSelf(ELJLog) _obj );
-
-/* ELJMessageParameters */
-TClassDef(ELJMessageParameters)
-TClass(ELJMessageParameters) wxMessageParameters_Create( TStringVoid _file, TStringVoid _type, void* _object, void* _func );
-void       wxMessageParameters_Delete( TSelf(ELJMessageParameters) _obj );
-
-/* ELJPlotCurve */
-TClassDefExtend(ELJPlotCurve,wxPlotCurve)
-TClass(ELJPlotCurve) ELJPlotCurve_Create( void* _obj, void* _str, void* _end, void* _y, int offsetY, double startY, double endY );
-void       ELJPlotCurve_Delete( TSelf(ELJPlotCurve) _obj );
-double     ELJPlotCurve_GetEndY( TSelf(ELJPlotCurve) _obj );
-int        ELJPlotCurve_GetOffsetY( TSelf(ELJPlotCurve) _obj );
-double     ELJPlotCurve_GetStartY( TSelf(ELJPlotCurve) _obj );
-void       ELJPlotCurve_SetEndY( TSelf(ELJPlotCurve) _obj, double endY );
-void       ELJPlotCurve_SetOffsetY( TSelf(ELJPlotCurve) _obj, int offsetY );
-void       ELJPlotCurve_SetPenNormal( TSelf(ELJPlotCurve) _obj, TClass(wxPen) pen );
-void       ELJPlotCurve_SetPenSelected( TSelf(ELJPlotCurve) _obj, TClass(wxPen) pen );
-void       ELJPlotCurve_SetStartY( TSelf(ELJPlotCurve) _obj, double startY );
-
-/* ELJPreviewControlBar */
-TClassDefExtend(ELJPreviewControlBar,wxPreviewControlBar)
-TClass(ELJPreviewControlBar) ELJPreviewControlBar_Create( void* preview, int buttons, TClass(wxWindow) parent, void* title, TRect(x,y,w,h), int style );
-
-/* ELJPreviewFrame */
-TClassDefExtend(ELJPreviewFrame,wxPreviewFrame)
-TClass(ELJPreviewFrame) ELJPreviewFrame_Create( void* _obj, void* _init, void* _create_canvas, void* _create_toolbar, void* preview, TClass(wxWindow) parent, void* title, TRect(x,y,w,h), int style );
-void*      ELJPreviewFrame_GetControlBar( TSelf(ELJPreviewFrame) _obj );
-TClass(wxPreviewCanvas) ELJPreviewFrame_GetPreviewCanvas( TSelf(ELJPreviewFrame) _obj );
-TClass(wxPrintPreview) ELJPreviewFrame_GetPrintPreview( TSelf(ELJPreviewFrame) _obj );
-void       ELJPreviewFrame_Initialize( TSelf(ELJPreviewFrame) _obj );
-void       ELJPreviewFrame_SetControlBar( TSelf(ELJPreviewFrame) _obj, void* obj );
-void       ELJPreviewFrame_SetPreviewCanvas( TSelf(ELJPreviewFrame) _obj, TClass(wxPreviewCanvas) obj );
-void       ELJPreviewFrame_SetPrintPreview( TSelf(ELJPreviewFrame) _obj, TClass(wxPrintPreview) obj );
-
-/* ELJPrintout */
-/*
-TClassDefExtend(ELJPrintout,wxPrintout)
-TClass(ELJPrintout) ELJPrintout_Create( void* title, void* _obj, void* _DoOnBeginDocument, void* _DoOnEndDocument, void* _DoOnBeginPrinting, void* _DoOnEndPrinting, void* _DoOnPreparePrinting, void* _DoOnPrintPage, void* _DoOnHasPage, void* _DoOnPageInfo );
-void       ELJPrintout_Delete( TSelf(ELJPrintout) _obj );
-TClass(wxDC) ELJPrintout_GetDC( TSelf(ELJPrintout) _obj );
-void       ELJPrintout_GetPPIPrinter( TSelf(ELJPrintout) _obj, TPointOutVoid(_x,_y) );
-void       ELJPrintout_GetPPIScreen( TSelf(ELJPrintout) _obj, TPointOutVoid(_x,_y) );
-void       ELJPrintout_GetPageSizeMM( TSelf(ELJPrintout) _obj, TSizeOutVoid(_w,_h) );
-void       ELJPrintout_GetPageSizePixels( TSelf(ELJPrintout) _obj, TSizeOutVoid(_w,_h) );
-TStringLen ELJPrintout_GetTitle( TSelf(ELJPrintout) _obj, TStringOutVoid _buf );
-TBool      ELJPrintout_IsPreview( TSelf(ELJPrintout) _obj );
-void       ELJPrintout_SetDC( TSelf(ELJPrintout) _obj, TClass(wxDC) dc );
-void       ELJPrintout_SetIsPreview( TSelf(ELJPrintout) _obj, int p );
-void       ELJPrintout_SetPPIPrinter( TSelf(ELJPrintout) _obj, TPoint(x,y) );
-void       ELJPrintout_SetPPIScreen( TSelf(ELJPrintout) _obj, TPoint(x,y) );
-void       ELJPrintout_SetPageSizeMM( TSelf(ELJPrintout) _obj, TSize(w,h) );
-void       ELJPrintout_SetPageSizePixels( TSelf(ELJPrintout) _obj, TSize(w,h) );
-*/
-
-/* ELJServer */
-TClassDefExtend(ELJServer,wxServer)
-TClass(ELJServer) ELJServer_Create( void* _eobj, void* _cnct );
-void       ELJServer_Delete( TSelf(ELJServer) _obj );
-int        ELJServer_Initialize( TSelf(ELJServer) _obj, TStringVoid name );
-
-/* ELJTextDropTarget */
-TClassDefExtend(ELJTextDropTarget,wxTextDropTarget)
-TClass(ELJTextDropTarget) ELJTextDropTarget_Create( void* _obj, void* _func );
-void       ELJTextDropTarget_Delete( TSelf(ELJTextDropTarget) _obj );
-void       ELJTextDropTarget_SetOnData( TSelf(ELJTextDropTarget) _obj, void* _func );
-void       ELJTextDropTarget_SetOnDragOver( TSelf(ELJTextDropTarget) _obj, void* _func );
-void       ELJTextDropTarget_SetOnDrop( TSelf(ELJTextDropTarget) _obj, void* _func );
-void       ELJTextDropTarget_SetOnEnter( TSelf(ELJTextDropTarget) _obj, void* _func );
-void       ELJTextDropTarget_SetOnLeave( TSelf(ELJTextDropTarget) _obj, void* _func );
-
-/* ELJTextValidator */
-TClassDefExtend(ELJTextValidator,wxTextValidator)
-TClass(ELJTextValidator) ELJTextValidator_Create( void* _obj, void* _fnc, TStringVoid _txt, int _stl );
-
-/* cbAntiflickerPlugin */
-TClassDefExtend(cbAntiflickerPlugin,cbPluginBase)
-TClass(cbAntiflickerPlugin) cbAntiflickerPlugin_Create( void* pPanel, int paneMask );
-TClass(cbAntiflickerPlugin) cbAntiflickerPlugin_CreateDefault(  );
-void       cbAntiflickerPlugin_Delete( TSelf(cbAntiflickerPlugin) _obj );
-
-/* cbBarDragPlugin */
-TClassDefExtend(cbBarDragPlugin,cbPluginBase)
-TClass(cbBarDragPlugin) cbBarDragPlugin_Create( void* pPanel, int paneMask );
-TClass(cbBarDragPlugin) cbBarDragPlugin_CreateDefault(  );
-void       cbBarDragPlugin_Delete( TSelf(cbBarDragPlugin) _obj );
-
-/* cbBarHintsPlugin */
-TClassDefExtend(cbBarHintsPlugin,cbPluginBase)
-TClass(cbBarHintsPlugin) cbBarHintsPlugin_Create( void* pPanel, int paneMask );
-TClass(cbBarHintsPlugin) cbBarHintsPlugin_CreateDefault(  );
-void       cbBarHintsPlugin_Delete( TSelf(cbBarHintsPlugin) _obj );
-void       cbBarHintsPlugin_SetGrooveCount( TSelf(cbBarHintsPlugin) _obj, int nGrooves );
-
-/* cbBarInfo */
-TClassDefExtend(cbBarInfo,wxObject)
-TClass(cbBarInfo) cbBarInfo_Create(  );
-void       cbBarInfo_Delete( TSelf(cbBarInfo) _obj );
-TBool      cbBarInfo_IsExpanded( TSelf(cbBarInfo) _obj );
-TBool      cbBarInfo_IsFixed( TSelf(cbBarInfo) _obj );
-
-/* cbBarSpy */
-TClassDefExtend(cbBarSpy,wxEvtHandler)
-TClass(cbBarSpy) cbBarSpy_Create( void* pPanel );
-TClass(cbBarSpy) cbBarSpy_CreateDefault(  );
-void       cbBarSpy_Delete( TSelf(cbBarSpy) _obj );
-int        cbBarSpy_ProcessEvent( TSelf(cbBarSpy) _obj, TClass(wxEvent) event );
-void       cbBarSpy_SetBarWindow( TSelf(cbBarSpy) _obj, void* pWnd );
-
-/* cbCloseBox */
-TClassDefExtend(cbCloseBox,cbMiniButton)
-TClass(cbCloseBox) cbCloseBox_Create(  );
-
-/* cbCollapseBox */
-TClassDefExtend(cbCollapseBox,cbMiniButton)
-TClass(cbCollapseBox) cbCollapseBox_Create(  );
-
-/* cbCommonPaneProperties */
-TClassDefExtend(cbCommonPaneProperties,wxObject)
-void       cbCommonPaneProperties_Assign( TSelf(cbCommonPaneProperties) _obj, void* _other );
-int        cbCommonPaneProperties_BarCollapseIconsOn( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_BarDragHintsOn( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_BarFloatingOn( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_ColProportionsOn( TSelf(cbCommonPaneProperties) _obj );
-TClass(cbCommonPaneProperties) cbCommonPaneProperties_CreateDefault(  );
-void       cbCommonPaneProperties_Delete( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_ExactDockPredictionOn( TSelf(cbCommonPaneProperties) _obj );
-void       cbCommonPaneProperties_MinCBarDim( TSelf(cbCommonPaneProperties) _obj, TSizeOutVoid(_w,_h) );
-int        cbCommonPaneProperties_NonDestructFrictionOn( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_OutOfPaneDragOn( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_RealTimeUpdatesOn( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_ResizeHandleSize( TSelf(cbCommonPaneProperties) _obj );
-int        cbCommonPaneProperties_RowProportionsOn( TSelf(cbCommonPaneProperties) _obj );
-void       cbCommonPaneProperties_SetBarCollapseIconsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetBarDragHintsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetBarFloatingOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetColProportionsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetExactDockPredictionOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetMinCBarDim( TSelf(cbCommonPaneProperties) _obj, TSize(_w,_h) );
-void       cbCommonPaneProperties_SetNonDestructFrictionOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetOutOfPaneDragOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetRealTimeUpdatesOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetResizeHandleSize( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetRowProportionsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-void       cbCommonPaneProperties_SetShow3DPaneBorderOn( TSelf(cbCommonPaneProperties) _obj, int _val );
-int        cbCommonPaneProperties_Show3DPaneBorderOn( TSelf(cbCommonPaneProperties) _obj );
-
-/* cbCustomizeBarEvent */
-TClassDefExtend(cbCustomizeBarEvent,cbPluginEvent)
-void*      cbCustomizeBarEvent_Bar( TSelf(cbCustomizeBarEvent) _obj );
-void       cbCustomizeBarEvent_ClickPos( TSelf(cbCustomizeBarEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbCustomizeLayoutEvent */
-TClassDefExtend(cbCustomizeLayoutEvent,cbPluginEvent)
-void       cbCustomizeLayoutEvent_ClickPos( TSelf(cbCustomizeLayoutEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbDimHandlerBase */
-TClassDefExtend(cbDimHandlerBase,wxObject)
-
-/* cbDimInfo */
-TClassDefExtend(cbDimInfo,wxObject)
-void       cbDimInfo_Assign( TSelf(cbDimInfo) _obj, void* other );
-TClass(cbDimInfo) cbDimInfo_Create( TPoint(x,y), TBool isFixed, int gap, void* pDimHandler );
-TClass(cbDimInfo) cbDimInfo_CreateDefault(  );
-void*      cbDimInfo_CreateWithHandler( TSelf(cbDimInfo) pDimHandler, TBool isFixed );
-void*      cbDimInfo_CreateWithInfo( int dh_x, int dh_y, int dv_x, int dv_y, int f_x, int f_y, TBool isFixed, int horizGap, int vertGap, void* pDimHandler );
-void       cbDimInfo_Delete( TSelf(cbDimInfo) _obj );
-void*      cbDimInfo_GetDimHandler( TSelf(cbDimInfo) _obj );
-
-/* cbDockBox */
-TClassDefExtend(cbDockBox,cbMiniButton)
-TClass(cbDockBox) cbDockBox_Create(  );
-
-/* cbDockPane */
-TClassDefExtend(cbDockPane,wxObject)
-int        cbDockPane_BarPresent( TSelf(cbDockPane) _obj, void* pBar );
-TClass(cbDockPane) cbDockPane_Create( int alignment, void* pPanel );
-TClass(cbDockPane) cbDockPane_CreateDefault(  );
-void       cbDockPane_Delete( TSelf(cbDockPane) _obj );
-int        cbDockPane_GetAlignment( TSelf(cbDockPane) _obj );
-void*      cbDockPane_GetBarInfoByWindow( TSelf(cbDockPane) _obj, void* pBarWnd );
-void       cbDockPane_GetBarResizeRange( TSelf(cbDockPane) _obj, void* pBar, void* from, void* till, int forLeftHandle );
-int        cbDockPane_GetDockingState( TSelf(cbDockPane) _obj );
-void*      cbDockPane_GetFirstRow( TSelf(cbDockPane) _obj );
-int        cbDockPane_GetPaneHeight( TSelf(cbDockPane) _obj );
-void       cbDockPane_GetRealRect( TSelf(cbDockPane) _obj, TRectOutVoid(_x,_y,_w,_h) );
-int        cbDockPane_GetRowList( TSelf(cbDockPane) _obj, void* _ref );
-void       cbDockPane_GetRowResizeRange( TSelf(cbDockPane) _obj, void* pRow, void* from, void* till, int forUpperHandle );
-int        cbDockPane_HitTestPaneItems( TSelf(cbDockPane) _obj, TPoint(x,y), void* ppRow, void* ppBar );
-void       cbDockPane_InsertBarByCoord( TSelf(cbDockPane) _obj, void* pBar, TRect(x,y,w,h) );
-void       cbDockPane_InsertBarByInfo( TSelf(cbDockPane) _obj, void* pBarInfo );
-void       cbDockPane_InsertBarToRow( TSelf(cbDockPane) _obj, void* pBar, void* pIntoRow );
-void       cbDockPane_InsertRow( TSelf(cbDockPane) _obj, void* pRow, void* pBeforeRow );
-TBool      cbDockPane_IsHorizontal( TSelf(cbDockPane) _obj );
-int        cbDockPane_MatchesMask( TSelf(cbDockPane) _obj, int paneMask );
-void       cbDockPane_RemoveBar( TSelf(cbDockPane) _obj, void* pBar );
-void       cbDockPane_RemoveRow( TSelf(cbDockPane) _obj, void* pRow );
-void       cbDockPane_SetBoundsInParent( TSelf(cbDockPane) _obj, TRect(x,y,w,h));
-void       cbDockPane_SetMargins( TSelf(cbDockPane) _obj, int top, int bottom, int left, int right );
-void       cbDockPane_SetPaneWidth( TSelf(cbDockPane) _obj, int width );
-
-/* cbDrawBarDecorEvent */
-TClassDefExtend(cbDrawBarDecorEvent,cbPluginEvent)
-void*      cbDrawBarDecorEvent_Bar( TSelf(cbDrawBarDecorEvent) _obj );
-void       cbDrawBarDecorEvent_BoundsInParent( TSelf(cbDrawBarDecorEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
-void*      cbDrawBarDecorEvent_Dc( TSelf(cbDrawBarDecorEvent) _obj );
-
-/* cbDrawBarHandlesEvent */
-TClassDefExtend(cbDrawBarHandlesEvent,cbPluginEvent)
-void*      cbDrawBarHandlesEvent_Bar( TSelf(cbDrawBarHandlesEvent) _obj );
-void*      cbDrawBarHandlesEvent_Dc( TSelf(cbDrawBarHandlesEvent) _obj );
-
-/* cbDrawHintRectEvent */
-TClassDefExtend(cbDrawHintRectEvent,cbPluginEvent)
-int        cbDrawHintRectEvent_EraseRect( TSelf(cbDrawHintRectEvent) _obj );
-TBool      cbDrawHintRectEvent_IsInClient( TSelf(cbDrawHintRectEvent) _obj );
-int        cbDrawHintRectEvent_LastTime( TSelf(cbDrawHintRectEvent) _obj );
-void       cbDrawHintRectEvent_Rect( TSelf(cbDrawHintRectEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
-
-/* cbDrawPaneBkGroundEvent */
-TClassDefExtend(cbDrawPaneBkGroundEvent,cbPluginEvent)
-void*      cbDrawPaneBkGroundEvent_Dc( TSelf(cbDrawPaneBkGroundEvent) _obj );
-
-/* cbDrawPaneDecorEvent */
-TClassDefExtend(cbDrawPaneDecorEvent,cbPluginEvent)
-void*      cbDrawPaneDecorEvent_Dc( TSelf(cbDrawPaneDecorEvent) _obj );
-
-/* cbDrawRowBkGroundEvent */
-TClassDefExtend(cbDrawRowBkGroundEvent,cbPluginEvent)
-void*      cbDrawRowBkGroundEvent_Dc( TSelf(cbDrawRowBkGroundEvent) _obj );
-void*      cbDrawRowBkGroundEvent_Row( TSelf(cbDrawRowBkGroundEvent) _obj );
-
-/* cbDrawRowDecorEvent */
-TClassDefExtend(cbDrawRowDecorEvent,cbPluginEvent)
-void*      cbDrawRowDecorEvent_Dc( TSelf(cbDrawRowDecorEvent) _obj );
-void*      cbDrawRowDecorEvent_Row( TSelf(cbDrawRowDecorEvent) _obj );
-
-/* cbDrawRowHandlesEvent */
-TClassDefExtend(cbDrawRowHandlesEvent,cbPluginEvent)
-void*      cbDrawRowHandlesEvent_Dc( TSelf(cbDrawRowHandlesEvent) _obj );
-void*      cbDrawRowHandlesEvent_Row( TSelf(cbDrawRowHandlesEvent) _obj );
-
-/* cbDynToolBarDimHandler */
-TClassDefExtend(cbDynToolBarDimHandler,cbDimHandlerBase)
-TClass(cbDynToolBarDimHandler) cbDynToolBarDimHandler_Create(  );
-void       cbDynToolBarDimHandler_Delete( TSelf(cbDynToolBarDimHandler) _obj );
-
-/* cbFinishDrawInAreaEvent */
-TClassDefExtend(cbFinishDrawInAreaEvent,cbPluginEvent)
-void       cbFinishDrawInAreaEvent_Area( TSelf(cbFinishDrawInAreaEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
-
-/* cbFloatedBarWindow */
-TClassDefExtend(cbFloatedBarWindow,wxToolWindow)
-TClass(cbFloatedBarWindow) cbFloatedBarWindow_Create( void* _obj );
-void*      cbFloatedBarWindow_GetBar( TSelf(cbFloatedBarWindow) _obj );
-void       cbFloatedBarWindow_PositionFloatedWnd( TSelf(cbFloatedBarWindow) _obj, TRect(_x,_y,_w,_h) );
-void       cbFloatedBarWindow_SetBar( TSelf(cbFloatedBarWindow) _obj, void* _bar );
-void       cbFloatedBarWindow_SetLayout( TSelf(cbFloatedBarWindow) _obj, void* _layout );
-
-/* cbGCUpdatesMgr */
-TClassDefExtend(cbGCUpdatesMgr,cbSimpleUpdatesMgr)
-TClass(cbGCUpdatesMgr) cbGCUpdatesMgr_Create( void* pPanel );
-TClass(cbGCUpdatesMgr) cbGCUpdatesMgr_CreateDefault(  );
-void       cbGCUpdatesMgr_Delete( TSelf(cbGCUpdatesMgr) _obj );
-void       cbGCUpdatesMgr_UpdateNow( TSelf(cbGCUpdatesMgr) _obj );
-
-/* cbHintAnimationPlugin */
-TClassDefExtend(cbHintAnimationPlugin,cbPluginBase)
-TClass(cbHintAnimationPlugin) cbHintAnimationPlugin_Create( void* pPanel, int paneMask );
-TClass(cbHintAnimationPlugin) cbHintAnimationPlugin_CreateDefault(  );
-void       cbHintAnimationPlugin_Delete( TSelf(cbHintAnimationPlugin) _obj );
-
-/* cbInsertBarEvent */
-TClassDefExtend(cbInsertBarEvent,cbPluginEvent)
-void*      cbInsertBarEvent_Bar( TSelf(cbInsertBarEvent) _obj );
-void*      cbInsertBarEvent_Row( TSelf(cbInsertBarEvent) _obj );
-
-/* cbLayoutRowEvent */
-TClassDefExtend(cbLayoutRowEvent,cbPluginEvent)
-void*      cbLayoutRowEvent_Row( TSelf(cbLayoutRowEvent) _obj );
-
-/* cbLeftDClickEvent */
-TClassDefExtend(cbLeftDClickEvent,cbPluginEvent)
-void       cbLeftDClickEvent_Pos( TSelf(cbLeftDClickEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbLeftDownEvent */
-TClassDefExtend(cbLeftDownEvent,cbPluginEvent)
-void       cbLeftDownEvent_Pos( TSelf(cbLeftDownEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbLeftUpEvent */
-TClassDefExtend(cbLeftUpEvent,cbPluginEvent)
-void       cbLeftUpEvent_Pos( TSelf(cbLeftUpEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbMiniButton */
-TClassDefExtend(cbMiniButton,wxObject)
-TClass(cbMiniButton) cbMiniButton_Create(  );
-void       cbMiniButton_Delete( TSelf(cbMiniButton) _obj );
-void       cbMiniButton_Dim( TSelf(cbMiniButton) _obj, TSizeOutVoid(_w,_h) );
-int        cbMiniButton_DragStarted( TSelf(cbMiniButton) _obj );
-void       cbMiniButton_Enable( TSelf(cbMiniButton) _obj, TBool enable );
-int        cbMiniButton_Enabled( TSelf(cbMiniButton) _obj );
-int        cbMiniButton_HitTest( TSelf(cbMiniButton) _obj, TPoint(x,y) );
-TBool      cbMiniButton_IsPressed( TSelf(cbMiniButton) _obj );
-void*      cbMiniButton_Layout( TSelf(cbMiniButton) _obj );
-void*      cbMiniButton_Pane( TSelf(cbMiniButton) _obj );
-void*      cbMiniButton_Plugin( TSelf(cbMiniButton) _obj );
-void       cbMiniButton_Pos( TSelf(cbMiniButton) _obj, TPointOutVoid(_x,_y) );
-int        cbMiniButton_Pressed( TSelf(cbMiniButton) _obj );
-void       cbMiniButton_Refresh( TSelf(cbMiniButton) _obj );
-void       cbMiniButton_Reset( TSelf(cbMiniButton) _obj );
-void       cbMiniButton_SetPos( TSelf(cbMiniButton) _obj, TPoint(x,y) );
-int        cbMiniButton_Visible( TSelf(cbMiniButton) _obj );
-int        cbMiniButton_WasClicked( TSelf(cbMiniButton) _obj );
-void*      cbMiniButton_Wnd( TSelf(cbMiniButton) _obj );
-
-/* cbMotionEvent */
-TClassDefExtend(cbMotionEvent,cbPluginEvent)
-void       cbMotionEvent_Pos( TSelf(cbMotionEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbPaneDrawPlugin */
-TClassDefExtend(cbPaneDrawPlugin,cbPluginBase)
-TClass(cbPaneDrawPlugin) cbPaneDrawPlugin_Create( void* pPanel, int paneMask );
-TClass(cbPaneDrawPlugin) cbPaneDrawPlugin_CreateDefault(  );
-void       cbPaneDrawPlugin_Delete( TSelf(cbPaneDrawPlugin) _obj );
-
-/* cbPluginBase */
-TClassDefExtend(cbPluginBase,wxEvtHandler)
-void       cbPluginBase_Delete( TSelf(cbPluginBase) _obj );
-int        cbPluginBase_GetPaneMask( TSelf(cbPluginBase) _obj );
-TBool      cbPluginBase_IsReady( TSelf(cbPluginBase) _obj );
-void*      cbPluginBase_Plugin( int _swt );
-int        cbPluginBase_ProcessEvent( TSelf(cbPluginBase) _obj, TClass(wxEvent) event );
-
-/* cbPluginEvent */
-TClassDefExtend(cbPluginEvent,wxEvent)
-void*      cbPluginEvent_Pane( TSelf(cbPluginEvent) _obj );
-
-/* cbRemoveBarEvent */
-TClassDefExtend(cbRemoveBarEvent,cbPluginEvent)
-void*      cbRemoveBarEvent_Bar( TSelf(cbRemoveBarEvent) _obj );
-
-/* cbResizeBarEvent */
-TClassDefExtend(cbResizeBarEvent,cbPluginEvent)
-void*      cbResizeBarEvent_Bar( TSelf(cbResizeBarEvent) _obj );
-void*      cbResizeBarEvent_Row( TSelf(cbResizeBarEvent) _obj );
-
-/* cbResizeRowEvent */
-TClassDefExtend(cbResizeRowEvent,cbPluginEvent)
-int        cbResizeRowEvent_ForUpperHandle( TSelf(cbResizeRowEvent) _obj );
-int        cbResizeRowEvent_HandleOfs( TSelf(cbResizeRowEvent) _obj );
-void*      cbResizeRowEvent_Row( TSelf(cbResizeRowEvent) _obj );
-
-/* cbRightDownEvent */
-TClassDefExtend(cbRightDownEvent,cbPluginEvent)
-void       cbRightDownEvent_Pos( TSelf(cbRightDownEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbRightUpEvent */
-TClassDefExtend(cbRightUpEvent,cbPluginEvent)
-void       cbRightUpEvent_Pos( TSelf(cbRightUpEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbRowDragPlugin */
-TClassDefExtend(cbRowDragPlugin,cbPluginBase)
-TClass(cbRowDragPlugin) cbRowDragPlugin_Create( void* pPanel, int paneMask );
-TClass(cbRowDragPlugin) cbRowDragPlugin_CreateDefault(  );
-void       cbRowDragPlugin_Delete( TSelf(cbRowDragPlugin) _obj );
-
-/* cbRowInfo */
-TClassDefExtend(cbRowInfo,wxObject)
-TClass(cbRowInfo) cbRowInfo_Create(  );
-void       cbRowInfo_Delete( TSelf(cbRowInfo) _obj );
-void*      cbRowInfo_GetFirstBar( TSelf(cbRowInfo) _obj );
-
-/* cbRowLayoutPlugin */
-TClassDefExtend(cbRowLayoutPlugin,cbPluginBase)
-TClass(cbRowLayoutPlugin) cbRowLayoutPlugin_Create( void* pPanel, int paneMask );
-TClass(cbRowLayoutPlugin) cbRowLayoutPlugin_CreateDefault(  );
-void       cbRowLayoutPlugin_Delete( TSelf(cbRowLayoutPlugin) _obj );
-
-/* cbSimpleCustomizationPlugin */
-TClassDefExtend(cbSimpleCustomizationPlugin,cbPluginBase)
-TClass(cbSimpleCustomizationPlugin) cbSimpleCustomizationPlugin_Create( void* pPanel, int paneMask );
-TClass(cbSimpleCustomizationPlugin) cbSimpleCustomizationPlugin_CreateDefault(  );
-void       cbSimpleCustomizationPlugin_Delete( TSelf(cbSimpleCustomizationPlugin) _obj );
-
-/* cbSimpleUpdatesMgr */
-TClassDefExtend(cbSimpleUpdatesMgr,cbUpdatesManagerBase)
-
-/* cbSizeBarWndEvent */
-TClassDefExtend(cbSizeBarWndEvent,cbPluginEvent)
-void*      cbSizeBarWndEvent_Bar( TSelf(cbSizeBarWndEvent) _obj );
-void       cbSizeBarWndEvent_BoundsInParent( TSelf(cbSizeBarWndEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
-
-/* cbStartBarDraggingEvent */
-TClassDefExtend(cbStartBarDraggingEvent,cbPluginEvent)
-void*      cbStartBarDraggingEvent_Bar( TSelf(cbStartBarDraggingEvent) _obj );
-void       cbStartBarDraggingEvent_Pos( TSelf(cbStartBarDraggingEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* cbStartDrawInAreaEvent */
-TClassDefExtend(cbStartDrawInAreaEvent,cbPluginEvent)
-void       cbStartDrawInAreaEvent_Area( TSelf(cbStartDrawInAreaEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
-
-/* cbUpdatesManagerBase */
-TClassDefExtend(cbUpdatesManagerBase,wxObject)
-
-/* wxAcceleratorEntry */
-TClassDef(wxAcceleratorEntry)
-TClass(wxAcceleratorEntry) wxAcceleratorEntry_Create( int flags, int keyCode, int cmd );
-void       wxAcceleratorEntry_Delete( TSelf(wxAcceleratorEntry) _obj );
-int        wxAcceleratorEntry_GetCommand( TSelf(wxAcceleratorEntry) _obj );
-int        wxAcceleratorEntry_GetFlags( TSelf(wxAcceleratorEntry) _obj );
-int        wxAcceleratorEntry_GetKeyCode( TSelf(wxAcceleratorEntry) _obj );
-void       wxAcceleratorEntry_Set( TSelf(wxAcceleratorEntry) _obj, int flags, int keyCode, int cmd );
-
-/* wxAcceleratorTable */
-TClassDef(wxAcceleratorTable)
-TClass(wxAcceleratorTable) wxAcceleratorTable_Create( int n, void* entries );
-void       wxAcceleratorTable_Delete( TSelf(wxAcceleratorTable) _obj );
-
-/* wxActivateEvent */
-TClassDefExtend(wxActivateEvent,wxEvent)
-void       wxActivateEvent_CopyObject( TSelf(wxActivateEvent) _obj, void* obj );
-int        wxActivateEvent_GetActive( TSelf(wxActivateEvent) _obj );
-
-/* wxApp */
-TClassDefExtend(wxApp,wxEvtHandler)
-
-/* wxArray */
-TClassDef(wxArray)
-
-/* wxArrayString */
-TClassDefExtend(wxArrayString,wxArray)
-
-/* wxArtProvider */
-TClassDefExtend(wxArtProvider,wxObject)
-int        PopProvider(  );
-void       PushProvider( TClass(wxArtProvider) provider );
-TBool      RemoveProvider( TClass(wxArtProvider) provider );
-
-/* wxAutomationObject */
-TClassDefExtend(wxAutomationObject,wxObject)
-
-/* wxBitmap */
-TClassDefExtend(wxBitmap,wxGDIObject)
-void       wxBitmap_AddHandler( TClass(wxEvtHandler) handler );
-void       wxBitmap_CleanUpHandlers(  );
-TClass(wxBitmap) wxBitmap_Create( void* _data, int _type, TSize(_width,_height), int _depth );
-TClass(wxBitmap) wxBitmap_CreateDefault(  );
-TClass(wxBitmap) wxBitmap_CreateEmpty( TSize(_width,_height), int _depth );
-TClass(wxBitmap) wxBitmap_CreateFromXPM( TSelf(wxBitmap) data );
-TClass(wxBitmap) wxBitmap_CreateLoad( TStringVoid name, int type );
-void       wxBitmap_Delete( TSelf(wxBitmap) _obj );
-void*      wxBitmap_FindHandlerByExtension( TSelf(wxBitmap) extension, int type );
-void*      wxBitmap_FindHandlerByName( TStringVoid name );
-void*      wxBitmap_FindHandlerByType( int type );
-int        wxBitmap_GetDepth( TSelf(wxBitmap) _obj );
-int        wxBitmap_GetHeight( TSelf(wxBitmap) _obj );
-TClass(wxMask) wxBitmap_GetMask( TSelf(wxBitmap) _obj );
-void       wxBitmap_GetSubBitmap( TSelf(wxBitmap) _obj, TRect(x,y,w,h), TClassRef(wxBitmap) _ref );
-int        wxBitmap_GetWidth( TSelf(wxBitmap) _obj );
-void       wxBitmap_InitStandardHandlers(  );
-void       wxBitmap_InsertHandler( TClass(wxEvtHandler) handler );
-int        wxBitmap_LoadFile( TSelf(wxBitmap) _obj, TStringVoid name, int type );
-TBool      wxBitmap_Ok( TSelf(wxBitmap) _obj );
-int        wxBitmap_RemoveHandler( TStringVoid name );
-int        wxBitmap_SaveFile( TSelf(wxBitmap) _obj, TStringVoid name, int type, TClass(wxPalette) cmap );
-void       wxBitmap_SetDepth( TSelf(wxBitmap) _obj, int d );
-void       wxBitmap_SetHeight( TSelf(wxBitmap) _obj, int h );
-void       wxBitmap_SetMask( TSelf(wxBitmap) _obj, TClass(wxMask) mask );
-void       wxBitmap_SetWidth( TSelf(wxBitmap) _obj, int w );
-
-/* wxBitmapButton */
-TClassDefExtend(wxBitmapButton,wxButton)
-TClass(wxBitmapButton) wxBitmapButton_Create( TClass(wxWindow) _prt, int _id, TClass(wxBitmap) _bmp, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxBitmapButton_GetBitmapDisabled( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
-void       wxBitmapButton_GetBitmapFocus( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
-void       wxBitmapButton_GetBitmapLabel( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
-void       wxBitmapButton_GetBitmapSelected( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
-int        wxBitmapButton_GetMarginX( TSelf(wxBitmapButton) _obj );
-int        wxBitmapButton_GetMarginY( TSelf(wxBitmapButton) _obj );
-void       wxBitmapButton_SetBitmapDisabled( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) disabled );
-void       wxBitmapButton_SetBitmapFocus( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) focus );
-void       wxBitmapButton_SetBitmapLabel( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) bitmap );
-void       wxBitmapButton_SetBitmapSelected( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) sel );
-void       wxBitmapButton_SetMargins( TSelf(wxBitmapButton) _obj, TPoint(x,y) );
-
-/* wxBitmapDataObject */
-TClassDefExtend(wxBitmapDataObject,wxDataObjectSimple)
-TClass(wxBitmapDataObject) BitmapDataObject_Create( TClass(wxBitmap) _bmp );
-TClass(wxBitmapDataObject) BitmapDataObject_CreateEmpty(  );
-void       BitmapDataObject_Delete( TSelf(wxBitmapDataObject) _obj );
-void       BitmapDataObject_GetBitmap( TSelf(wxBitmapDataObject) _obj, TClassRef(wxBitmap) _bmp );
-void       BitmapDataObject_SetBitmap( TSelf(wxBitmapDataObject) _obj, TClass(wxBitmap) _bmp );
-
-/* wxBitmapHandler */
-TClassDefExtend(wxBitmapHandler,wxObject)
-
-/* wxBoxSizer */
-TClassDefExtend(wxBoxSizer,wxSizer)
-void       wxBoxSizer_CalcMin( TSelf(wxBoxSizer) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxBoxSizer) wxBoxSizer_Create( int orient );
-int        wxBoxSizer_GetOrientation( TSelf(wxBoxSizer) _obj );
-void       wxBoxSizer_RecalcSizes( TSelf(wxBoxSizer) _obj );
-
-/* wxBrush */
-TClassDefExtend(wxBrush,wxGDIObject)
-void       wxBrush_Assign( TSelf(wxBrush) _obj, TClass(wxBrush) brush );
-TClass(wxBrush) wxBrush_CreateDefault(  );
-TClass(wxBrush) wxBrush_CreateFromBitmap( TClass(wxBitmap) bitmap );
-TClass(wxBrush) wxBrush_CreateFromColour( TClass(wxColour) col, int style );
-TClass(wxBrush) wxBrush_CreateFromStock( int id );
-void       wxBrush_Delete( TSelf(wxBrush) _obj );
-void       wxBrush_GetColour( TSelf(wxBrush) _obj, TClassRef(wxColour) _ref );
-void       wxBrush_GetStipple( TSelf(wxBrush) _obj, TClassRef(wxBitmap) _ref );
-int        wxBrush_GetStyle( TSelf(wxBrush) _obj );
-TBool      wxBrush_IsEqual( TSelf(wxBrush) _obj, TClass(wxBrush) brush );
-TBool      wxBrush_Ok( TSelf(wxBrush) _obj );
-void       wxBrush_SetColour( TSelf(wxBrush) _obj, TClass(wxColour) col );
-void       wxBrush_SetColourSingle( TSelf(wxBrush) _obj, TChar r, TChar g, TChar b );
-void       wxBrush_SetStipple( TSelf(wxBrush) _obj, TClass(wxBitmap) stipple );
-void       wxBrush_SetStyle( TSelf(wxBrush) _obj, int style );
-
-/* wxBrushList */
-TClassDefExtend(wxBrushList,wxList)
-
-/* wxBufferedInputStream */
-TClassDefExtend(wxBufferedInputStream,wxFilterInputStream)
-
-/* wxBufferedOutputStream */
-TClassDefExtend(wxBufferedOutputStream,wxFilterOutputStream)
-
-/* wxBusyCursor */
-TClassDef(wxBusyCursor)
-TClass(wxBusyCursor) wxBusyCursor_Create(  );
-void*      wxBusyCursor_CreateWithCursor( TSelf(wxBusyCursor) _cur );
-void       wxBusyCursor_Delete( TSelf(wxBusyCursor) _obj );
-
-/* wxBusyInfo */
-TClassDef(wxBusyInfo)
-TClass(wxBusyInfo) wxBusyInfo_Create( TStringVoid _txt );
-void       wxBusyInfo_Delete( TSelf(wxBusyInfo) _obj );
-
-/* wxButton */
-TClassDefExtend(wxButton,wxControl)
-TClass(wxButton) wxButton_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxButton_SetBackgroundColour( TSelf(wxButton) _obj, TClass(wxColour) colour );
-void       wxButton_SetDefault( TSelf(wxButton) _obj );
-
-/* wxCSConv */
-TClassDefExtend(wxCSConv,wxMBConv)
-
-/* wxCalculateLayoutEvent */
-TClassDefExtend(wxCalculateLayoutEvent,wxEvent)
-TClass(wxCalculateLayoutEvent) wxCalculateLayoutEvent_Create( int id );
-int        wxCalculateLayoutEvent_GetFlags( TSelf(wxCalculateLayoutEvent) _obj );
-void       wxCalculateLayoutEvent_GetRect( TSelf(wxCalculateLayoutEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
-void       wxCalculateLayoutEvent_SetFlags( TSelf(wxCalculateLayoutEvent) _obj, int flags );
-void       wxCalculateLayoutEvent_SetRect( TSelf(wxCalculateLayoutEvent) _obj, TRect(x,y,w,h) );
-
-/* wxCalendarCtrl */
-TClassDefExtend(wxCalendarCtrl,wxControl)
-TClass(wxCalendarCtrl) wxCalendarCtrl_Create( TClass(wxWindow) _prt, int _id, void* _dat, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxCalendarCtrl_EnableHolidayDisplay( TSelf(wxCalendarCtrl) _obj, int display );
-void       wxCalendarCtrl_EnableMonthChange( TSelf(wxCalendarCtrl) _obj, TBool enable );
-void       wxCalendarCtrl_EnableYearChange( TSelf(wxCalendarCtrl) _obj, TBool enable );
-void*      wxCalendarCtrl_GetAttr( TSelf(wxCalendarCtrl) _obj, int day );
-void       wxCalendarCtrl_GetDate( TSelf(wxCalendarCtrl) _obj, void* date );
-void       wxCalendarCtrl_GetHeaderColourBg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
-void       wxCalendarCtrl_GetHeaderColourFg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
-void       wxCalendarCtrl_GetHighlightColourBg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
-void       wxCalendarCtrl_GetHighlightColourFg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
-void       wxCalendarCtrl_GetHolidayColourBg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
-void       wxCalendarCtrl_GetHolidayColourFg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
-int        wxCalendarCtrl_HitTest( TSelf(wxCalendarCtrl) _obj, TPoint(x,y), void* date, void* wd );
-void       wxCalendarCtrl_ResetAttr( TSelf(wxCalendarCtrl) _obj, int day );
-void       wxCalendarCtrl_SetAttr( TSelf(wxCalendarCtrl) _obj, int day, void* attr );
-void       wxCalendarCtrl_SetDate( TSelf(wxCalendarCtrl) _obj, void* date );
-void       wxCalendarCtrl_SetHeaderColours( TSelf(wxCalendarCtrl) _obj, void* colFg, void* colBg );
-void       wxCalendarCtrl_SetHighlightColours( TSelf(wxCalendarCtrl) _obj, void* colFg, void* colBg );
-void       wxCalendarCtrl_SetHoliday( TSelf(wxCalendarCtrl) _obj, int day );
-void       wxCalendarCtrl_SetHolidayColours( TSelf(wxCalendarCtrl) _obj, void* colFg, void* colBg );
-
-/* wxCalendarDateAttr */
-TClassDef(wxCalendarDateAttr)
-TClass(wxCalendarDateAttr) wxCalendarDateAttr_Create( void* _ctxt, void* _cbck, void* _cbrd, void* _fnt, int _brd );
-TClass(wxCalendarDateAttr) wxCalendarDateAttr_CreateDefault(  );
-void       wxCalendarDateAttr_Delete( TSelf(wxCalendarDateAttr) _obj );
-void       wxCalendarDateAttr_GetBackgroundColour( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxColour) _ref );
-int        wxCalendarDateAttr_GetBorder( TSelf(wxCalendarDateAttr) _obj );
-void       wxCalendarDateAttr_GetBorderColour( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxColour) _ref );
-void       wxCalendarDateAttr_GetFont( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxFont) _ref );
-void       wxCalendarDateAttr_GetTextColour( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxColour) _ref );
-TBool      wxCalendarDateAttr_HasBackgroundColour( TSelf(wxCalendarDateAttr) _obj );
-TBool      wxCalendarDateAttr_HasBorder( TSelf(wxCalendarDateAttr) _obj );
-TBool      wxCalendarDateAttr_HasBorderColour( TSelf(wxCalendarDateAttr) _obj );
-TBool      wxCalendarDateAttr_HasFont( TSelf(wxCalendarDateAttr) _obj );
-TBool      wxCalendarDateAttr_HasTextColour( TSelf(wxCalendarDateAttr) _obj );
-TBool      wxCalendarDateAttr_IsHoliday( TSelf(wxCalendarDateAttr) _obj );
-void       wxCalendarDateAttr_SetBackgroundColour( TSelf(wxCalendarDateAttr) _obj, TClass(wxColour) col );
-void       wxCalendarDateAttr_SetBorder( TSelf(wxCalendarDateAttr) _obj, int border );
-void       wxCalendarDateAttr_SetBorderColour( TSelf(wxCalendarDateAttr) _obj, TClass(wxColour) col );
-void       wxCalendarDateAttr_SetFont( TSelf(wxCalendarDateAttr) _obj, TClass(wxFont) font );
-void       wxCalendarDateAttr_SetHoliday( TSelf(wxCalendarDateAttr) _obj, int holiday );
-void       wxCalendarDateAttr_SetTextColour( TSelf(wxCalendarDateAttr) _obj, TClass(wxColour) col );
-
-/* wxCalendarEvent */
-TClassDefExtend(wxCalendarEvent,wxCommandEvent)
-void       wxCalendarEvent_GetDate( TSelf(wxCalendarEvent) _obj, void* _dte );
-int        wxCalendarEvent_GetWeekDay( TSelf(wxCalendarEvent) _obj );
-
-/* wxCaret */
-TClassDef(wxCaret)
-TClass(wxCaret) wxCaret_Create( TClass(wxWindow) _wnd, int _wth, int _hgt );
-int        wxCaret_GetBlinkTime(  );
-void       wxCaret_GetPosition( TSelf(wxCaret) _obj, TPointOutVoid(_x,_y) );
-void       wxCaret_GetSize( TSelf(wxCaret) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxWindow) wxCaret_GetWindow( TSelf(wxCaret) _obj );
-void       wxCaret_Hide( TSelf(wxCaret) _obj );
-TBool      wxCaret_IsOk( TSelf(wxCaret) _obj );
-TBool      wxCaret_IsVisible( TSelf(wxCaret) _obj );
-void       wxCaret_Move( TSelf(wxCaret) _obj, TPoint(x,y) );
-void       wxCaret_SetBlinkTime( int milliseconds );
-void       wxCaret_SetSize( TSelf(wxCaret) _obj, TSize(width,height) );
-void       wxCaret_Show( TSelf(wxCaret) _obj );
-
-/* wxCheckBox */
-TClassDefExtend(wxCheckBox,wxControl)
-TClass(wxCheckBox) wxCheckBox_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-TBoolInt   wxCheckBox_GetValue( TSelf(wxCheckBox) _obj );
-void       wxCheckBox_SetValue( TSelf(wxCheckBox) _obj, TBoolInt value );
-
-/* wxCheckListBox */
-TClassDefExtend(wxCheckListBox,wxListBox)
-void       wxCheckListBox_Check( TSelf(wxCheckListBox) _obj, int item, TBool check );
-TClass(wxCheckListBox) wxCheckListBox_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
-TBool      wxCheckListBox_IsChecked( TSelf(wxCheckListBox) _obj, int item );
-
-/* wxChoice */
-TClassDefExtend(wxChoice,wxControl)
-void       wxChoice_Append( TSelf(wxChoice) _obj, TString item );
-void       wxChoice_Clear( TSelf(wxChoice) _obj );
-TClass(wxChoice) wxChoice_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
-void       wxChoice_Delete( TSelf(wxChoice) _obj, int n );
-int        wxChoice_FindString( TSelf(wxChoice) _obj, TString s );
-int        wxChoice_GetCount( TSelf(wxChoice) _obj );
-int        wxChoice_GetSelection( TSelf(wxChoice) _obj );
-TStringLen wxChoice_GetString( TSelf(wxChoice) _obj, int n, TStringOutVoid _buf );
-void       wxChoice_SetSelection( TSelf(wxChoice) _obj, int n );
-void       wxChoice_SetString( TSelf(wxChoice) _obj, int n, TString s );
-
-/* wxClassInfo */
-TClassDef(wxClassInfo)
-void*      wxClassInfo_CreateClassByName( TSelf(wxClassInfo) _inf );
-void*      wxClassInfo_GetClassName( TSelf(wxClassInfo) _inf );
-TBool      wxClassInfo_IsKindOf( TSelf(wxClassInfo) _obj, TStringVoid _name );
-
-/* wxClient */
-TClassDefExtend(wxClient,wxClientBase)
-
-/* wxClientBase */
-TClassDefExtend(wxClientBase,wxObject)
-
-/* wxClientDC */
-TClassDefExtend(wxClientDC,wxWindowDC)
-TClass(wxClientDC) wxClientDC_Create( TClass(wxWindow) win );
-void       wxClientDC_Delete( TSelf(wxClientDC) _obj );
-
-/* wxClientData */
-TClassDef(wxClientData)
-
-/* wxClientDataContainer */
-TClassDef(wxClientDataContainer)
-
-/* wxClipboard */
-TClassDefExtend(wxClipboard,wxObject)
-int        wxClipboard_AddData( TSelf(wxClipboard) _obj, TClass(wxDataObject) data );
-void       wxClipboard_Clear( TSelf(wxClipboard) _obj );
-void       wxClipboard_Close( TSelf(wxClipboard) _obj );
-TClass(wxClipboard) wxClipboard_Create(  );
-int        wxClipboard_Flush( TSelf(wxClipboard) _obj );
-int        wxClipboard_GetData( TSelf(wxClipboard) _obj, TClass(wxDataObject) data );
-TBool      wxClipboard_IsOpened( TSelf(wxClipboard) _obj );
-TBool      wxClipboard_IsSupported( TSelf(wxClipboard) _obj, TClass(wxDataFormat) format );
-int        wxClipboard_Open( TSelf(wxClipboard) _obj );
-int        wxClipboard_SetData( TSelf(wxClipboard) _obj, TClass(wxDataObject) data );
-void       wxClipboard_UsePrimarySelection( TSelf(wxClipboard) _obj, int primary );
-
-/* wxCloseEvent */
-TClassDefExtend(wxCloseEvent,wxEvent)
-TBool      wxCloseEvent_CanVeto( TSelf(wxCloseEvent) _obj );
-void       wxCloseEvent_CopyObject( TSelf(wxCloseEvent) _obj, void* obj );
-int        wxCloseEvent_GetLoggingOff( TSelf(wxCloseEvent) _obj );
-int        wxCloseEvent_GetVeto( TSelf(wxCloseEvent) _obj );
-void       wxCloseEvent_SetCanVeto( TSelf(wxCloseEvent) _obj, int canVeto );
-void       wxCloseEvent_SetLoggingOff( TSelf(wxCloseEvent) _obj, int logOff );
-void       wxCloseEvent_Veto( TSelf(wxCloseEvent) _obj, int veto );
-
-/* wxClosure */
-TClassDefExtend(wxClosure,wxObject)
-
-/* wxColour */
-TClassDefExtend(wxColour,wxObject)
-void       wxColour_Assign( TSelf(wxColour) _obj, void* other );
-TChar      wxColour_Blue( TSelf(wxColour) _obj );
-void       wxColour_Copy( TSelf(wxColour) _obj, void* _other );
-void*      wxColour_CreateByName( TStringVoid _name );
-TClass(wxColour) wxColour_CreateEmpty(  );
-TClass(wxColour) wxColour_CreateFromStock( int id );
-void*      wxColour_CreateRGB( TChar _red, TChar _green, TChar _blue );
-void       wxColour_Delete( TSelf(wxColour) _obj );
-//WXCOLORREF wxColour_GetPixel( TSelf(wxColour) _obj );
-TChar      wxColour_Green( TSelf(wxColour) _obj );
-TBool      wxColour_Ok( TSelf(wxColour) _obj );
-TChar      wxColour_Red( TSelf(wxColour) _obj );
-void       wxColour_Set( TSelf(wxColour) _obj, TChar _red, TChar _green, TChar _blue );
-void       wxColour_SetByName( TSelf(wxColour) _obj, TStringVoid _name );
-TBoolInt   wxColour_ValidName( TStringVoid _name );
-
-/* wxColourData */
-TClassDefExtend(wxColourData,wxObject)
-TClass(wxColourData) wxColourData_Create(  );
-void       wxColourData_Delete( TSelf(wxColourData) _obj );
-int        wxColourData_GetChooseFull( TSelf(wxColourData) _obj );
-void       wxColourData_GetColour( TSelf(wxColourData) _obj, TClassRef(wxColour) _ref );
-void       wxColourData_GetCustomColour( TSelf(wxColourData) _obj, int i, TClassRef(wxColour) _ref );
-void       wxColourData_SetChooseFull( TSelf(wxColourData) _obj, int flag );
-void       wxColourData_SetColour( TSelf(wxColourData) _obj, TClass(wxColour) colour );
-void       wxColourData_SetCustomColour( TSelf(wxColourData) _obj, int i, TClass(wxColour) colour );
-
-/* wxColourDatabase */
-TClassDefExtend(wxColourDatabase,wxList)
-
-/* wxColourDialog */
-TClassDefExtend(wxColourDialog,wxDialog)
-TClass(wxColourDialog) wxColourDialog_Create( TClass(wxWindow) _prt, TClass(wxColour) col );
-void       wxColourDialog_GetColourData( TSelf(wxColourDialog) _obj, TClassRef(wxColour) _ref );
-
-/* wxComboBox */
-TClassDefExtend(wxComboBox,wxChoice)
-void       wxComboBox_Append( TSelf(wxComboBox) _obj, TString item );
-void       wxComboBox_AppendData( TSelf(wxComboBox) _obj, TString item, void* d );
-void       wxComboBox_Clear( TSelf(wxComboBox) _obj );
-void       wxComboBox_Copy( TSelf(wxComboBox) _obj );
-TClass(wxComboBox) wxComboBox_Create( TClass(wxWindow) _prt, int _id, TStringVoid _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
-void       wxComboBox_Cut( TSelf(wxComboBox) _obj );
-void       wxComboBox_Delete( TSelf(wxComboBox) _obj, int n );
-int        wxComboBox_FindString( TSelf(wxComboBox) _obj, TString s );
-TClass(wxClientData) wxComboBox_GetClientData( TSelf(wxComboBox) _obj, int n );
-int        wxComboBox_GetCount( TSelf(wxComboBox) _obj );
-int        wxComboBox_GetInsertionPoint( TSelf(wxComboBox) _obj );
-int        wxComboBox_GetLastPosition( TSelf(wxComboBox) _obj );
-int        wxComboBox_GetSelection( TSelf(wxComboBox) _obj );
-TStringLen wxComboBox_GetString( TSelf(wxComboBox) _obj, int n, TStringOutVoid _buf );
-TStringLen wxComboBox_GetStringSelection( TSelf(wxComboBox) _obj, TStringOutVoid _buf );
-TStringLen wxComboBox_GetValue( TSelf(wxComboBox) _obj, TStringOutVoid _buf );
-void       wxComboBox_Paste( TSelf(wxComboBox) _obj );
-void       wxComboBox_Remove( TSelf(wxComboBox) _obj, int from, int to );
-void       wxComboBox_Replace( TSelf(wxComboBox) _obj, int from, int to, TString value );
-void       wxComboBox_SetClientData( TSelf(wxComboBox) _obj, int n, TClass(wxClientData) clientData );
-void       wxComboBox_SetEditable( TSelf(wxComboBox) _obj, TBool editable );
-void       wxComboBox_SetInsertionPoint( TSelf(wxComboBox) _obj, int pos );
-void       wxComboBox_SetInsertionPointEnd( TSelf(wxComboBox) _obj );
-void       wxComboBox_SetSelection( TSelf(wxComboBox) _obj, int n );
-void       wxComboBox_SetTextSelection( TSelf(wxComboBox) _obj, int from, int to );
-
-/* wxCommand */
-TClassDefExtend(wxCommand,wxObject)
-
-/* wxCommandEvent */
-TClassDefExtend(wxCommandEvent,wxEvent)
-void       wxCommandEvent_CopyObject( TSelf(wxCommandEvent) _obj, void* object_dest );
-TClass(wxCommandEvent) wxCommandEvent_Create( int _typ, int _id );
-void       wxCommandEvent_Delete( TSelf(wxCommandEvent) _obj );
-TClass(wxClientData) wxCommandEvent_GetClientData( TSelf(wxCommandEvent) _obj );
-TClass(wxClientData) wxCommandEvent_GetClientObject( TSelf(wxCommandEvent) _obj );
-long       wxCommandEvent_GetExtraLong( TSelf(wxCommandEvent) _obj );
-long       wxCommandEvent_GetInt( TSelf(wxCommandEvent) _obj );
-int        wxCommandEvent_GetSelection( TSelf(wxCommandEvent) _obj );
-TStringLen wxCommandEvent_GetString( TSelf(wxCommandEvent) _obj, TStringOutVoid _buf );
-TBool      wxCommandEvent_IsChecked( TSelf(wxCommandEvent) _obj );
-TBool      wxCommandEvent_IsSelection( TSelf(wxCommandEvent) _obj );
-void       wxCommandEvent_SetClientData( TSelf(wxCommandEvent) _obj, TClass(wxClientData) clientData );
-void       wxCommandEvent_SetClientObject( TSelf(wxCommandEvent) _obj, TClass(wxClientData) clientObject );
-void       wxCommandEvent_SetExtraLong( TSelf(wxCommandEvent) _obj, long extraLong );
-void       wxCommandEvent_SetInt( TSelf(wxCommandEvent) _obj, int i );
-void       wxCommandEvent_SetString( TSelf(wxCommandEvent) _obj, TString s );
-
-/* wxCommandLineParser */
-TClassDef(wxCommandLineParser)
-
-/* wxCommandProcessor */
-TClassDefExtend(wxCommandProcessor,wxObject)
-TBool      wxCommandProcessor_CanRedo( TSelf(wxCommandProcessor) _obj );
-TBool      wxCommandProcessor_CanUndo( TSelf(wxCommandProcessor) _obj );
-void       wxCommandProcessor_ClearCommands( TSelf(wxCommandProcessor) _obj );
-void       wxCommandProcessor_Delete( TSelf(wxCommandProcessor) _obj );
-int        wxCommandProcessor_GetCommands( TSelf(wxCommandProcessor) _obj, void* _ref );
-void*      wxCommandProcessor_GetEditMenu( TSelf(wxCommandProcessor) _obj );
-int        wxCommandProcessor_GetMaxCommands( TSelf(wxCommandProcessor) _obj );
-void       wxCommandProcessor_Initialize( TSelf(wxCommandProcessor) _obj );
-int        wxCommandProcessor_Redo( TSelf(wxCommandProcessor) _obj );
-void       wxCommandProcessor_SetEditMenu( TSelf(wxCommandProcessor) _obj, TClass(wxMenu) menu );
-void       wxCommandProcessor_SetMenuStrings( TSelf(wxCommandProcessor) _obj );
-int        wxCommandProcessor_Submit( TSelf(wxCommandProcessor) _obj, TClass(wxCommand) command, int storeIt );
-int        wxCommandProcessor_Undo( TSelf(wxCommandProcessor) _obj );
-void*      wxCommandProcessor_wxCommandProcessor( int maxCommands );
-
-/* wxCondition */
-TClassDef(wxCondition)
-void       wxCondition_Broadcast( TSelf(wxCondition) _obj );
-TClass(wxCondition) wxCondition_Create( void* _mut );
-void       wxCondition_Delete( TSelf(wxCondition) _obj );
-void       wxCondition_Signal( TSelf(wxCondition) _obj );
-void       wxCondition_Wait( TSelf(wxCondition) _obj );
-int        wxCondition_WaitFor( TSelf(wxCondition) _obj, int sec, int nsec );
-
-/* wxConfigBase */
-TClassDef(wxConfigBase)
-TClass(wxConfigBase) wxConfigBase_Create(  );
-void       wxConfigBase_Delete( TSelf(wxConfigBase) _obj );
-TBool      wxConfigBase_DeleteAll( TSelf(wxConfigBase) _obj );
-TBool      wxConfigBase_DeleteEntry( TSelf(wxConfigBase) _obj, TStringVoid key, TBoolInt bDeleteGroupIfEmpty );
-TBool      wxConfigBase_DeleteGroup( TSelf(wxConfigBase) _obj, TStringVoid key );
-TBool      wxConfigBase_Exists( TSelf(wxConfigBase) _obj, TStringVoid strName );
-TStringLen wxConfigBase_ExpandEnvVars( TSelf(wxConfigBase) _obj, TStringVoid str, TStringOutVoid _buf );
-TBool      wxConfigBase_Flush( TSelf(wxConfigBase) _obj, TBool bCurrentOnly );
-TStringLen wxConfigBase_GetAppName( TSelf(wxConfigBase) _obj, TStringOutVoid _buf );
-int        wxConfigBase_GetEntryType( TSelf(wxConfigBase) _obj, TStringVoid name );
-TClass(wxString) wxConfigBase_GetFirstEntry( TSelf(wxConfigBase) _obj, void* lIndex );
-TClass(wxString) wxConfigBase_GetFirstGroup( TSelf(wxConfigBase) _obj, void* lIndex );
-TClass(wxString) wxConfigBase_GetNextEntry( TSelf(wxConfigBase) _obj, void* lIndex);
-TClass(wxString) wxConfigBase_GetNextGroup( TSelf(wxConfigBase) _obj, void* lIndex);
-int        wxConfigBase_GetNumberOfEntries( TSelf(wxConfigBase) _obj, TBoolInt bRecursive );
-int        wxConfigBase_GetNumberOfGroups( TSelf(wxConfigBase) _obj, TBoolInt bRecursive );
-TStringLen wxConfigBase_GetPath( TSelf(wxConfigBase) _obj, TStringOutVoid _buf );
-int        wxConfigBase_GetStyle( TSelf(wxConfigBase) _obj );
-TStringLen wxConfigBase_GetVendorName( TSelf(wxConfigBase) _obj, TStringOutVoid _buf );
-TBool      wxConfigBase_HasEntry( TSelf(wxConfigBase) _obj, TStringVoid strName );
-TBool      wxConfigBase_HasGroup( TSelf(wxConfigBase) _obj, TStringVoid strName );
-TBool      wxConfigBase_IsExpandingEnvVars( TSelf(wxConfigBase) _obj );
-TBool      wxConfigBase_IsRecordingDefaults( TSelf(wxConfigBase) _obj );
-TBoolInt   wxConfigBase_ReadBool( TSelf(wxConfigBase) _obj, TStringVoid key, TBoolInt defVal );
-double     wxConfigBase_ReadDouble( TSelf(wxConfigBase) _obj, TStringVoid key, double defVal );
-int        wxConfigBase_ReadInteger( TSelf(wxConfigBase) _obj, TStringVoid key, int defVal );
-TClass(wxString) wxConfigBase_ReadString( TSelf(wxConfigBase) _obj, TStringVoid key, TStringVoid defVal );
-TBoolInt   wxConfigBase_RenameEntry( TSelf(wxConfigBase) _obj, TStringVoid oldName, TStringVoid newName );
-TBoolInt   wxConfigBase_RenameGroup( TSelf(wxConfigBase) _obj, TStringVoid oldName, TStringVoid newName );
-void       wxConfigBase_SetAppName( TSelf(wxConfigBase) _obj, TStringVoid appName );
-void       wxConfigBase_SetExpandEnvVars( TSelf(wxConfigBase) _obj, TBoolInt bDoIt );
-void       wxConfigBase_SetPath( TSelf(wxConfigBase) _obj, TStringVoid strPath );
-void       wxConfigBase_SetRecordDefaults( TSelf(wxConfigBase) _obj, TBoolInt bDoIt );
-void       wxConfigBase_SetStyle( TSelf(wxConfigBase) _obj, int style );
-void       wxConfigBase_SetVendorName( TSelf(wxConfigBase) _obj, TStringVoid vendorName );
-TBoolInt   wxConfigBase_WriteBool( TSelf(wxConfigBase) _obj, TStringVoid key, TBoolInt value );
-TBoolInt   wxConfigBase_WriteDouble( TSelf(wxConfigBase) _obj, TStringVoid key, double value );
-TBoolInt   wxConfigBase_WriteInteger( TSelf(wxConfigBase) _obj, TStringVoid key, int value );
-TBoolInt   wxConfigBase_WriteString( TSelf(wxConfigBase) _obj, TStringVoid key, TStringVoid value );
-
-/* wxConnection */
-TClassDefExtend(wxConnection,wxConnectionBase)
-
-/* wxConnectionBase */
-TClassDefExtend(wxConnectionBase,wxObject)
-
-/* wxContextHelp */
-TClassDefExtend(wxContextHelp,wxObject)
-int        wxContextHelp_BeginContextHelp( TSelf(wxContextHelp) _obj, TClass(wxWindow) win );
-TClass(wxContextHelp) wxContextHelp_Create( TClass(wxWindow) win, int beginHelp );
-void       wxContextHelp_Delete( TSelf(wxContextHelp) _obj );
-int        wxContextHelp_EndContextHelp( TSelf(wxContextHelp) _obj );
-
-/* wxContextHelpButton */
-TClassDefExtend(wxContextHelpButton,wxBitmapButton)
-TClass(wxContextHelpButton) wxContextHelpButton_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), long style );
-
-/* wxControl */
-TClassDefExtend(wxControl,wxWindow)
-void       wxControl_Command( TSelf(wxControl) _obj, TClass(wxEvent) event );
-TStringLen wxControl_GetLabel( TSelf(wxControl) _obj, TStringOutVoid _buf );
-void       wxControl_SetLabel( TSelf(wxControl) _obj, TString text );
-
-/* wxCountingOutputStream */
-TClassDefExtend(wxCountingOutputStream,wxOutputStream)
-
-/* wxCriticalSection */
-TClassDef(wxCriticalSection)
-TClass(wxCriticalSection) wxCriticalSection_Create(  );
-void       wxCriticalSection_Delete( TSelf(wxCriticalSection) _obj );
-void       wxCriticalSection_Enter( TSelf(wxCriticalSection) _obj );
-void       wxCriticalSection_Leave( TSelf(wxCriticalSection) _obj );
-
-/* wxCriticalSectionLocker */
-TClassDef(wxCriticalSectionLocker)
-
-/* wxCursor */
-TClassDefExtend(wxCursor,wxBitmap)
-TClass(wxCursor)  Cursor_CreateFromStock( int _id );
-TClass(wxCursor)  Cursor_CreateFromImage( TClass(wxImage) image );
-TClass(wxCursor)  Cursor_CreateLoad( TStringVoid name, long type, TSize(width,height) );
-
-/* wxCustomDataObject */
-TClassDefExtend(wxCustomDataObject,wxDataObjectSimple)
-
-/* wxDC */
-TClassDefExtend(wxDC,wxObject)
-void       wxDC_BeginDrawing( TSelf(wxDC) _obj );
-int        wxDC_Blit( TSelf(wxDC) _obj, TRect(xdest,ydest,width,height), TClass(wxDC) source, TPoint(xsrc,ysrc), int rop, TBool useMask );
-void       wxDC_CalcBoundingBox( TSelf(wxDC) _obj, TPoint(x,y) );
-TBool      wxDC_CanDrawBitmap( TSelf(wxDC) _obj );
-TBool      wxDC_CanGetTextExtent( TSelf(wxDC) _obj );
-void       wxDC_Clear( TSelf(wxDC) _obj );
-void       wxDC_CrossHair( TSelf(wxDC) _obj, TPoint(x,y) );
-void       wxDC_Delete( TSelf(wxDC) _obj );
-void       wxDC_DestroyClippingRegion( TSelf(wxDC) _obj );
-int        wxDC_DeviceToLogicalX( TSelf(wxDC) _obj, int x );
-int        wxDC_DeviceToLogicalXRel( TSelf(wxDC) _obj, int x );
-int        wxDC_DeviceToLogicalY( TSelf(wxDC) _obj, int y );
-int        wxDC_DeviceToLogicalYRel( TSelf(wxDC) _obj, int y );
-void       wxDC_DrawArc( TSelf(wxDC) _obj, TPoint(x1,y1), TPoint(x2,y2), TPoint(xc,yc) );
-void       wxDC_DrawBitmap( TSelf(wxDC) _obj, TClass(wxBitmap) bmp, TPoint(x,y), TBool useMask );
-void       wxDC_DrawCheckMark( TSelf(wxDC) _obj, TRect(x,y,width,height) );
-void       wxDC_DrawCircle( TSelf(wxDC) _obj, TPoint(x,y), int radius );
-void       wxDC_DrawEllipse( TSelf(wxDC) _obj, TRect(x,y,width,height) );
-void       wxDC_DrawEllipticArc( TSelf(wxDC) _obj, TRect(x,y,w,h), double sa, double ea );
-void       wxDC_DrawIcon( TSelf(wxDC) _obj, TClass(wxIcon) icon, TPoint(x,y) );
-void       wxDC_DrawLine( TSelf(wxDC) _obj, TPoint(x1,y1), TPoint(x2,y2) );
-void       wxDC_DrawLines( TSelf(wxDC) _obj, int n, void* x, void* y, TPoint(xoffset,yoffset) );
-void       wxDC_DrawPoint( TSelf(wxDC) _obj, TPoint(x,y) );
-void       wxDC_DrawPolygon( TSelf(wxDC) _obj, int n, void* x, void* y, TPoint(xoffset,yoffset), int fillStyle );
-void       wxDC_DrawRectangle( TSelf(wxDC) _obj, TRect(x,y,width,height) );
-void       wxDC_DrawRotatedText( TSelf(wxDC) _obj, TStringVoid text, TPoint(x,y), double angle );
-void       wxDC_DrawRoundedRectangle( TSelf(wxDC) _obj, TRect(x,y,width,height), double radius );
-void       wxDC_DrawText( TSelf(wxDC) _obj, TStringVoid text, TPoint(x,y) );
-void       wxDC_EndDoc( TSelf(wxDC) _obj );
-void       wxDC_EndDrawing( TSelf(wxDC) _obj );
-void       wxDC_EndPage( TSelf(wxDC) _obj );
-void       wxDC_FloodFill( TSelf(wxDC) _obj, TPoint(x,y), TClass(wxColour) col, int style );
-void       wxDC_GetBackground( TSelf(wxDC) _obj, TClassRef(wxBrush) _ref );
-int        wxDC_GetBackgroundMode( TSelf(wxDC) _obj );
-void       wxDC_GetBrush( TSelf(wxDC) _obj, TClassRef(wxBrush) _ref );
-int        wxDC_GetCharHeight( TSelf(wxDC) _obj );
-int        wxDC_GetCharWidth( TSelf(wxDC) _obj );
-void       wxDC_GetClippingBox( TSelf(wxDC) _obj, TRectOutVoid(_x,_y,_w,_h) );
-int        wxDC_GetDepth( TSelf(wxDC) _obj );
-void       wxDC_GetDeviceOrigin( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) );
-void       wxDC_GetFont( TSelf(wxDC) _obj, TClassRef(wxFont) _ref );
-int        wxDC_GetLogicalFunction( TSelf(wxDC) _obj );
-void       wxDC_GetLogicalOrigin( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) );
-void       wxDC_GetLogicalScale( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) );
-int        wxDC_GetMapMode( TSelf(wxDC) _obj );
-void       wxDC_GetPPI( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );
-void       wxDC_GetPen( TSelf(wxDC) _obj, TClassRef(wxPen) _ref );
-TBoolInt   wxDC_GetPixel( TSelf(wxDC) _obj, TPoint(x,y), TClass(wxColour) col );
-void       wxDC_GetSize( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );
-void       wxDC_GetSizeMM( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );
-void       wxDC_GetTextBackground( TSelf(wxDC) _obj, TClassRef(wxColour) _ref );
-void       wxDC_GetTextExtent( TSelf(wxDC) _obj, TStringVoid string, void* x, void* y, void* descent, void* externalLeading, TClass(wxFont) theFont );
-void       wxDC_GetTextForeground( TSelf(wxDC) _obj, TClassRef(wxColour) _ref );
-void       wxDC_GetUserScale( TSelf(wxDC) _obj, void* x, void* y );
-int        wxDC_LogicalToDeviceX( TSelf(wxDC) _obj, int x );
-int        wxDC_LogicalToDeviceXRel( TSelf(wxDC) _obj, int x );
-int        wxDC_LogicalToDeviceY( TSelf(wxDC) _obj, int y );
-int        wxDC_LogicalToDeviceYRel( TSelf(wxDC) _obj, int y );
-int        wxDC_MaxX( TSelf(wxDC) _obj );
-int        wxDC_MaxY( TSelf(wxDC) _obj );
-int        wxDC_MinX( TSelf(wxDC) _obj );
-int        wxDC_MinY( TSelf(wxDC) _obj );
-TBool      wxDC_Ok( TSelf(wxDC) _obj );
-void       wxDC_ResetBoundingBox( TSelf(wxDC) _obj );
-void       wxDC_SetAxisOrientation( TSelf(wxDC) _obj, TBoolInt xLeftRight, TBoolInt yBottomUp );
-void       wxDC_SetBackground( TSelf(wxDC) _obj, TClass(wxBrush) brush );
-void       wxDC_SetBackgroundMode( TSelf(wxDC) _obj, int mode );
-void       wxDC_SetBrush( TSelf(wxDC) _obj, TClass(wxBrush) brush );
-void       wxDC_SetClippingRegion( TSelf(wxDC) _obj, TRect(x,y,width,height) );
-void       wxDC_SetClippingRegionFromRegion( TSelf(wxDC) _obj, TClass(wxRegion) region );
-void       wxDC_SetDeviceOrigin( TSelf(wxDC) _obj, TPoint(x,y) );
-void       wxDC_SetFont( TSelf(wxDC) _obj, TClass(wxFont) font );
-void       wxDC_SetLogicalFunction( TSelf(wxDC) _obj, int function );
-void       wxDC_SetLogicalOrigin( TSelf(wxDC) _obj, TPoint(x,y) );
-void       wxDC_SetLogicalScale( TSelf(wxDC) _obj, double x, double y );
-void       wxDC_SetMapMode( TSelf(wxDC) _obj, int mode );
-void       wxDC_SetPalette( TSelf(wxDC) _obj, TClass(wxPalette) palette );
-void       wxDC_SetPen( TSelf(wxDC) _obj, TClass(wxPen) pen );
-void       wxDC_SetTextBackground( TSelf(wxDC) _obj, TClass(wxColour) colour );
-void       wxDC_SetTextForeground( TSelf(wxDC) _obj, TClass(wxColour) colour );
-void       wxDC_SetUserScale( TSelf(wxDC) _obj, double x, double y );
-int        wxDC_StartDoc( TSelf(wxDC) _obj, TStringVoid msg );
-void       wxDC_StartPage( TSelf(wxDC) _obj );
-
-/* wxDCClipper */
-TClassDef(wxDCClipper)
-
-/* wxDDEClient */
-TClassDefExtend(wxDDEClient,wxClientBase)
-
-/* wxDDEConnection */
-TClassDefExtend(wxDDEConnection,wxConnectionBase)
-
-/* wxDDEServer */
-TClassDefExtend(wxDDEServer,wxServerBase)
-
-/* wxDataFormat */
-TClassDef(wxDataFormat)
-TClass(wxDataFormat) wxDataFormat_CreateFromId( TStringVoid name );
-TClass(wxDataFormat) wxDataFormat_CreateFromType( int typ );
-void       wxDataFormat_Delete( TSelf(wxDataFormat) _obj );
-TStringLen wxDataFormat_GetId( TSelf(wxDataFormat) _obj, TStringOutVoid _buf );
-int        wxDataFormat_GetType( TSelf(wxDataFormat) _obj );
-TBool      wxDataFormat_IsEqual( TSelf(wxDataFormat) _obj, void* other );
-void       wxDataFormat_SetId( TSelf(wxDataFormat) _obj, void* id );
-void       wxDataFormat_SetType( TSelf(wxDataFormat) _obj, int typ );
-
-/* wxDataInputStream */
-TClassDef(wxDataInputStream)
-
-/* wxDataObject */
-TClassDef(wxDataObject)
-
-/* wxDataObjectComposite */
-TClassDefExtend(wxDataObjectComposite,wxDataObject)
-void       wxDataObjectComposite_Add( TSelf(wxDataObjectComposite) _obj, void* _dat, int _preferred );
-TClass(wxDataObjectComposite) wxDataObjectComposite_Create(  );
-void       wxDataObjectComposite_Delete( TSelf(wxDataObjectComposite) _obj );
-
-/* wxDataObjectSimple */
-TClassDefExtend(wxDataObjectSimple,wxDataObject)
-
-/* wxDataOutputStream */
-TClassDef(wxDataOutputStream)
-
-/* wxDatabase */
-TClassDefExtend(wxDatabase,wxObject)
-
-/* wxDateTime */
-TClassDef(wxDateTime)
-void       wxDateTime_AddDate( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
-void       wxDateTime_AddDateValues( TSelf(wxDateTime) _obj, int _yrs, int _mnt, int _wek, int _day );
-void       wxDateTime_AddTime( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
-void       wxDateTime_AddTimeValues( TSelf(wxDateTime) _obj, int _hrs, int _min, int _sec, int _mls );
-int        wxDateTime_ConvertYearToBC( int year );
-TClass(wxDateTime) wxDateTime_Create(  );
-TStringLen wxDateTime_Format( TSelf(wxDateTime) _obj, void* format, int tz, TStringOutVoid _buf );
-TStringLen wxDateTime_FormatDate( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
-TStringLen wxDateTime_FormatISODate( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
-TStringLen wxDateTime_FormatISOTime( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
-TStringLen wxDateTime_FormatTime( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
-TStringLen wxDateTime_GetAmString( TStringOutVoid _buf );
-void       wxDateTime_GetBeginDST( int year, int country, TClass(wxDateTime) dt );
-int        wxDateTime_GetCentury( int year );
-int        wxDateTime_GetCountry(  );
-int        wxDateTime_GetCurrentMonth( int cal );
-int        wxDateTime_GetCurrentYear( int cal );
-int        wxDateTime_GetDay( TSelf(wxDateTime) _obj, int tz );
-int        wxDateTime_GetDayOfYear( TSelf(wxDateTime) _obj, int tz );
-void       wxDateTime_GetEndDST( int year, int country, TClass(wxDateTime) dt );
-int        wxDateTime_GetHour( TSelf(wxDateTime) _obj, int tz );
-void       wxDateTime_GetLastMonthDay( TSelf(wxDateTime) _obj, int month, int year, TClassRef(wxDateTime) _ref );
-void       wxDateTime_GetLastWeekDay( TSelf(wxDateTime) _obj, int weekday, int month, int year, TClassRef(wxDateTime) _ref );
-int        wxDateTime_GetMillisecond( TSelf(wxDateTime) _obj, int tz );
-int        wxDateTime_GetMinute( TSelf(wxDateTime) _obj, int tz );
-int        wxDateTime_GetMonth( TSelf(wxDateTime) _obj, int tz );
-TStringLen wxDateTime_GetMonthName( int month, int flags, TStringOutVoid _buf );
-void       wxDateTime_GetNextWeekDay( TSelf(wxDateTime) _obj, int weekday, TClassRef(wxDateTime) _ref );
-int        wxDateTime_GetNumberOfDays( int year, int cal );
-int        wxDateTime_GetNumberOfDaysMonth( int month, int year, int cal );
-TStringLen wxDateTime_GetPmString( TStringOutVoid _buf );
-void       wxDateTime_GetPrevWeekDay( TSelf(wxDateTime) _obj, int weekday, TClassRef(wxDateTime) _ref );
-int        wxDateTime_GetSecond( TSelf(wxDateTime) _obj, int tz );
-time_t     wxDateTime_GetTicks( TSelf(wxDateTime) _obj );
-int        wxDateTime_GetTimeNow(  );
-void       wxDateTime_GetValue( TSelf(wxDateTime) _obj, void* hi_long, void* lo_long );
-void       wxDateTime_GetWeekDay( TSelf(wxDateTime) _obj, int weekday, int n, int month, int year, TClassRef(wxDateTime) _ref );
-void       wxDateTime_GetWeekDayInSameWeek( TSelf(wxDateTime) _obj, int weekday, TClassRef(wxDateTime) _ref );
-TStringLen wxDateTime_GetWeekDayName( int weekday, int flags, TStringOutVoid _buf );
-int        wxDateTime_GetWeekDayTZ( TSelf(wxDateTime) _obj, int tz );
-int        wxDateTime_GetWeekOfMonth( TSelf(wxDateTime) _obj, int flags, int tz );
-int        wxDateTime_GetWeekOfYear( TSelf(wxDateTime) _obj, int flags, int tz );
-int        wxDateTime_GetYear( TSelf(wxDateTime) _obj, int tz );
-TBool      wxDateTime_IsBetween( TSelf(wxDateTime) _obj, TClass(wxDateTime) t1, TClass(wxDateTime) t2 );
-TBool      wxDateTime_IsDST( TSelf(wxDateTime) _obj, int country );
-TBool      wxDateTime_IsDSTApplicable( int year, int country );
-TBool      wxDateTime_IsEarlierThan( TSelf(wxDateTime) _obj, void* datetime );
-TBool      wxDateTime_IsEqualTo( TSelf(wxDateTime) _obj, void* datetime );
-TBool      wxDateTime_IsEqualUpTo( TSelf(wxDateTime) _obj, TClass(wxDateTime) dt, void* ts );
-TBool      wxDateTime_IsGregorianDate( TSelf(wxDateTime) _obj, int country );
-TBool      wxDateTime_IsLaterThan( TSelf(wxDateTime) _obj, void* datetime );
-TBool      wxDateTime_IsLeapYear( int year, int cal );
-TBool      wxDateTime_IsSameDate( TSelf(wxDateTime) _obj, TClass(wxDateTime) dt );
-TBool      wxDateTime_IsSameTime( TSelf(wxDateTime) _obj, TClass(wxDateTime) dt );
-TBool      wxDateTime_IsStrictlyBetween( TSelf(wxDateTime) _obj, TClass(wxDateTime) t1, TClass(wxDateTime) t2 );
-TBool      wxDateTime_IsValid( TSelf(wxDateTime) _obj );
-TBool      wxDateTime_IsWestEuropeanCountry( int country );
-TBool      wxDateTime_IsWorkDay( TSelf(wxDateTime) _obj, int country );
-void       wxDateTime_MakeGMT( TSelf(wxDateTime) _obj, int noDST );
-void       wxDateTime_MakeTimezone( TSelf(wxDateTime) _obj, int tz, int noDST );
-void       wxDateTime_Now( TSelf(wxDateTime) dt );
-void*      wxDateTime_ParseDate( TSelf(wxDateTime) _obj, void* date );
-void*      wxDateTime_ParseDateTime( TSelf(wxDateTime) _obj, void* datetime );
-void*      wxDateTime_ParseFormat( TSelf(wxDateTime) _obj, void* date, void* format, void* dateDef );
-void*      wxDateTime_ParseRfc822Date( TSelf(wxDateTime) _obj, void* date );
-void*      wxDateTime_ParseTime( TSelf(wxDateTime) _obj, TClass(wxTime) time );
-void       wxDateTime_ResetTime( TSelf(wxDateTime) _obj );
-void       wxDateTime_Set( TSelf(wxDateTime) _obj, int day, int month, int year, int hour, int minute, int second, int millisec );
-void       wxDateTime_SetCountry( int country );
-void       wxDateTime_SetDay( TSelf(wxDateTime) _obj, int day );
-void       wxDateTime_SetHour( TSelf(wxDateTime) _obj, int hour );
-void       wxDateTime_SetMillisecond( TSelf(wxDateTime) _obj, int millisecond );
-void       wxDateTime_SetMinute( TSelf(wxDateTime) _obj, int minute );
-void       wxDateTime_SetMonth( TSelf(wxDateTime) _obj, int month );
-void       wxDateTime_SetSecond( TSelf(wxDateTime) _obj, int second );
-void       wxDateTime_SetTime( TSelf(wxDateTime) _obj, int hour, int minute, int second, int millisec );
-void       wxDateTime_SetToCurrent( TSelf(wxDateTime) _obj );
-void       wxDateTime_SetToLastMonthDay( TSelf(wxDateTime) _obj, int month, int year );
-int        wxDateTime_SetToLastWeekDay( TSelf(wxDateTime) _obj, int weekday, int month, int year );
-void       wxDateTime_SetToNextWeekDay( TSelf(wxDateTime) _obj, int weekday );
-void       wxDateTime_SetToPrevWeekDay( TSelf(wxDateTime) _obj, int weekday );
-int        wxDateTime_SetToWeekDay( TSelf(wxDateTime) _obj, int weekday, int n, int month, int year );
-void       wxDateTime_SetToWeekDayInSameWeek( TSelf(wxDateTime) _obj, int weekday );
-void       wxDateTime_SetYear( TSelf(wxDateTime) _obj, int year );
-void       wxDateTime_SubtractDate( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
-void       wxDateTime_SubtractTime( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
-void       wxDateTime_ToGMT( TSelf(wxDateTime) _obj, int noDST );
-void       wxDateTime_ToTimezone( TSelf(wxDateTime) _obj, int tz, int noDST );
-void       wxDateTime_Today( TSelf(wxDateTime) dt );
-void       wxDateTime_UNow( TSelf(wxDateTime) dt );
-void*      wxDateTime_wxDateTime( int hi_long, int lo_long );
-
-/* wxDb */
-TClassDef(wxDb)
-
-/* wxDbColDef */
-TClassDef(wxDbColDef)
-
-/* wxDbColFor */
-TClassDef(wxDbColFor)
-
-/* wxDbColInf */
-TClassDef(wxDbColInf)
-
-/* wxDbConnectInf */
-TClassDef(wxDbConnectInf)
-
-/* wxDbInf */
-TClassDef(wxDbInf)
-
-/* wxDbSqlTypeInfo */
-TClassDef(wxDbSqlTypeInfo)
-
-/* wxDbTable */
-TClassDef(wxDbTable)
-
-/* wxDbTableInfo */
-TClassDef(wxDbTableInfo)
-
-/* wxDebugContext */
-TClassDef(wxDebugContext)
-
-/* wxDialUpEvent */
-TClassDefExtend(wxDialUpEvent,wxEvent)
-TBool      wxDialUpEvent_IsConnectedEvent( TSelf(wxDialUpEvent) _obj );
-TBool      wxDialUpEvent_IsOwnEvent( TSelf(wxDialUpEvent) _obj );
-
-/* wxDialUpManager */
-TClassDef(wxDialUpManager)
-TBool      wxDialUpManager_CancelDialing( TSelf(wxDialUpManager) _obj );
-TClass(wxDialUpManager) wxDialUpManager_Create(  );
-void       wxDialUpManager_Delete( TSelf(wxDialUpManager) _obj );
-int        wxDialUpManager_Dial( TSelf(wxDialUpManager) _obj, void* nameOfISP, void* username, void* password, int async );
-void       wxDialUpManager_DisableAutoCheckOnlineStatus( TSelf(wxDialUpManager) _obj );
-int        wxDialUpManager_EnableAutoCheckOnlineStatus( TSelf(wxDialUpManager) _obj, int nSeconds );
-int        wxDialUpManager_GetISPNames( TSelf(wxDialUpManager) _obj, TClass(wxList) _lst );
-int        wxDialUpManager_HangUp( TSelf(wxDialUpManager) _obj );
-TBool      wxDialUpManager_IsAlwaysOnline( TSelf(wxDialUpManager) _obj );
-TBool      wxDialUpManager_IsDialing( TSelf(wxDialUpManager) _obj );
-TBool      wxDialUpManager_IsOk( TSelf(wxDialUpManager) _obj );
-TBool      wxDialUpManager_IsOnline( TSelf(wxDialUpManager) _obj );
-void       wxDialUpManager_SetConnectCommand( TSelf(wxDialUpManager) _obj, void* commandDial, void* commandHangup );
-void       wxDialUpManager_SetOnlineStatus( TSelf(wxDialUpManager) _obj, TBool isOnline );
-void       wxDialUpManager_SetWellKnownHost( TSelf(wxDialUpManager) _obj, void* hostname, int portno );
-
-/* wxDialog */
-TClassDefExtend(wxDialog,wxWindow)
-TClass(wxDialog) wxDialog_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxDialog_EndModal( TSelf(wxDialog) _obj, int retCode );
-int        wxDialog_GetReturnCode( TSelf(wxDialog) _obj );
-TBool      wxDialog_IsModal( TSelf(wxDialog) _obj );
-void       wxDialog_SetIcons( TSelf(wxDialog) _obj, void* _icons );
-void       wxDialog_SetReturnCode( TSelf(wxDialog) _obj, int returnCode );
-int        wxDialog_ShowModal( TSelf(wxDialog) _obj );
-
-/* wxDirDialog */
-TClassDefExtend(wxDirDialog,wxDialog)
-TClass(wxDirDialog) wxDirDialog_Create( TClass(wxWindow) _prt, TStringVoid _msg, TStringVoid _dir, TPoint(_lft,_top), int _stl );
-TStringLen wxDirDialog_GetMessage( TSelf(wxDirDialog) _obj, TStringOutVoid _buf );
-TStringLen wxDirDialog_GetPath( TSelf(wxDirDialog) _obj, TStringOutVoid _buf );
-int        wxDirDialog_GetStyle( TSelf(wxDirDialog) _obj );
-void       wxDirDialog_SetMessage( TSelf(wxDirDialog) _obj, TStringVoid msg );
-void       wxDirDialog_SetPath( TSelf(wxDirDialog) _obj, TStringVoid pth );
-void       wxDirDialog_SetStyle( TSelf(wxDirDialog) _obj, int style );
-
-/* wxDirTraverser */
-TClassDef(wxDirTraverser)
-
-/* wxDllLoader */
-TClassDef(wxDllLoader)
-/*
-void*      wxDllLoader_GetSymbol( int _handle, TStringVoid _name );
-int        wxDllLoader_LoadLibrary( TStringVoid _name, void* _success );
-void       wxDllLoader_UnloadLibrary( int _handle );
-*/
-
-/* wxDocChildFrame */
-TClassDefExtend(wxDocChildFrame,wxFrame)
-
-/* wxDocMDIChildFrame */
-TClassDefExtend(wxDocMDIChildFrame,wxMDIChildFrame)
-
-/* wxDocMDIParentFrame */
-TClassDefExtend(wxDocMDIParentFrame,wxMDIParentFrame)
-
-/* wxDocManager */
-TClassDefExtend(wxDocManager,wxEvtHandler)
-
-/* wxDocParentFrame */
-TClassDefExtend(wxDocParentFrame,wxFrame)
-
-/* wxDocTemplate */
-TClassDefExtend(wxDocTemplate,wxObject)
-
-/* wxDocument */
-TClassDefExtend(wxDocument,wxEvtHandler)
-
-/* wxDragImage */
-TClassDefExtend(wxDragImage,wxObject)
-
-/* wxDrawControl */
-TClassDefExtend(wxDrawControl,wxControl)
-TClass(wxDrawControl) wxDrawControl_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-
-/* wxDrawWindow */
-TClassDefExtend(wxDrawWindow,wxWindow)
-TClass(wxDrawWindow) wxDrawWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-
-/* wxDropFilesEvent */
-TClassDefExtend(wxDropFilesEvent,wxEvent)
-
-/* wxDropSource */
-TClassDef(wxDropSource)
-TClass(wxDropSource) DropSource_Create( TClass(wxDataObject) data, TClass(wxWindow) win, void* copy, void* move, void* none );
-void       DropSource_Delete( TSelf(wxDropSource) _obj );
-int        DropSource_DoDragDrop( TSelf(wxDropSource) _obj, int _move );
-
-/* wxDropTarget */
-TClassDef(wxDropTarget)
-void       wxDropTarget_GetData( TSelf(wxDropTarget) _obj );
-void       wxDropTarget_SetDataObject( TSelf(wxDropTarget) _obj, TClass(wxDataObject) _dat );
-
-/* wxDynToolInfo */
-TClassDefExtend(wxDynToolInfo,wxToolLayoutItem)
-int        wxDynToolInfo_Index( TSelf(wxDynToolInfo) _obj );
-void       wxDynToolInfo_RealSize( TSelf(wxDynToolInfo) _obj, TSizeOutVoid(_w,_h) );
-void*      wxDynToolInfo_pToolWnd( TSelf(wxDynToolInfo) _obj );
-
-/* wxDynamicLibrary */
-TClassDef(wxDynamicLibrary)
-
-/* wxDynamicSashWindow */
-TClassDefExtend(wxDynamicSashWindow,wxWindow)
-TClass(wxDynamicSashWindow) wxDynamicSashWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
-void       wxDynamicSashWindow_Delete( TSelf(wxDynamicSashWindow) _obj );
-void*      wxDynamicSashWindow_GetHScrollBar( TSelf(wxDynamicSashWindow) _obj, TClass(wxWindow) child );
-void*      wxDynamicSashWindow_GetVScrollBar( TSelf(wxDynamicSashWindow) _obj, TClass(wxWindow) child );
-
-/* wxDynamicToolBar */
-TClassDefExtend(wxDynamicToolBar,wxToolBarBase)
-void       wxDynamicToolBar_AddSeparator( TSelf(wxDynamicToolBar) _obj, void* pSepartorWnd );
-void       wxDynamicToolBar_AddTool( TSelf(wxDynamicToolBar) _obj, int toolIndex, void* pToolWindow, TSize(w,h) );
-void*      wxDynamicToolBar_AddToolBitmap( TSelf(wxDynamicToolBar) _obj, int toolIndex, TClass(wxBitmap) bitmap, void* pushedBitmap, int toggle, TPoint(x,y), TClass(wxClientData) clientData, void* helpString1, void* helpString2 );
-void       wxDynamicToolBar_AddToolImage( TSelf(wxDynamicToolBar) _obj, int toolIndex, void* imageFileName, int imageFileType, void* labelText, int alignTextRight, TBool isFlat );
-void       wxDynamicToolBar_AddToolLabel( TSelf(wxDynamicToolBar) _obj, int toolIndex, void* labelBmp, void* labelText, int alignTextRight, TBool isFlat );
-TClass(wxDynamicToolBar) wxDynamicToolBar_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style, int orientation, int RowsOrColumns );
-TClass(wxDynamicToolBar) wxDynamicToolBar_CreateDefault(  );
-void*      wxDynamicToolBar_CreateDefaultLayout( TSelf(wxDynamicToolBar) _obj );
-int        wxDynamicToolBar_CreateParams( TSelf(wxDynamicToolBar) _obj, TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style, int orientation, int RowsOrColumns );
-void*      wxDynamicToolBar_CreateTool( TSelf(wxDynamicToolBar) _obj, int id, void* label, void* bmpNormal, void* bmpDisabled, int kind, TClass(wxClientData) clientData, void* shortHelp, void* longHelp );
-void*      wxDynamicToolBar_CreateToolControl( TSelf(wxDynamicToolBar) _obj, TClass(wxControl) control );
-void       wxDynamicToolBar_Delete( TSelf(wxDynamicToolBar) _obj );
-int        wxDynamicToolBar_DoDeleteTool( TSelf(wxDynamicToolBar) _obj, int pos, void* tool );
-void       wxDynamicToolBar_DoEnableTool( TSelf(wxDynamicToolBar) _obj, void* tool, TBool enable );
-int        wxDynamicToolBar_DoInsertTool( TSelf(wxDynamicToolBar) _obj, int pos, void* tool );
-void       wxDynamicToolBar_DoSetToggle( TSelf(wxDynamicToolBar) _obj, void* tool, int toggle );
-void       wxDynamicToolBar_DoToggleTool( TSelf(wxDynamicToolBar) _obj, void* tool, int toggle );
-void       wxDynamicToolBar_DrawSeparator( TSelf(wxDynamicToolBar) _obj, void* info, TClass(wxDC) dc );
-void       wxDynamicToolBar_EnableTool( TSelf(wxDynamicToolBar) _obj, int toolIndex, TBool enable );
-void*      wxDynamicToolBar_FindToolForPosition( TSelf(wxDynamicToolBar) _obj, TPoint(x,y) );
-void       wxDynamicToolBar_GetPreferredDim( TSelf(wxDynamicToolBar) _obj, int gw, int gh, void* pw, void* ph );
-void*      wxDynamicToolBar_GetToolInfo( TSelf(wxDynamicToolBar) _obj, int toolIndex );
-int        wxDynamicToolBar_Layout( TSelf(wxDynamicToolBar) _obj );
-void       wxDynamicToolBar_RemoveTool( TSelf(wxDynamicToolBar) _obj, int toolIndex );
-void       wxDynamicToolBar_SetLayout( TSelf(wxDynamicToolBar) _obj, void* pLayout );
-
-/* wxEditableListBox */
-TClassDefExtend(wxEditableListBox,wxPanel)
-TClass(wxEditableListBox) wxEditableListBox_Create( TClass(wxWindow) parent, int id, TStringVoid label, TRect(x,y,w,h), int style );
-void*      wxEditableListBox_GetDelButton( TSelf(wxEditableListBox) _obj );
-void*      wxEditableListBox_GetDownButton( TSelf(wxEditableListBox) _obj );
-void*      wxEditableListBox_GetEditButton( TSelf(wxEditableListBox) _obj );
-TClass(wxListCtrl) wxEditableListBox_GetListCtrl( TSelf(wxEditableListBox) _obj );
-void*      wxEditableListBox_GetNewButton( TSelf(wxEditableListBox) _obj );
-TArrayLen  wxEditableListBox_GetStrings( TSelf(wxEditableListBox) _obj, TArrayStringOutVoid _ref );
-void*      wxEditableListBox_GetUpButton( TSelf(wxEditableListBox) _obj );
-void       wxEditableListBox_SetStrings( TSelf(wxEditableListBox) _obj, void* strings, int _n );
-
-/* wxEncodingConverter */
-TClassDefExtend(wxEncodingConverter,wxObject)
-void       wxEncodingConverter_Convert( TSelf(wxEncodingConverter) _obj, void* input, void* output );
-TClass(wxEncodingConverter) wxEncodingConverter_Create(  );
-void       wxEncodingConverter_Delete( TSelf(wxEncodingConverter) _obj );
-int        wxEncodingConverter_GetAllEquivalents( TSelf(wxEncodingConverter) _obj, int enc, TClass(wxList) _lst );
-int        wxEncodingConverter_GetPlatformEquivalents( TSelf(wxEncodingConverter) _obj, int enc, int platform, TClass(wxList) _lst );
-int        wxEncodingConverter_Init( TSelf(wxEncodingConverter) _obj, int input_enc, int output_enc, int method );
-
-/* wxEraseEvent */
-TClassDefExtend(wxEraseEvent,wxEvent)
-void       wxEraseEvent_CopyObject( TSelf(wxEraseEvent) _obj, void* obj );
-TClass(wxDC) wxEraseEvent_GetDC( TSelf(wxEraseEvent) _obj );
-
-/* wxEvent */
-TClassDefExtend(wxEvent,wxObject)
-void       wxEvent_CopyObject( TSelf(wxEvent) _obj, void* object_dest );
-TClass(wxObject) wxEvent_GetEventObject( TSelf(wxEvent) _obj );
-int        wxEvent_GetEventType( TSelf(wxEvent) _obj );
-int        wxEvent_GetId( TSelf(wxEvent) _obj );
-TBool      wxEvent_GetSkipped( TSelf(wxEvent) _obj );
-int        wxEvent_GetTimestamp( TSelf(wxEvent) _obj );
-TBool      wxEvent_IsCommandEvent( TSelf(wxEvent) _obj );
-int        wxEvent_NewEventType(  );
-void       wxEvent_SetEventObject( TSelf(wxEvent) _obj, TClass(wxObject) obj );
-void       wxEvent_SetEventType( TSelf(wxEvent) _obj, int typ );
-void       wxEvent_SetId( TSelf(wxEvent) _obj, int Id );
-void       wxEvent_SetTimestamp( TSelf(wxEvent) _obj, int ts );
-void       wxEvent_Skip( TSelf(wxEvent) _obj );
-
-/* wxEvtHandler */
-TClassDefExtend(wxEvtHandler,wxObject)
-void       wxEvtHandler_AddPendingEvent( TSelf(wxEvtHandler) _obj, TClass(wxEvent) event );
-int        wxEvtHandler_Connect( TSelf(wxEvtHandler) _obj, int first, int last, int type, void* data );
-TClass(wxEvtHandler) wxEvtHandler_Create(  );
-void       wxEvtHandler_Delete( TSelf(wxEvtHandler) _obj );
-int        wxEvtHandler_Disconnect( TSelf(wxEvtHandler) _obj, int first, int last, int type, int id );
-TBool      wxEvtHandler_GetEvtHandlerEnabled( TSelf(wxEvtHandler) _obj );
-TClass(wxEvtHandler) wxEvtHandler_GetNextHandler( TSelf(wxEvtHandler) _obj );
-TClass(wxEvtHandler) wxEvtHandler_GetPreviousHandler( TSelf(wxEvtHandler) _obj );
-int        wxEvtHandler_ProcessEvent( TSelf(wxEvtHandler) _obj, TClass(wxEvent) event );
-void       wxEvtHandler_ProcessPendingEvents( TSelf(wxEvtHandler) _obj );
-void       wxEvtHandler_SetEvtHandlerEnabled( TSelf(wxEvtHandler) _obj, TBool enabled );
-void       wxEvtHandler_SetNextHandler( TSelf(wxEvtHandler) _obj, TClass(wxEvtHandler) handler );
-void       wxEvtHandler_SetPreviousHandler( TSelf(wxEvtHandler) _obj, TClass(wxEvtHandler) handler );
-
-/* wxExpr */
-TClassDef(wxExpr)
-
-/* wxExprDatabase */
-TClassDefExtend(wxExprDatabase,wxList)
-
-/* wxFFile */
-TClassDef(wxFFile)
-
-/* wxFFileInputStream */
-TClassDefExtend(wxFFileInputStream,wxInputStream)
-
-/* wxFFileOutputStream */
-TClassDefExtend(wxFFileOutputStream,wxOutputStream)
-
-/* wxFSFile */
-TClassDefExtend(wxFSFile,wxObject)
-
-/* wxFTP */
-TClassDefExtend(wxFTP,wxProtocol)
-
-/* wxFileDataObject */
-TClassDefExtend(wxFileDataObject,wxDataObjectSimple)
-void       FileDataObject_AddFile( TSelf(wxFileDataObject) _obj, TStringVoid _fle );
-TClass(wxFileDataObject) FileDataObject_Create( TArrayString(_cnt, _lst) );
-void       FileDataObject_Delete( TSelf(wxFileDataObject) _obj );
-TArrayLen        FileDataObject_GetFilenames( TSelf(wxFileDataObject) _obj, TArrayStringOutVoid _lst );
-
-/* wxFileDialog */
-TClassDefExtend(wxFileDialog,wxDialog)
-TClass(wxFileDialog) wxFileDialog_Create( TClass(wxWindow) _prt, TStringVoid _msg, TStringVoid _dir, TStringVoid _fle, TStringVoid _wcd, TPoint(_lft,_top), int _stl );
-TStringLen wxFileDialog_GetDirectory( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
-TStringLen wxFileDialog_GetFilename( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
-TArrayLen  wxFileDialog_GetFilenames( TSelf(wxFileDialog) _obj, TArrayStringOutVoid paths );
-int        wxFileDialog_GetFilterIndex( TSelf(wxFileDialog) _obj );
-TStringLen wxFileDialog_GetMessage( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
-TStringLen wxFileDialog_GetPath( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
-TArrayLen  wxFileDialog_GetPaths( TSelf(wxFileDialog) _obj, TArrayStringOutVoid paths );
-int        wxFileDialog_GetStyle( TSelf(wxFileDialog) _obj );
-TStringLen wxFileDialog_GetWildcard( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
-void       wxFileDialog_SetDirectory( TSelf(wxFileDialog) _obj, TStringVoid dir );
-void       wxFileDialog_SetFilename( TSelf(wxFileDialog) _obj, TStringVoid name );
-void       wxFileDialog_SetFilterIndex( TSelf(wxFileDialog) _obj, int filterIndex );
-void       wxFileDialog_SetMessage( TSelf(wxFileDialog) _obj, TStringVoid message );
-void       wxFileDialog_SetPath( TSelf(wxFileDialog) _obj, TStringVoid path );
-void       wxFileDialog_SetStyle( TSelf(wxFileDialog) _obj, int style );
-void       wxFileDialog_SetWildcard( TSelf(wxFileDialog) _obj, TStringVoid wildCard );
-
-/* wxFileDropTarget */
-TClassDefExtend(wxFileDropTarget,wxDropTarget)
-
-/* wxFileHistory */
-TClassDefExtend(wxFileHistory,wxObject)
-void       wxFileHistory_AddFileToHistory( TSelf(wxFileHistory) _obj, TStringVoid file );
-void       wxFileHistory_AddFilesToMenu( TSelf(wxFileHistory) _obj, TClass(wxMenu) menu );
-TClass(wxFileHistory) wxFileHistory_Create( int maxFiles );
-void       wxFileHistory_Delete( TSelf(wxFileHistory) _obj );
-int        wxFileHistory_GetCount( TSelf(wxFileHistory) _obj );
-TStringLen wxFileHistory_GetHistoryFile( TSelf(wxFileHistory) _obj, int i, TStringOutVoid _buf );
-int        wxFileHistory_GetMaxFiles( TSelf(wxFileHistory) _obj );
-TArrayLen  wxFileHistory_GetMenus( TSelf(wxFileHistory) _obj, TArrayObjectOutVoid(wxMenu) _ref );
-void       wxFileHistory_Load( TSelf(wxFileHistory) _obj, TClass(wxConfigBase) config );
-void       wxFileHistory_RemoveFileFromHistory( TSelf(wxFileHistory) _obj, int i );
-void       wxFileHistory_RemoveMenu( TSelf(wxFileHistory) _obj, TClass(wxMenu) menu );
-void       wxFileHistory_Save( TSelf(wxFileHistory) _obj, TClass(wxConfigBase) config );
-void       wxFileHistory_UseMenu( TSelf(wxFileHistory) _obj, TClass(wxMenu) menu );
-
-/* wxFileInputStream */
-TClassDefExtend(wxFileInputStream,wxInputStream)
-
-/* wxFileName */
-TClassDef(wxFileName)
-
-/* wxFileOutputStream */
-TClassDefExtend(wxFileOutputStream,wxOutputStream)
-
-/* wxFileSystem */
-TClassDefExtend(wxFileSystem,wxObject)
-
-/* wxFileSystemHandler */
-TClassDefExtend(wxFileSystemHandler,wxObject)
-
-/* wxFileType */
-TClassDef(wxFileType)
-void       wxFileType_Delete( TSelf(wxFileType) _obj );
-TStringLen wxFileType_ExpandCommand( TSelf(wxFileType) _obj, void* _cmd, void* _params, TStringOutVoid _buf );
-TStringLen wxFileType_GetDescription( TSelf(wxFileType) _obj, TStringOutVoid _buf );
-int        wxFileType_GetExtensions( TSelf(wxFileType) _obj, TClass(wxList) _lst );
-int        wxFileType_GetIcon( TSelf(wxFileType) _obj, TClass(wxIcon) icon );
-TStringLen wxFileType_GetMimeType( TSelf(wxFileType) _obj, TStringOutVoid _buf );
-int        wxFileType_GetMimeTypes( TSelf(wxFileType) _obj, TClass(wxList) _lst );
-int        wxFileType_GetOpenCommand( TSelf(wxFileType) _obj, void* _buf, void* _params );
-int        wxFileType_GetPrintCommand( TSelf(wxFileType) _obj, void* _buf, void* _params );
-
-/* wxFilterInputStream */
-TClassDefExtend(wxFilterInputStream,wxInputStream)
-
-/* wxFilterOutputStream */
-TClassDefExtend(wxFilterOutputStream,wxOutputStream)
-
-/* wxFindDialogEvent */
-TClassDefExtend(wxFindDialogEvent,wxCommandEvent)
-int        wxFindDialogEvent_GetFindString( TSelf(wxFindDialogEvent) _obj, void* _ref );
-int        wxFindDialogEvent_GetFlags( TSelf(wxFindDialogEvent) _obj );
-int        wxFindDialogEvent_GetReplaceString( TSelf(wxFindDialogEvent) _obj, void* _ref );
-
-/* wxFindReplaceData */
-TClassDefExtend(wxFindReplaceData,wxObject)
-TClass(wxFindReplaceData) wxFindReplaceData_Create( int flags );
-TClass(wxFindReplaceData) wxFindReplaceData_CreateDefault(  );
-void       wxFindReplaceData_Delete( TSelf(wxFindReplaceData) _obj );
-TStringLen wxFindReplaceData_GetFindString( TSelf(wxFindReplaceData) _obj, TStringOutVoid _ref );
-int        wxFindReplaceData_GetFlags( TSelf(wxFindReplaceData) _obj );
-TStringLen wxFindReplaceData_GetReplaceString( TSelf(wxFindReplaceData) _obj, TStringOutVoid _ref );
-void       wxFindReplaceData_SetFindString( TSelf(wxFindReplaceData) _obj, TStringVoid str );
-void       wxFindReplaceData_SetFlags( TSelf(wxFindReplaceData) _obj, int flags );
-void       wxFindReplaceData_SetReplaceString( TSelf(wxFindReplaceData) _obj, TStringVoid str );
-
-/* wxFindReplaceDialog */
-TClassDefExtend(wxFindReplaceDialog,wxDialog)
-TClass(wxFindReplaceDialog) wxFindReplaceDialog_Create( TClass(wxWindow) parent, TClass(wxFindReplaceData) data, TStringVoid title, int style );
-TClass(wxFindReplaceData)   wxFindReplaceDialog_GetData( TSelf(wxFindReplaceDialog) _obj );
-void       wxFindReplaceDialog_SetData( TSelf(wxFindReplaceDialog) _obj, TClass(wxFindReplaceData) data );
-
-/* wxFlexGridSizer */
-TClassDefExtend(wxFlexGridSizer,wxGridSizer)
-void       wxFlexGridSizer_AddGrowableCol( TSelf(wxFlexGridSizer) _obj, size_t idx );
-void       wxFlexGridSizer_AddGrowableRow( TSelf(wxFlexGridSizer) _obj, size_t idx );
-void       wxFlexGridSizer_CalcMin( TSelf(wxFlexGridSizer) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxFlexGridSizer) wxFlexGridSizer_Create( int rows, int cols, int vgap, int hgap );
-void       wxFlexGridSizer_RecalcSizes( TSelf(wxFlexGridSizer) _obj );
-void       wxFlexGridSizer_RemoveGrowableCol( TSelf(wxFlexGridSizer) _obj, size_t idx );
-void       wxFlexGridSizer_RemoveGrowableRow( TSelf(wxFlexGridSizer) _obj, size_t idx );
-
-/* wxFocusEvent */
-TClassDefExtend(wxFocusEvent,wxEvent)
-
-/* wxFont */
-TClassDefExtend(wxFont,wxGDIObject)
-TClass(wxFont) wxFont_Create( int pointSize, int family, int style, int weight, int underlined, TString face, int enc );
-TClass(wxFont) wxFont_CreateDefault(  );
-void       wxFont_Delete( TSelf(wxFont) _obj );
-int        wxFont_GetDefaultEncoding( TSelf(wxFont) _obj );
-int        wxFont_GetEncoding( TSelf(wxFont) _obj );
-TStringLen wxFont_GetFaceName( TSelf(wxFont) _obj, TStringOutVoid _buf );
-int        wxFont_GetFamily( TSelf(wxFont) _obj );
-TStringLen wxFont_GetFamilyString( TSelf(wxFont) _obj, TStringOutVoid _buf );
-int        wxFont_GetPointSize( TSelf(wxFont) _obj );
-int        wxFont_GetStyle( TSelf(wxFont) _obj );
-TStringLen wxFont_GetStyleString( TSelf(wxFont) _obj, TStringOutVoid _buf );
-int        wxFont_GetUnderlined( TSelf(wxFont) _obj );
-int        wxFont_GetWeight( TSelf(wxFont) _obj );
-TStringLen wxFont_GetWeightString( TSelf(wxFont) _obj, TStringOutVoid _buf );
-TBool      wxFont_Ok( TSelf(wxFont) _obj );
-void       wxFont_SetDefaultEncoding( TSelf(wxFont) _obj, int encoding );
-void       wxFont_SetEncoding( TSelf(wxFont) _obj, int encoding );
-void       wxFont_SetFaceName( TSelf(wxFont) _obj, TString faceName );
-void       wxFont_SetFamily( TSelf(wxFont) _obj, int family );
-void       wxFont_SetPointSize( TSelf(wxFont) _obj, int pointSize );
-void       wxFont_SetStyle( TSelf(wxFont) _obj, int style );
-void       wxFont_SetUnderlined( TSelf(wxFont) _obj, int underlined );
-void       wxFont_SetWeight( TSelf(wxFont) _obj, int weight );
-
-/* wxFontData */
-TClassDefExtend(wxFontData,wxObject)
-TClass(wxFontData) wxFontData_Create(  );
-void       wxFontData_Delete( TSelf(wxFontData) _obj );
-void       wxFontData_EnableEffects( TSelf(wxFontData) _obj, TBool flag );
-TBool      wxFontData_GetAllowSymbols( TSelf(wxFontData) _obj );
-void       wxFontData_GetChosenFont( TSelf(wxFontData) _obj, TClassRef(wxFont) ref );
-void       wxFontData_GetColour( TSelf(wxFontData) _obj, TClassRef(wxColour) _ref );
-TBool      wxFontData_GetEnableEffects( TSelf(wxFontData) _obj );
-int        wxFontData_GetEncoding( TSelf(wxFontData) _obj );
-void       wxFontData_GetInitialFont( TSelf(wxFontData) _obj, TClassRef(wxFont) ref );
-int        wxFontData_GetShowHelp( TSelf(wxFontData) _obj );
-void       wxFontData_SetAllowSymbols( TSelf(wxFontData) _obj, TBool flag );
-void       wxFontData_SetChosenFont( TSelf(wxFontData) _obj, TClass(wxFont) font );
-void       wxFontData_SetColour( TSelf(wxFontData) _obj, TClass(wxColour) colour );
-void       wxFontData_SetEncoding( TSelf(wxFontData) _obj, int encoding );
-void       wxFontData_SetInitialFont( TSelf(wxFontData) _obj, TClass(wxFont) font );
-void       wxFontData_SetRange( TSelf(wxFontData) _obj, int minRange, int maxRange );
-void       wxFontData_SetShowHelp( TSelf(wxFontData) _obj, TBool flag );
-
-/* wxFontDialog */
-TClassDefExtend(wxFontDialog,wxDialog)
-TClass(wxFontDialog) wxFontDialog_Create( TClass(wxWindow) _prt, TClass(wxFontData) fnt );
-void       wxFontDialog_GetFontData( TSelf(wxFontDialog) _obj, TClassRef(wxFontData) _ref );
-
-/* wxFontEnumerator */
-TClassDef(wxFontEnumerator)
-TClass(wxFontEnumerator) wxFontEnumerator_Create( void* _obj, void* _fnc );
-void       wxFontEnumerator_Delete( TSelf(wxFontEnumerator) _obj );
-int        wxFontEnumerator_EnumerateEncodings( TSelf(wxFontEnumerator) _obj, TStringVoid facename );
-int        wxFontEnumerator_EnumerateFacenames( TSelf(wxFontEnumerator) _obj, int encoding, int fixedWidthOnly );
-
-/* wxFontList */
-TClassDefExtend(wxFontList,wxList)
-
-/* wxFontMapper */
-TClassDef(wxFontMapper)
-TClass(wxFontMapper) wxFontMapper_Create(  );
-TStringLen wxFontMapper_GetAltForEncoding( TSelf(wxFontMapper) _obj, int encoding, void* alt_encoding, TStringOutVoid _buf );
-TStringLen wxFontMapper_IsEncodingAvailable( TSelf(wxFontMapper) _obj, int encoding, TStringOutVoid _buf );
-
-/* wxFrame */
-TClassDefExtend(wxFrame,wxWindow)
-TClass(wxFrame) wxFrame_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-TClass(wxStatusBar) wxFrame_CreateStatusBar( TSelf(wxFrame) _obj, int number, int style );
-TClass(wxToolBar)   wxFrame_CreateToolBar( TSelf(wxFrame) _obj, long style );
-int        wxFrame_GetClientAreaOrigin_left( TSelf(wxFrame) _obj );
-int        wxFrame_GetClientAreaOrigin_top( TSelf(wxFrame) _obj );
-TClass(wxIcon) wxFrame_GetIcon( TSelf(wxFrame) _obj );
-TClass(wxMenuBar) wxFrame_GetMenuBar( TSelf(wxFrame) _obj );
-TClass(wxStatusBar) wxFrame_GetStatusBar( TSelf(wxFrame) _obj );
-TClass(wxToolBar) wxFrame_GetToolBar( TSelf(wxFrame) _obj );
-void       wxFrame_Iconize( TSelf(wxFrame) _obj );
-TBool      wxFrame_IsIconized( TSelf(wxFrame) _obj );
-TBool      wxFrame_IsMaximized( TSelf(wxFrame) _obj );
-void       wxFrame_Maximize( TSelf(wxFrame) _obj );
-void       wxFrame_Restore( TSelf(wxFrame) _obj );
-void       wxFrame_SetIcon( TSelf(wxFrame) _obj, TClass(wxIcon) _icon );
-void       wxFrame_SetIcons( TSelf(wxFrame) _obj, void* _icons );
-void       wxFrame_SetMenuBar( TSelf(wxFrame) _obj, TClass(wxMenuBar) menubar );
-void       wxFrame_SetStatusBar( TSelf(wxFrame) _obj, TClass(wxStatusBar) statBar );
-void       wxFrame_SetStatusText( TSelf(wxFrame) _obj, TString _txt, int _number );
-void       wxFrame_SetStatusWidths( TSelf(wxFrame) _obj, int _n, void* _widths_field );
-void       wxFrame_SetToolBar( TSelf(wxFrame) _obj, TClass(wxToolBar) _toolbar );
-
-/* wxFrameLayout */
-TClassDefExtend(wxFrameLayout,wxEvtHandler)
-void       wxFrameLayout_Activate( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_AddBar( TSelf(wxFrameLayout) _obj, void* pBarWnd, void* dimInfo, int alignment, int rowNo, int columnPos, TStringVoid name, int spyEvents, int state );
-void       wxFrameLayout_AddPlugin( TSelf(wxFrameLayout) _obj, void* pPlInfo, int paneMask );
-void       wxFrameLayout_AddPluginBefore( TSelf(wxFrameLayout) _obj, void* pNextPlInfo, void* pPlInfo, int paneMask );
-void       wxFrameLayout_ApplyBarProperties( TSelf(wxFrameLayout) _obj, void* pBar );
-void       wxFrameLayout_CaptureEventsForPane( TSelf(wxFrameLayout) _obj, void* toPane );
-void       wxFrameLayout_CaptureEventsForPlugin( TSelf(wxFrameLayout) _obj, void* pPlugin );
-TClass(wxFrameLayout) wxFrameLayout_Create( void* pParentFrame, void* pFrameClient, int activateNow );
-void       wxFrameLayout_Deactivate( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_Delete( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_DestroyBarWindows( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_EnableFloating( TSelf(wxFrameLayout) _obj, TBool enable );
-void*      wxFrameLayout_FindBarByName( TSelf(wxFrameLayout) _obj, TStringVoid name );
-void*      wxFrameLayout_FindBarByWindow( TSelf(wxFrameLayout) _obj, void* pWnd );
-void*      wxFrameLayout_FindPlugin( TSelf(wxFrameLayout) _obj, void* pPlInfo );
-void       wxFrameLayout_FirePluginEvent( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-int        wxFrameLayout_GetBars( TSelf(wxFrameLayout) _obj, void* _ref );
-int        wxFrameLayout_GetClientHeight( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_GetClientRect( TSelf(wxFrameLayout) _obj, TRectOutVoid(_x,_y,_w,_h) );
-int        wxFrameLayout_GetClientWidth( TSelf(wxFrameLayout) _obj );
-void*      wxFrameLayout_GetFrameClient( TSelf(wxFrameLayout) _obj );
-void*      wxFrameLayout_GetPane( TSelf(wxFrameLayout) _obj, int alignment );
-void       wxFrameLayout_GetPaneProperties( TSelf(wxFrameLayout) _obj, void* props, int alignment );
-void*      wxFrameLayout_GetParentFrame( TSelf(wxFrameLayout) _obj );
-void*      wxFrameLayout_GetTopPlugin( TSelf(wxFrameLayout) _obj );
-void*      wxFrameLayout_GetUpdatesManager( TSelf(wxFrameLayout) _obj );
-TBool      wxFrameLayout_HasTopPlugin( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_HideBarWindows( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_InverseVisibility( TSelf(wxFrameLayout) _obj, void* pBar );
-void       wxFrameLayout_OnLButtonDown( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-void       wxFrameLayout_OnLButtonUp( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-void       wxFrameLayout_OnLDblClick( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-void       wxFrameLayout_OnMouseMove( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-void       wxFrameLayout_OnRButtonDown( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-void       wxFrameLayout_OnRButtonUp( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-void       wxFrameLayout_OnSize( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
-void       wxFrameLayout_PopAllPlugins( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_PopPlugin( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_PushDefaultPlugins( TSelf(wxFrameLayout) _obj );
-void       wxFrameLayout_PushPlugin( TSelf(wxFrameLayout) _obj, void* pPugin );
-void       wxFrameLayout_RecalcLayout( TSelf(wxFrameLayout) _obj, int repositionBarsNow );
-int        wxFrameLayout_RedockBar( TSelf(wxFrameLayout) _obj, void* pBar, TRect(x,y,w,h), void* pToPane, int updateNow );
-void       wxFrameLayout_RefreshNow( TSelf(wxFrameLayout) _obj, int recalcLayout );
-void       wxFrameLayout_ReleaseEventsFromPane( TSelf(wxFrameLayout) _obj, void* fromPane );
-void       wxFrameLayout_ReleaseEventsFromPlugin( TSelf(wxFrameLayout) _obj, void* pPlugin );
-void       wxFrameLayout_RemoveBar( TSelf(wxFrameLayout) _obj, void* pBar );
-void       wxFrameLayout_RemovePlugin( TSelf(wxFrameLayout) _obj, void* pPlInfo );
-void       wxFrameLayout_SetBarState( TSelf(wxFrameLayout) _obj, void* pBar, int newStatem, int updateNow );
-void       wxFrameLayout_SetFrameClient( TSelf(wxFrameLayout) _obj, void* pFrameClient );
-void       wxFrameLayout_SetMargins( TSelf(wxFrameLayout) _obj, int top, int bottom, int left, int right, int paneMask );
-void       wxFrameLayout_SetPaneBackground( TSelf(wxFrameLayout) _obj, TClass(wxColour) colour );
-void       wxFrameLayout_SetPaneProperties( TSelf(wxFrameLayout) _obj, void* props, int paneMask );
-void       wxFrameLayout_SetTopPlugin( TSelf(wxFrameLayout) _obj, void* pPlugin );
-void       wxFrameLayout_SetUpdatesManager( TSelf(wxFrameLayout) _obj, void* pUMgr );
-
-/* wxGDIObject */
-TClassDefExtend(wxGDIObject,wxObject)
-
-/* wxGLCanvas */
-TClassDefExtend(wxGLCanvas,wxScrolledWindow)
-
-/* wxGauge */
-TClassDefExtend(wxGauge,wxControl)
-TClass(wxGauge) wxGauge_Create( TClass(wxWindow) _prt, int _id, int _rng, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxGauge_GetBezelFace( TSelf(wxGauge) _obj );
-int        wxGauge_GetRange( TSelf(wxGauge) _obj );
-int        wxGauge_GetShadowWidth( TSelf(wxGauge) _obj );
-int        wxGauge_GetValue( TSelf(wxGauge) _obj );
-void       wxGauge_SetBezelFace( TSelf(wxGauge) _obj, int w );
-void       wxGauge_SetRange( TSelf(wxGauge) _obj, int r );
-void       wxGauge_SetShadowWidth( TSelf(wxGauge) _obj, int w );
-void       wxGauge_SetValue( TSelf(wxGauge) _obj, int pos );
-
-/* wxGenericDirCtrl */
-TClassDefExtend(wxGenericDirCtrl,wxControl)
-
-/* wxGenericValidator */
-TClassDefExtend(wxGenericValidator,wxValidator)
-
-/* wxGrid */
-TClassDefExtend(wxGrid,wxScrolledWindow)
-TBoolInt   wxGrid_AppendCols( TSelf(wxGrid) _obj, int numCols, TBoolInt updateLabels );
-TBoolInt   wxGrid_AppendRows( TSelf(wxGrid) _obj, int numRows, TBoolInt updateLabels );
-void       wxGrid_AutoSize( TSelf(wxGrid) _obj );
-void       wxGrid_AutoSizeColumn( TSelf(wxGrid) _obj, int col, TBoolInt setAsMin );
-void       wxGrid_AutoSizeColumns( TSelf(wxGrid) _obj, TBoolInt setAsMin );
-void       wxGrid_AutoSizeRow( TSelf(wxGrid) _obj, int row, TBoolInt setAsMin );
-void       wxGrid_AutoSizeRows( TSelf(wxGrid) _obj, TBoolInt setAsMin );
-void       wxGrid_BeginBatch( TSelf(wxGrid) _obj );
-void       wxGrid_BlockToDeviceRect( TSelf(wxGrid) _obj, int top, int left, int bottom, int right, TRectOut(_x,_y,_w,_h) );
-void       wxGrid_CalcCellsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg );
-void       wxGrid_CalcColLabelsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg );
-void       wxGrid_CalcRowLabelsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg );
-TBool      wxGrid_CanDragColSize( TSelf(wxGrid) _obj );
-TBool      wxGrid_CanDragGridSize( TSelf(wxGrid) _obj );
-TBool      wxGrid_CanDragRowSize( TSelf(wxGrid) _obj );
-TBool      wxGrid_CanEnableCellControl( TSelf(wxGrid) _obj );
-void       wxGrid_CellToRect( TSelf(wxGrid) _obj, int row, int col, TRectOut(_x,_y,_w,_h) );
-void       wxGrid_ClearGrid( TSelf(wxGrid) _obj );
-void       wxGrid_ClearSelection( TSelf(wxGrid) _obj );
-TClass(wxGrid) wxGrid_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxGrid_CreateGrid( TSelf(wxGrid) _obj, int rows, int cols, int selmode );
-TBoolInt   wxGrid_DeleteCols( TSelf(wxGrid) _obj, int pos, int numCols, TBoolInt updateLabels );
-TBoolInt   wxGrid_DeleteRows( TSelf(wxGrid) _obj, int pos, int numRows, TBoolInt updateLabels );
-void       wxGrid_DisableCellEditControl( TSelf(wxGrid) _obj );
-void       wxGrid_DisableDragColSize( TSelf(wxGrid) _obj );
-void       wxGrid_DisableDragGridSize( TSelf(wxGrid) _obj );
-void       wxGrid_DisableDragRowSize( TSelf(wxGrid) _obj );
-void       wxGrid_DoEndDragResizeCol( TSelf(wxGrid) _obj );
-void       wxGrid_DoEndDragResizeRow( TSelf(wxGrid) _obj );
-void       wxGrid_DrawAllGridLines( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxRegion) reg );
-void       wxGrid_DrawCell( TSelf(wxGrid) _obj, TClass(wxDC) dc, int _row, int _col );
-void       wxGrid_DrawCellBorder( TSelf(wxGrid) _obj, TClass(wxDC) dc, int _row, int _col );
-void       wxGrid_DrawCellHighlight( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxGridCellAttr) attr );
-void       wxGrid_DrawColLabel( TSelf(wxGrid) _obj, TClass(wxDC) dc, int col );
-void       wxGrid_DrawColLabels( TSelf(wxGrid) _obj, TClass(wxDC) dc );
-void       wxGrid_DrawGridCellArea( TSelf(wxGrid) _obj, TClass(wxDC) dc );
-void       wxGrid_DrawGridSpace( TSelf(wxGrid) _obj, TClass(wxDC) dc );
-void       wxGrid_DrawHighlight( TSelf(wxGrid) _obj, TClass(wxDC) dc );
-void       wxGrid_DrawRowLabel( TSelf(wxGrid) _obj, TClass(wxDC) dc, int row );
-void       wxGrid_DrawRowLabels( TSelf(wxGrid) _obj, TClass(wxDC) dc );
-void       wxGrid_DrawTextRectangle( TSelf(wxGrid) _obj, TClass(wxDC) dc, TString txt, TRect(x,y,w,h), int horizontalAlignment, int verticalAlignment );
-void       wxGrid_EnableCellEditControl( TSelf(wxGrid) _obj, TBool enable );
-void       wxGrid_EnableDragColSize( TSelf(wxGrid) _obj, TBool enable );
-void       wxGrid_EnableDragGridSize( TSelf(wxGrid) _obj, TBool enable );
-void       wxGrid_EnableDragRowSize( TSelf(wxGrid) _obj, TBool enable );
-void       wxGrid_EnableEditing( TSelf(wxGrid) _obj, TBoolInt edit );
-void       wxGrid_EnableGridLines( TSelf(wxGrid) _obj, TBool enable );
-void       wxGrid_EndBatch( TSelf(wxGrid) _obj );
-int        wxGrid_GetBatchCount( TSelf(wxGrid) _obj );
-void       wxGrid_GetCellAlignment( TSelf(wxGrid) _obj, int row, int col, TSizeOut(horiz, vert) );
-void       wxGrid_GetCellBackgroundColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
-TClass(wxGridCellEditor) wxGrid_GetCellEditor( TSelf(wxGrid) _obj, int row, int col );
-void       wxGrid_GetCellFont( TSelf(wxGrid) _obj, int row, int col, TClass(wxFont) font );
-void       wxGrid_GetCellHighlightColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-TClass(wxGridCellRenderer) wxGrid_GetCellRenderer( TSelf(wxGrid) _obj, int row, int col );
-void       wxGrid_GetCellTextColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
-TStringLen wxGrid_GetCellValue( TSelf(wxGrid) _obj, int row, int col, TStringOutVoid _buf );
-void       wxGrid_GetColLabelAlignment( TSelf(wxGrid) _obj, TSizeOut(horiz, vert)  );
-int        wxGrid_GetColLabelSize( TSelf(wxGrid) _obj );
-TStringLen wxGrid_GetColLabelValue( TSelf(wxGrid) _obj, int col, TStringOutVoid _buf );
-int        wxGrid_GetColSize( TSelf(wxGrid) _obj, int col );
-void       wxGrid_GetDefaultCellAlignment( TSelf(wxGrid) _obj, TSizeOut(horiz, vert)  );
-void       wxGrid_GetDefaultCellBackgroundColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-void       wxGrid_GetDefaultCellFont( TSelf(wxGrid) _obj, TClassRef(wxFont) _ref );
-void       wxGrid_GetDefaultCellTextColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-int        wxGrid_GetDefaultColLabelSize( TSelf(wxGrid) _obj );
-int        wxGrid_GetDefaultColSize( TSelf(wxGrid) _obj );
-TClass(wxGridCellEditor) wxGrid_GetDefaultEditor( TSelf(wxGrid) _obj );
-TClass(wxGridCellEditor) wxGrid_GetDefaultEditorForCell( TSelf(wxGrid) _obj, int row, int col );
-TClass(wxGridCellEditor) wxGrid_GetDefaultEditorForType( TSelf(wxGrid) _obj, TString typeName );
-TClass(wxGridCellRenderer) wxGrid_GetDefaultRenderer( TSelf(wxGrid) _obj );
-TClass(wxGridCellRenderer) wxGrid_GetDefaultRendererForCell( TSelf(wxGrid) _obj, int row, int col );
-TClass(wxGridCellRenderer) wxGrid_GetDefaultRendererForType( TSelf(wxGrid) _obj, TString typeName );
-int        wxGrid_GetDefaultRowLabelSize( TSelf(wxGrid) _obj );
-int        wxGrid_GetDefaultRowSize( TSelf(wxGrid) _obj );
-int        wxGrid_GetGridCursorCol( TSelf(wxGrid) _obj );
-int        wxGrid_GetGridCursorRow( TSelf(wxGrid) _obj );
-void       wxGrid_GetGridLineColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-void       wxGrid_GetLabelBackgroundColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-void       wxGrid_GetLabelFont( TSelf(wxGrid) _obj, TClassRef(wxFont) _ref );
-void       wxGrid_GetLabelTextColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-int        wxGrid_GetNumberCols( TSelf(wxGrid) _obj );
-int        wxGrid_GetNumberRows( TSelf(wxGrid) _obj );
-void       wxGrid_GetRowLabelAlignment( TSelf(wxGrid) _obj, TSizeOut(horiz,vert) );
-int        wxGrid_GetRowLabelSize( TSelf(wxGrid) _obj );
-TStringLen wxGrid_GetRowLabelValue( TSelf(wxGrid) _obj, int row, TStringOutVoid _buf );
-int        wxGrid_GetRowSize( TSelf(wxGrid) _obj, int row );
-void       wxGrid_GetSelectionBackground( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-void       wxGrid_GetSelectionForeground( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
-TClass(wxGridTableBase) wxGrid_GetTable( TSelf(wxGrid) _obj );
-void       wxGrid_GetTextBoxSize( TSelf(wxGrid) _obj, TClass(wxDC) dc, TArrayString(count,lines), TSizeOutVoid(_w,_h) );
-int        wxGrid_GridLinesEnabled( TSelf(wxGrid) _obj );
-void       wxGrid_HideCellEditControl( TSelf(wxGrid) _obj );
-TBoolInt   wxGrid_InsertCols( TSelf(wxGrid) _obj, int pos, int numCols, TBoolInt updateLabels );
-TBoolInt   wxGrid_InsertRows( TSelf(wxGrid) _obj, int pos, int numRows, TBoolInt updateLabels );
-TBool      wxGrid_IsCellEditControlEnabled( TSelf(wxGrid) _obj );
-TBool      wxGrid_IsCellEditControlShown( TSelf(wxGrid) _obj );
-TBool      wxGrid_IsCurrentCellReadOnly( TSelf(wxGrid) _obj );
-TBool      wxGrid_IsEditable( TSelf(wxGrid) _obj );
-TBool      wxGrid_IsInSelection( TSelf(wxGrid) _obj, int row, int col );
-TBool      wxGrid_IsReadOnly( TSelf(wxGrid) _obj, int row, int col );
-TBool      wxGrid_IsSelection( TSelf(wxGrid) _obj );
-TBool      wxGrid_IsVisible( TSelf(wxGrid) _obj, int row, int col, TBoolInt wholeCellVisible );
-void       wxGrid_MakeCellVisible( TSelf(wxGrid) _obj, int row, int col );
-TBoolInt   wxGrid_MoveCursorDown( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MoveCursorDownBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MoveCursorLeft( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MoveCursorLeftBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MoveCursorRight( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MoveCursorRightBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MoveCursorUp( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MoveCursorUpBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
-TBoolInt   wxGrid_MovePageDown( TSelf(wxGrid) _obj );
-TBoolInt   wxGrid_MovePageUp( TSelf(wxGrid) _obj );
-void       wxGrid_ProcessColLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
-void       wxGrid_ProcessCornerLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
-void       wxGrid_ProcessGridCellMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
-void       wxGrid_ProcessRowLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
-int        wxGrid_ProcessTableMessage( TSelf(wxGrid) _obj, TClass(wxEvent) evt );
-void       wxGrid_RegisterDataType( TSelf(wxGrid) _obj, TString typeName, TClass(wxGridCellRenderer) renderer, TClass(wxGridCellEditor) editor );
-void       wxGrid_SaveEditControlValue( TSelf(wxGrid) _obj );
-void       wxGrid_SelectAll( TSelf(wxGrid) _obj );
-void       wxGrid_SelectBlock( TSelf(wxGrid) _obj, int topRow, int leftCol, int bottomRow, int rightCol, TBoolInt addToSelected );
-void       wxGrid_SelectCol( TSelf(wxGrid) _obj, int col, TBoolInt addToSelected );
-void       wxGrid_SelectRow( TSelf(wxGrid) _obj, int row, TBoolInt addToSelected );
-void       wxGrid_SetCellAlignment( TSelf(wxGrid) _obj, int row, int col, int horiz, int vert );
-void       wxGrid_SetCellBackgroundColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
-void       wxGrid_SetCellEditor( TSelf(wxGrid) _obj, int row, int col, TClass(wxGridCellEditor) editor );
-void       wxGrid_SetCellFont( TSelf(wxGrid) _obj, int row, int col, TClass(wxFont) font );
-void       wxGrid_SetCellHighlightColour( TSelf(wxGrid) _obj, TClass(wxColour) col );
-void       wxGrid_SetCellRenderer( TSelf(wxGrid) _obj, int row, int col, TClass(wxGridCellRenderer) renderer );
-void       wxGrid_SetCellTextColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
-void       wxGrid_SetCellValue( TSelf(wxGrid) _obj, int row, int col, TString s );
-void       wxGrid_SetColAttr( TSelf(wxGrid) _obj, int col, TClass(wxGridCellAttr) attr );
-void       wxGrid_SetColFormatBool( TSelf(wxGrid) _obj, int col );
-void       wxGrid_SetColFormatCustom( TSelf(wxGrid) _obj, int col, TString typeName );
-void       wxGrid_SetColFormatFloat( TSelf(wxGrid) _obj, int col, int width, int precision );
-void       wxGrid_SetColFormatNumber( TSelf(wxGrid) _obj, int col );
-void       wxGrid_SetColLabelAlignment( TSelf(wxGrid) _obj, int horiz, int vert );
-void       wxGrid_SetColLabelSize( TSelf(wxGrid) _obj, int height );
-void       wxGrid_SetColLabelValue( TSelf(wxGrid) _obj, int col, TString label );
-void       wxGrid_SetColMinimalWidth( TSelf(wxGrid) _obj, int col, int width );
-void       wxGrid_SetColSize( TSelf(wxGrid) _obj, int col, int width );
-void       wxGrid_SetDefaultCellAlignment( TSelf(wxGrid) _obj, int horiz, int vert );
-void       wxGrid_SetDefaultCellBackgroundColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
-void       wxGrid_SetDefaultCellFont( TSelf(wxGrid) _obj, TClass(wxFont) font );
-void       wxGrid_SetDefaultCellTextColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
-void       wxGrid_SetDefaultColSize( TSelf(wxGrid) _obj, int width, TBoolInt resizeExistingCols );
-void       wxGrid_SetDefaultEditor( TSelf(wxGrid) _obj, TClass(wxGridCellEditor) editor );
-void       wxGrid_SetDefaultRenderer( TSelf(wxGrid) _obj, TClass(wxGridCellRenderer) renderer );
-void       wxGrid_SetDefaultRowSize( TSelf(wxGrid) _obj, int height, TBoolInt resizeExistingRows );
-void       wxGrid_SetGridCursor( TSelf(wxGrid) _obj, int row, int col );
-void       wxGrid_SetGridLineColour( TSelf(wxGrid) _obj, TClass(wxColour) col );
-void       wxGrid_SetLabelBackgroundColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
-void       wxGrid_SetLabelFont( TSelf(wxGrid) _obj, TClass(wxFont) font );
-void       wxGrid_SetLabelTextColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
-void       wxGrid_SetMargins( TSelf(wxGrid) _obj, int extraWidth, int extraHeight );
-void       wxGrid_SetReadOnly( TSelf(wxGrid) _obj, int row, int col, TBool isReadOnly );
-void       wxGrid_SetRowAttr( TSelf(wxGrid) _obj, int row, TClass(wxGridCellAttr) attr );
-void       wxGrid_SetRowLabelAlignment( TSelf(wxGrid) _obj, int horiz, int vert );
-void       wxGrid_SetRowLabelSize( TSelf(wxGrid) _obj, int width );
-void       wxGrid_SetRowLabelValue( TSelf(wxGrid) _obj, int row, TString label );
-void       wxGrid_SetRowMinimalHeight( TSelf(wxGrid) _obj, int row, int width );
-void       wxGrid_SetRowSize( TSelf(wxGrid) _obj, int row, int height );
-void       wxGrid_SetSelectionBackground( TSelf(wxGrid) _obj, TClass(wxColour) c );
-void       wxGrid_SetSelectionForeground( TSelf(wxGrid) _obj, TClass(wxColour) c );
-void       wxGrid_SetSelectionMode( TSelf(wxGrid) _obj, int selmode );
-TBoolInt   wxGrid_SetTable( TSelf(wxGrid) _obj, TClass(wxGridTableBase) table, TBoolInt takeOwnership, int selmode );
-void       wxGrid_ShowCellEditControl( TSelf(wxGrid) _obj );
-int        wxGrid_StringToLines( TSelf(wxGrid) _obj, TStringVoid value, void* lines );
-int        wxGrid_XToCol( TSelf(wxGrid) _obj, int x );
-int        wxGrid_XToEdgeOfCol( TSelf(wxGrid) _obj, int x );
-void       wxGrid_XYToCell( TSelf(wxGrid) _obj, TPoint(x,y), TPointOut(row,col) );
-int        wxGrid_YToEdgeOfRow( TSelf(wxGrid) _obj, int y );
-int        wxGrid_YToRow( TSelf(wxGrid) _obj, int y );
-void       wxGrid_NewCalcCellsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg, TClassRef(wxGridCellCoordsArray) arr );
-void       wxGrid_NewDrawGridCellArea( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxGridCellCoordsArray) arr );
-void       wxGrid_NewDrawHighlight( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxGridCellCoordsArray) arr );
-void       wxGrid_GetSelectedCells(TSelf(wxGrid) _obj, TClassRef(wxGridCellCoordsArray) _arr);
-void       wxGrid_GetSelectionBlockTopLeft(TSelf(wxGrid) _obj, TClassRef(wxGridCellCoordsArray) _arr);
-void       wxGrid_GetSelectionBlockBottomRight(TSelf(wxGrid) _obj, TClassRef(wxGridCellCoordsArray) _arr);
-TArrayLen  wxGrid_GetSelectedRows(TSelf(wxGrid) _obj, TArrayIntOutVoid _arr);
-TArrayLen  wxGrid_GetSelectedCols(TSelf(wxGrid) _obj, TArrayIntOutVoid _arr);
-
-/* wxGridCellAttr */
-TClassDef(wxGridCellAttr)
-TClass(wxGridCellAttr)    wxGridCellAttr_Ctor(  );
-void       wxGridCellAttr_DecRef( TSelf(wxGridCellAttr) _obj );
-void       wxGridCellAttr_GetAlignment( TSelf(wxGridCellAttr) _obj, TSizeOut(hAlign, vAlign) );
-void       wxGridCellAttr_GetBackgroundColour( TSelf(wxGridCellAttr) _obj, TClassRef(wxColour) _ref );
-TClass(wxGridCellEditor) wxGridCellAttr_GetEditor( TSelf(wxGridCellAttr) _obj, TClass(wxGrid) grid, int row, int col );
-void       wxGridCellAttr_GetFont( TSelf(wxGridCellAttr) _obj, TClassRef(wxFont) _ref );
-TClass(wxGridCellRenderer)  wxGridCellAttr_GetRenderer( TSelf(wxGridCellAttr) _obj, TClass(wxGrid) grid, int row, int col );
-void       wxGridCellAttr_GetTextColour( TSelf(wxGridCellAttr) _obj, TClassRef(wxColour) _ref );
-TBool      wxGridCellAttr_HasAlignment( TSelf(wxGridCellAttr) _obj );
-TBool      wxGridCellAttr_HasBackgroundColour( TSelf(wxGridCellAttr) _obj );
-TBool      wxGridCellAttr_HasEditor( TSelf(wxGridCellAttr) _obj );
-TBool      wxGridCellAttr_HasFont( TSelf(wxGridCellAttr) _obj );
-TBool      wxGridCellAttr_HasRenderer( TSelf(wxGridCellAttr) _obj );
-TBool      wxGridCellAttr_HasTextColour( TSelf(wxGridCellAttr) _obj );
-void       wxGridCellAttr_IncRef( TSelf(wxGridCellAttr) _obj );
-TBool      wxGridCellAttr_IsReadOnly( TSelf(wxGridCellAttr) _obj );
-void       wxGridCellAttr_SetAlignment( TSelf(wxGridCellAttr) _obj, int hAlign, int vAlign );
-void       wxGridCellAttr_SetBackgroundColour( TSelf(wxGridCellAttr) _obj, TClass(wxColour) colBack );
-void       wxGridCellAttr_SetDefAttr( TSelf(wxGridCellAttr) _obj, TClass(wxGridCellAttr) defAttr );
-void       wxGridCellAttr_SetEditor( TSelf(wxGridCellAttr) _obj, TClass(wxGridCellEditor) editor );
-void       wxGridCellAttr_SetFont( TSelf(wxGridCellAttr) _obj, TClass(wxFont) font );
-void       wxGridCellAttr_SetReadOnly( TSelf(wxGridCellAttr) _obj, TBool isReadOnly );
-void       wxGridCellAttr_SetRenderer( TSelf(wxGridCellAttr) _obj, TClass(wxGridCellRenderer) renderer );
-void       wxGridCellAttr_SetTextColour( TSelf(wxGridCellAttr) _obj, TClass(wxColour) colText );
-
-/* wxGridCellBoolEditor */
-TClassDefExtend(wxGridCellBoolEditor,wxGridCellEditor)
-TClass(wxGridCellBoolEditor)   wxGridCellBoolEditor_Ctor(  );
-
-/* wxGridCellBoolRenderer */
-TClassDefExtend(wxGridCellBoolRenderer,wxGridCellRenderer)
-
-/* wxGridCellChoiceEditor */
-TClassDefExtend(wxGridCellChoiceEditor,wxGridCellEditor)
-TClass(wxGridCellChoiceEditor) wxGridCellChoiceEditor_Ctor( TArrayString(count,choices), TBoolInt allowOthers );
-
-/* wxGridCellCoordsArray */
-TClassDef(wxGridCellCoordsArray)
-TClass(wxGridCellCoordsArray) wxGridCellCoordsArray_Create();
-void       wxGridCellCoordsArray_Delete(TSelf(wxGridCellCoordsArray) _obj);
-int        wxGridCellCoordsArray_GetCount(TSelf(wxGridCellCoordsArray) _obj);
-void       wxGridCellCoordsArray_Item(TSelf(wxGridCellCoordsArray) _obj, int _idx, TPointOut(_c,_r));
-
-/* wxGridCellEditor */
-TClassDefExtend(wxGridCellEditor,wxGridCellWorker)
-void       wxGridCellEditor_BeginEdit( TSelf(wxGridCellEditor) _obj, int row, int col, TClass(wxGrid) grid );
-void       wxGridCellEditor_Create( TSelf(wxGridCellEditor) _obj, TClass(wxWindow) parent, int id, TClass(wxEvtHandler) evtHandler );
-void       wxGridCellEditor_Destroy( TSelf(wxGridCellEditor) _obj );
-int        wxGridCellEditor_EndEdit( TSelf(wxGridCellEditor) _obj, int row, int col, TClass(wxGrid) grid );
-TClass(wxControl) wxGridCellEditor_GetControl( TSelf(wxGridCellEditor) _obj );
-void       wxGridCellEditor_HandleReturn( TSelf(wxGridCellEditor) _obj, TClass(wxEvent) event );
-TBool      wxGridCellEditor_IsAcceptedKey( TSelf(wxGridCellEditor) _obj, TClass(wxEvent) event );
-TBool      wxGridCellEditor_IsCreated( TSelf(wxGridCellEditor) _obj );
-void       wxGridCellEditor_PaintBackground( TSelf(wxGridCellEditor) _obj, TRect(x,y,w,h), TClass(wxGridCellAttr) attr );
-void       wxGridCellEditor_Reset( TSelf(wxGridCellEditor) _obj );
-void       wxGridCellEditor_SetControl( TSelf(wxGridCellEditor) _obj, TClass(wxControl) control );
-void       wxGridCellEditor_SetParameters( TSelf(wxGridCellEditor) _obj, TString params );
-void       wxGridCellEditor_SetSize( TSelf(wxGridCellEditor) _obj, TRect(x,y,w,h) );
-void       wxGridCellEditor_Show( TSelf(wxGridCellEditor) _obj, TBoolInt show, TClass(wxGridCellAttr) attr );
-void       wxGridCellEditor_StartingClick( TSelf(wxGridCellEditor) _obj );
-void       wxGridCellEditor_StartingKey( TSelf(wxGridCellEditor) _obj, TClass(wxEvent) event );
-
-/* wxGridCellFloatEditor */
-TClassDefExtend(wxGridCellFloatEditor,wxGridCellTextEditor)
-TClass(wxGridCellFloatEditor) wxGridCellFloatEditor_Ctor( int width, int precision );
-
-/* wxGridCellFloatRenderer */
-TClassDefExtend(wxGridCellFloatRenderer,wxGridCellStringRenderer)
-
-/* wxGridCellNumberEditor */
-TClassDefExtend(wxGridCellNumberEditor,wxGridCellTextEditor)
-TClass(wxGridCellNumberEditor)  wxGridCellNumberEditor_Ctor( int min, int max );
-
-/* wxGridCellNumberRenderer */
-TClassDefExtend(wxGridCellNumberRenderer,wxGridCellStringRenderer)
-
-/* wxGridCellRenderer */
-TClassDefExtend(wxGridCellRenderer,wxGridCellWorker)
-
-/* wxGridCellStringRenderer */
-TClassDefExtend(wxGridCellStringRenderer,wxGridCellRenderer)
-
-/* wxGridCellTextEditor */
-TClassDefExtend(wxGridCellTextEditor,wxGridCellEditor)
-TClass(wxGridCellTextEditor) wxGridCellTextEditor_Ctor(  );
-
-/* wxGridCellWorker */
-TClassDef(wxGridCellWorker)
-
-/* wxGridEditorCreatedEvent */
-TClassDefExtend(wxGridEditorCreatedEvent,wxCommandEvent)
-int        wxGridEditorCreatedEvent_GetCol (TSelf(wxGridEditorCreatedEvent) _obj);
-TClass(wxControl) wxGridEditorCreatedEvent_GetControl (TSelf(wxGridEditorCreatedEvent) _obj);
-int        wxGridEditorCreatedEvent_GetRow (TSelf(wxGridEditorCreatedEvent) _obj);
-void       wxGridEditorCreatedEvent_SetCol (TSelf(wxGridEditorCreatedEvent) _obj, int col);
-void       wxGridEditorCreatedEvent_SetControl (TSelf(wxGridEditorCreatedEvent) _obj, TClass(wxControl) ctrl);
-void       wxGridEditorCreatedEvent_SetRow (TSelf(wxGridEditorCreatedEvent) _obj, int row);
-
-/* wxGridEvent */
-TClassDefExtend(wxGridEvent,wxNotifyEvent)
-TBool      wxGridEvent_AltDown (TSelf(wxGridEvent) _obj);
-TBool      wxGridEvent_ControlDown (TSelf(wxGridEvent) _obj);
-int        wxGridEvent_GetCol (TSelf(wxGridEvent) _obj);
-void       wxGridEvent_GetPosition (TSelf(wxGridEvent) _obj, TPointOutVoid(x,y));
-int        wxGridEvent_GetRow (TSelf(wxGridEvent) _obj);
-TBool      wxGridEvent_MetaDown (TSelf(wxGridEvent) _obj);
-TBool      wxGridEvent_Selecting (TSelf(wxGridEvent) _obj);
-TBool      wxGridEvent_ShiftDown (TSelf(wxGridEvent) _obj);
-
-/* wxGridRangeSelectEvent */
-TClassDefExtend(wxGridRangeSelectEvent,wxNotifyEvent)
-void       wxGridRangeSelectEvent_GetTopLeftCoords (TSelf(wxGridRangeSelectEvent) _obj, TPointOutVoid(col,row));
-void       wxGridRangeSelectEvent_GetBottomRightCoords (TSelf(wxGridRangeSelectEvent) _obj, TPointOutVoid(col,row));
-int        wxGridRangeSelectEvent_GetTopRow (TSelf(wxGridRangeSelectEvent) _obj);
-int        wxGridRangeSelectEvent_GetBottomRow (TSelf(wxGridRangeSelectEvent) _obj);
-int        wxGridRangeSelectEvent_GetLeftCol (TSelf(wxGridRangeSelectEvent) _obj);
-int        wxGridRangeSelectEvent_GetRightCol (TSelf(wxGridRangeSelectEvent) _obj);
-TBool      wxGridRangeSelectEvent_Selecting (TSelf(wxGridRangeSelectEvent) _obj);
-TBool      wxGridRangeSelectEvent_ControlDown (TSelf(wxGridRangeSelectEvent) _obj);
-TBool      wxGridRangeSelectEvent_MetaDown (TSelf(wxGridRangeSelectEvent) _obj);
-TBool      wxGridRangeSelectEvent_ShiftDown (TSelf(wxGridRangeSelectEvent) _obj);
-TBool      wxGridRangeSelectEvent_AltDown (TSelf(wxGridRangeSelectEvent) _obj);
-
-/* wxGridSizeEvent */
-TClassDefExtend(wxGridSizeEvent,wxNotifyEvent)
-int        wxGridSizeEvent_GetRowOrCol (TSelf(wxGridSizeEvent) _obj);
-void       wxGridSizeEvent_GetPosition (TSelf(wxGridSizeEvent) _obj, TPointOutVoid(x,y));
-TBool      wxGridSizeEvent_ControlDown (TSelf(wxGridSizeEvent) _obj);
-TBool      wxGridSizeEvent_MetaDown (TSelf(wxGridSizeEvent) _obj);
-TBool      wxGridSizeEvent_ShiftDown (TSelf(wxGridSizeEvent) _obj);
-TBool      wxGridSizeEvent_AltDown (TSelf(wxGridSizeEvent) _obj);
-
-
-/* wxGridSizer */
-TClassDefExtend(wxGridSizer,wxSizer)
-void       wxGridSizer_CalcMin( TSelf(wxGridSizer) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxGridSizer) wxGridSizer_Create( int rows, int cols, int vgap, int hgap );
-int        wxGridSizer_GetCols( TSelf(wxGridSizer) _obj );
-int        wxGridSizer_GetHGap( TSelf(wxGridSizer) _obj );
-int        wxGridSizer_GetRows( TSelf(wxGridSizer) _obj );
-int        wxGridSizer_GetVGap( TSelf(wxGridSizer) _obj );
-void       wxGridSizer_RecalcSizes( TSelf(wxGridSizer) _obj );
-void       wxGridSizer_SetCols( TSelf(wxGridSizer) _obj, int cols );
-void       wxGridSizer_SetHGap( TSelf(wxGridSizer) _obj, int gap );
-void       wxGridSizer_SetRows( TSelf(wxGridSizer) _obj, int rows );
-void       wxGridSizer_SetVGap( TSelf(wxGridSizer) _obj, int gap );
-
-/* wxGridTableBase */
-TClassDefExtend(wxGridTableBase,wxObject)
-
-/* wxHTTP */
-TClassDefExtend(wxHTTP,wxProtocol)
-
-/* wxHashMap */
-TClassDef(wxHashMap)
-
-/* wxHelpController */
-TClassDefExtend(wxHelpController,wxHelpControllerBase)
-
-/* wxHelpControllerBase */
-TClassDefExtend(wxHelpControllerBase,wxObject)
-
-/* wxHelpControllerHelpProvider */
-TClassDefExtend(wxHelpControllerHelpProvider,wxSimpleHelpProvider)
-TClass(wxHelpControllerHelpProvider) wxHelpControllerHelpProvider_Create( void* ctr );
-TClass(wxHelpController) wxHelpControllerHelpProvider_GetHelpController( TSelf(wxHelpControllerHelpProvider) _obj );
-void       wxHelpControllerHelpProvider_SetHelpController( TSelf(wxHelpControllerHelpProvider) _obj, TClass(wxHelpController) hc );
-
-/* wxHelpEvent */
-TClassDefExtend(wxHelpEvent,wxCommandEvent)
-int        wxHelpEvent_GetLink( TSelf(wxHelpEvent) _obj, void* _ref );
-void       wxHelpEvent_GetPosition( TSelf(wxHelpEvent) _obj, TPointOutVoid(_x,_y) );
-int        wxHelpEvent_GetTarget( TSelf(wxHelpEvent) _obj, void* _ref );
-int        wxHelpEvent_SetLink( TSelf(wxHelpEvent) _obj, void* link );
-void       wxHelpEvent_SetPosition( TSelf(wxHelpEvent) _obj, TPoint(x,y) );
-void       wxHelpEvent_SetTarget( TSelf(wxHelpEvent) _obj, void* target );
-
-/* wxHelpProvider */
-TClassDef(wxHelpProvider)
-void       wxHelpProvider_AddHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window, TStringVoid text );
-void       wxHelpProvider_AddHelpById( TSelf(wxHelpProvider) _obj, int id, TStringVoid text );
-void       wxHelpProvider_Delete( TSelf(wxHelpProvider) _obj );
-void*      wxHelpProvider_Get(  );
-int        wxHelpProvider_GetHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window, void* _ref );
-void       wxHelpProvider_RemoveHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window );
-void*      wxHelpProvider_Set( TSelf(wxHelpProvider) helpProvider );
-int        wxHelpProvider_ShowHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window );
-
-/* wxHtmlCell */
-TClassDefExtend(wxHtmlCell,wxObject)
-
-/* wxHtmlColourCell */
-TClassDefExtend(wxHtmlColourCell,wxHtmlCell)
-
-/* wxHtmlContainerCell */
-TClassDefExtend(wxHtmlContainerCell,wxHtmlCell)
-
-/* wxHtmlDCRenderer */
-TClassDefExtend(wxHtmlDCRenderer,wxObject)
-
-/* wxHtmlEasyPrinting */
-TClassDefExtend(wxHtmlEasyPrinting,wxObject)
-
-/* wxHtmlFilter */
-TClassDefExtend(wxHtmlFilter,wxObject)
-
-/* wxHtmlHelpController */
-TClassDefExtend(wxHtmlHelpController,wxHelpControllerBase)
-int        wxHtmlHelpController_AddBook( TSelf(wxHtmlHelpController) _obj, void* book, int show_wait_msg );
-TClass(wxHtmlHelpController) wxHtmlHelpController_Create( int _style );
-void       wxHtmlHelpController_Delete( TSelf(wxHtmlHelpController) _obj );
-int        wxHtmlHelpController_Display( TSelf(wxHtmlHelpController) _obj, void* x );
-int        wxHtmlHelpController_DisplayBlock( TSelf(wxHtmlHelpController) _obj, int blockNo );
-int        wxHtmlHelpController_DisplayContents( TSelf(wxHtmlHelpController) _obj );
-int        wxHtmlHelpController_DisplayIndex( TSelf(wxHtmlHelpController) _obj );
-int        wxHtmlHelpController_DisplayNumber( TSelf(wxHtmlHelpController) _obj, int id );
-int        wxHtmlHelpController_DisplaySection( TSelf(wxHtmlHelpController) _obj, TStringVoid section );
-int        wxHtmlHelpController_DisplaySectionNumber( TSelf(wxHtmlHelpController) _obj, int sectionNo );
-TClass(wxFrame) wxHtmlHelpController_GetFrame( TSelf(wxHtmlHelpController) _obj );
-void*      wxHtmlHelpController_GetFrameParameters( TSelf(wxHtmlHelpController) _obj, void* title, int* width, int* height, int* pos_x, int* pos_y, int* newFrameEachTime );
-int        wxHtmlHelpController_Initialize( TSelf(wxHtmlHelpController) _obj, TStringVoid file );
-int        wxHtmlHelpController_KeywordSearch( TSelf(wxHtmlHelpController) _obj, TStringVoid keyword );
-int        wxHtmlHelpController_LoadFile( TSelf(wxHtmlHelpController) _obj, TStringVoid file );
-int        wxHtmlHelpController_Quit( TSelf(wxHtmlHelpController) _obj );
-void       wxHtmlHelpController_ReadCustomization( TSelf(wxHtmlHelpController) _obj, TClass(wxConfigBase) cfg, TStringVoid path );
-void       wxHtmlHelpController_SetFrameParameters( TSelf(wxHtmlHelpController) _obj, void* title, TSize(width,height), int pos_x, int pos_y, int newFrameEachTime );
-void       wxHtmlHelpController_SetTempDir( TSelf(wxHtmlHelpController) _obj, TStringVoid path );
-void       wxHtmlHelpController_SetTitleFormat( TSelf(wxHtmlHelpController) _obj, void* format );
-void       wxHtmlHelpController_SetViewer( TSelf(wxHtmlHelpController) _obj, TStringVoid viewer, int flags );
-void       wxHtmlHelpController_UseConfig( TSelf(wxHtmlHelpController) _obj, TClass(wxConfigBase) config, TStringVoid rootpath );
-void       wxHtmlHelpController_WriteCustomization( TSelf(wxHtmlHelpController) _obj, TClass(wxConfigBase) cfg, TStringVoid path );
-
-/* wxHtmlHelpData */
-TClassDefExtend(wxHtmlHelpData,wxObject)
-
-/* wxHtmlHelpFrame */
-TClassDefExtend(wxHtmlHelpFrame,wxFrame)
-
-/* wxHtmlLinkInfo */
-TClassDefExtend(wxHtmlLinkInfo,wxObject)
-
-/* wxHtmlParser */
-TClassDefExtend(wxHtmlParser,wxObject)
-
-/* wxHtmlPrintout */
-TClassDefExtend(wxHtmlPrintout,wxPrintout)
-
-/* wxHtmlTag */
-TClassDefExtend(wxHtmlTag,wxObject)
-
-/* wxHtmlTagHandler */
-TClassDefExtend(wxHtmlTagHandler,wxObject)
-
-/* wxHtmlTagsModule */
-TClassDefExtend(wxHtmlTagsModule,wxModule)
-
-/* wxHtmlWidgetCell */
-TClassDefExtend(wxHtmlWidgetCell,wxHtmlCell)
-
-/* wxHtmlWinParser */
-TClassDefExtend(wxHtmlWinParser,wxHtmlParser)
-
-/* wxHtmlWinTagHandler */
-TClassDefExtend(wxHtmlWinTagHandler,wxHtmlTagHandler)
-
-/* wxHtmlWindow */
-TClassDefExtend(wxHtmlWindow,wxScrolledWindow)
-
-/* wxIPV4address */
-TClassDefExtend(wxIPV4address,wxSockAddress)
-
-/* wxIcon */
-TClassDefExtend(wxIcon,wxBitmap)
-void       wxIcon_Assign( TSelf(wxIcon) _obj, void* other );
-void       wxIcon_CopyFromBitmap( TSelf(wxIcon) _obj, TClass(wxBitmap) bmp );
-TClass(wxIcon) wxIcon_CreateDefault(  );
-TClass(wxIcon) wxIcon_CreateLoad( TStringVoid name, long type, TSize(width,height) );
-void       wxIcon_Delete( TSelf(wxIcon) _obj );
-TClass(wxIcon) wxIcon_FromRaw( TSelf(wxIcon) data, TSize(width,height) );
-TClass(wxIcon) wxIcon_FromXPM( TSelf(wxIcon) data );
-int        wxIcon_GetDepth( TSelf(wxIcon) _obj );
-int        wxIcon_GetHeight( TSelf(wxIcon) _obj );
-int        wxIcon_GetWidth( TSelf(wxIcon) _obj );
-TBool      wxIcon_IsEqual( TSelf(wxIcon) _obj, void* other );
-int        wxIcon_Load( TSelf(wxIcon) _obj, TStringVoid name, long type, TSize(width,height) );
-TBool      wxIcon_Ok( TSelf(wxIcon) _obj );
-
-/* wxIconBundle */
-TClassDef(wxIconBundle)
-void       wxIconBundle_AddIcon( TSelf(wxIconBundle) _obj, TClass(wxIcon) icon );
-void       wxIconBundle_AddIconFromFile( TSelf(wxIconBundle) _obj, TStringVoid file, int type );
-void       wxIconBundle_Assign( TSelf(wxIconBundle) _obj, TClassRef(wxIconBundle) _ref );
-TClass(wxIconBundle) wxIconBundle_CreateDefault(  );
-TClass(wxIconBundle) wxIconBundle_CreateFromFile( TStringVoid file, int type );
-TClass(wxIconBundle) wxIconBundle_CreateFromIcon( TClass(wxIcon) icon );
-void       wxIconBundle_Delete( TSelf(wxIconBundle) _obj );
-void       wxIconBundle_GetIcon( TSelf(wxIconBundle) _obj, TSize(w,h), TClassRef(wxIcon) _ref );
-
-/* wxIconizeEvent */
-TClassDefExtend(wxIconizeEvent,wxEvent)
-
-/* wxIdleEvent */
-TClassDefExtend(wxIdleEvent,wxEvent)
-void       wxIdleEvent_CopyObject( TSelf(wxIdleEvent) _obj, void* object_dest );
-TBool      wxIdleEvent_MoreRequested( TSelf(wxIdleEvent) _obj );
-void       wxIdleEvent_RequestMore( TSelf(wxIdleEvent) _obj, TBool needMore );
-
-/* wxImage */
-TClassDefExtend(wxImage,wxObject)
-TBool      wxImage_CanRead( TStringVoid name );
-void       wxImage_ConvertToBitmap( TSelf(wxImage) _obj, TClassRef(wxBitmap) bitmap );
-int        wxImage_CountColours( TSelf(wxImage) _obj, int stopafter );
-TClass(wxImage) wxImage_CreateDefault(  );
-TClass(wxImage) wxImage_CreateFromBitmap( TClass(wxBitmap) bitmap );
-TClass(wxImage) wxImage_CreateFromData( TSize(width,height), void* data );
-TClass(wxImage) wxImage_CreateFromFile( TStringVoid name );
-TClass(wxImage) wxImage_CreateSized( TSize(width,height) );
-void       wxImage_Destroy( TSelf(wxImage) _obj );
-TChar      wxImage_GetBlue( TSelf(wxImage) _obj, TPoint(x,y) );
-void*      wxImage_GetData( TSelf(wxImage) _obj );
-TChar      wxImage_GetGreen( TSelf(wxImage) _obj, TPoint(x,y) );
-int        wxImage_GetHeight( TSelf(wxImage) _obj );
-TChar      wxImage_GetMaskBlue( TSelf(wxImage) _obj );
-TChar      wxImage_GetMaskGreen( TSelf(wxImage) _obj );
-TChar      wxImage_GetMaskRed( TSelf(wxImage) _obj );
-TChar      wxImage_GetRed( TSelf(wxImage) _obj, TPoint(x,y) );
-void       wxImage_GetSubImage( TSelf(wxImage) _obj, TRect(x,y,w,h), TClassRef(wxImage) image );
-int        wxImage_GetWidth( TSelf(wxImage) _obj );
-TBool      wxImage_HasMask( TSelf(wxImage) _obj );
-void       wxImage_Initialize( TSelf(wxImage) _obj, TSize(width,height) );
-void       wxImage_InitializeFromData( TSelf(wxImage) _obj, TSize(width,height), void* data );
-TBoolInt   wxImage_LoadFile( TSelf(wxImage) _obj, TStringVoid name, int type );
-void       wxImage_Mirror( TSelf(wxImage) _obj, TBoolInt horizontally, TClassRef(wxImage) image );
-TBool      wxImage_Ok( TSelf(wxImage) _obj );
-void       wxImage_Paste( TSelf(wxImage) _obj, TClass(wxImage) image, TPoint(x,y) );
-void       wxImage_Replace( TSelf(wxImage) _obj, TColorRGB(r1,g1,b1), TColorRGB(r2,g2,b2) );
-void       wxImage_Rescale( TSelf(wxImage) _obj, TSize(width,height) );
-void       wxImage_Rotate( TSelf(wxImage) _obj, double angle, TPoint(c_x,c_y), TBoolInt interpolating, void* offset_after_rotation, TClassRef(wxImage) image );
-void       wxImage_Rotate90( TSelf(wxImage) _obj, TBoolInt clockwise, TClassRef(wxImage) image );
-TBoolInt   wxImage_SaveFile( TSelf(wxImage) _obj, TStringVoid name, int type );
-void       wxImage_Scale( TSelf(wxImage) _obj, TSize(width,height), TClassRef(wxImage) image );
-void       wxImage_SetData( TSelf(wxImage) _obj, void* data );
-void       wxImage_SetDataAndSize( TSelf(wxImage) _obj, void* data, TSize(new_width,new_height) );
-void       wxImage_SetMask( TSelf(wxImage) _obj, int mask );
-void       wxImage_SetMaskColour( TSelf(wxImage) _obj, TColorRGB(r,g,b) );
-void       wxImage_SetRGB( TSelf(wxImage) _obj, TPoint(x,y), TColorRGB(r,g,b) );
-
-/* wxImageHandler */
-TClassDefExtend(wxImageHandler,wxObject)
-
-/* wxImageList */
-TClassDefExtend(wxImageList,wxObject)
-int        wxImageList_AddBitmap( TSelf(wxImageList) _obj, TClass(wxBitmap) bitmap, TClass(wxBitmap) mask );
-int        wxImageList_AddIcon( TSelf(wxImageList) _obj, TClass(wxIcon) icon );
-int        wxImageList_AddMasked( TSelf(wxImageList) _obj, TClass(wxBitmap) bitmap, TClass(wxColour) maskColour );
-TClass(wxImageList) wxImageList_Create( TSize(width,height), TBoolInt mask, int initialCount );
-void       wxImageList_Delete( TSelf(wxImageList) _obj );
-TBoolInt   wxImageList_Draw( TSelf(wxImageList) _obj, int index, TClass(wxDC) dc, TPoint(x,y), int flags, TBoolInt solidBackground );
-int        wxImageList_GetImageCount( TSelf(wxImageList) _obj );
-void       wxImageList_GetSize( TSelf(wxImageList) _obj, int index, TSizeOut(width,height) );
-TBoolInt   wxImageList_Remove( TSelf(wxImageList) _obj, int index );
-TBoolInt   wxImageList_RemoveAll( TSelf(wxImageList) _obj );
-TBoolInt   wxImageList_Replace( TSelf(wxImageList) _obj, int index, TClass(wxBitmap) bitmap, TClass(wxBitmap) mask );
-TBoolInt   wxImageList_ReplaceIcon( TSelf(wxImageList) _obj, int index, TClass(wxIcon) icon );
-
-/* wxIndividualLayoutConstraint */
-TClassDefExtend(wxIndividualLayoutConstraint,wxObject)
-void       wxIndividualLayoutConstraint_Above( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
-void       wxIndividualLayoutConstraint_Absolute( TSelf(wxIndividualLayoutConstraint) _obj, int val );
-void       wxIndividualLayoutConstraint_AsIs( TSelf(wxIndividualLayoutConstraint) _obj );
-void       wxIndividualLayoutConstraint_Below( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
-int        wxIndividualLayoutConstraint_GetDone( TSelf(wxIndividualLayoutConstraint) _obj );
-int        wxIndividualLayoutConstraint_GetEdge( TSelf(wxIndividualLayoutConstraint) _obj, int which, void* thisWin, void* other );
-int        wxIndividualLayoutConstraint_GetMargin( TSelf(wxIndividualLayoutConstraint) _obj );
-int        wxIndividualLayoutConstraint_GetMyEdge( TSelf(wxIndividualLayoutConstraint) _obj );
-int        wxIndividualLayoutConstraint_GetOtherEdge( TSelf(wxIndividualLayoutConstraint) _obj );
-void*      wxIndividualLayoutConstraint_GetOtherWindow( TSelf(wxIndividualLayoutConstraint) _obj );
-int        wxIndividualLayoutConstraint_GetPercent( TSelf(wxIndividualLayoutConstraint) _obj );
-int        wxIndividualLayoutConstraint_GetRelationship( TSelf(wxIndividualLayoutConstraint) _obj );
-int        wxIndividualLayoutConstraint_GetValue( TSelf(wxIndividualLayoutConstraint) _obj );
-void       wxIndividualLayoutConstraint_LeftOf( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
-void       wxIndividualLayoutConstraint_PercentOf( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) otherW, int wh, int per );
-int        wxIndividualLayoutConstraint_ResetIfWin( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) otherW );
-void       wxIndividualLayoutConstraint_RightOf( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
-void       wxIndividualLayoutConstraint_SameAs( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) otherW, int edge, int marg );
-int        wxIndividualLayoutConstraint_SatisfyConstraint( TSelf(wxIndividualLayoutConstraint) _obj, void* constraints, TClass(wxWindow) win );
-void       wxIndividualLayoutConstraint_Set( TSelf(wxIndividualLayoutConstraint) _obj, int rel, TClass(wxWindow) otherW, int otherE, int val, int marg );
-void       wxIndividualLayoutConstraint_SetDone( TSelf(wxIndividualLayoutConstraint) _obj, int d );
-void       wxIndividualLayoutConstraint_SetEdge( TSelf(wxIndividualLayoutConstraint) _obj, int which );
-void       wxIndividualLayoutConstraint_SetMargin( TSelf(wxIndividualLayoutConstraint) _obj, int m );
-void       wxIndividualLayoutConstraint_SetRelationship( TSelf(wxIndividualLayoutConstraint) _obj, int r );
-void       wxIndividualLayoutConstraint_SetValue( TSelf(wxIndividualLayoutConstraint) _obj, int v );
-void       wxIndividualLayoutConstraint_Unconstrained( TSelf(wxIndividualLayoutConstraint) _obj );
-
-/* wxInitDialogEvent */
-TClassDefExtend(wxInitDialogEvent,wxEvent)
-
-/* wxInputStream */
-TClassDefExtend(wxInputStream,wxStreamBase)
-void       wxInputStream_Delete( TSelf(wxInputStream) _obj );
-TBool      wxInputStream_Eof( TSelf(wxInputStream) _obj );
-TChar      wxInputStream_GetC( TSelf(wxInputStream) _obj );
-int        wxInputStream_LastRead( TSelf(wxInputStream) _obj );
-TChar      wxInputStream_Peek( TSelf(wxInputStream) _obj );
-void       wxInputStream_Read( TSelf(wxInputStream) _obj, void* buffer, int size );
-int        wxInputStream_SeekI( TSelf(wxInputStream) _obj, int pos, int mode );
-int        wxInputStream_Tell( TSelf(wxInputStream) _obj );
-int        wxInputStream_UngetBuffer( TSelf(wxInputStream) _obj, void* buffer, int size );
-int        wxInputStream_Ungetch( TSelf(wxInputStream) _obj, TChar c );
-
-/* wxJoystick */
-TClassDefExtend(wxJoystick,wxObject)
-TClass(wxJoystick) wxJoystick_Create( int joystick );
-void       wxJoystick_Delete( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetButtonState( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetManufacturerId( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetMaxAxes( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetMaxButtons( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetMovementThreshold( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetNumberAxes( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetNumberButtons( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetNumberJoysticks( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetPOVCTSPosition( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetPOVPosition( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetPollingMax( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetPollingMin( TSelf(wxJoystick) _obj );
-void       wxJoystick_GetPosition( TSelf(wxJoystick) _obj, TPointOutVoid(_x,_y) );
-int        wxJoystick_GetProductId( TSelf(wxJoystick) _obj );
-TStringLen wxJoystick_GetProductName( TSelf(wxJoystick) _obj, TStringOutVoid _buf );
-int        wxJoystick_GetRudderMax( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetRudderMin( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetRudderPosition( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetUMax( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetUMin( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetUPosition( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetVMax( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetVMin( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetVPosition( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetXMax( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetXMin( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetYMax( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetYMin( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetZMax( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetZMin( TSelf(wxJoystick) _obj );
-int        wxJoystick_GetZPosition( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_HasPOV( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_HasPOV4Dir( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_HasPOVCTS( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_HasRudder( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_HasU( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_HasV( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_HasZ( TSelf(wxJoystick) _obj );
-TBool      wxJoystick_IsOk( TSelf(wxJoystick) _obj );
-int        wxJoystick_ReleaseCapture( TSelf(wxJoystick) _obj );
-int        wxJoystick_SetCapture( TSelf(wxJoystick) _obj, TClass(wxWindow) win, int pollingFreq );
-void       wxJoystick_SetMovementThreshold( TSelf(wxJoystick) _obj, int threshold );
-
-/* wxJoystickEvent */
-TClassDefExtend(wxJoystickEvent,wxEvent)
-TBool      wxJoystickEvent_ButtonDown( TSelf(wxJoystickEvent) _obj, int but );
-TBool      wxJoystickEvent_ButtonIsDown( TSelf(wxJoystickEvent) _obj, int but );
-TBool      wxJoystickEvent_ButtonUp( TSelf(wxJoystickEvent) _obj, int but );
-void       wxJoystickEvent_CopyObject( TSelf(wxJoystickEvent) _obj, void* obj );
-int        wxJoystickEvent_GetButtonChange( TSelf(wxJoystickEvent) _obj );
-int        wxJoystickEvent_GetButtonState( TSelf(wxJoystickEvent) _obj );
-int        wxJoystickEvent_GetJoystick( TSelf(wxJoystickEvent) _obj );
-void       wxJoystickEvent_GetPosition( TSelf(wxJoystickEvent) _obj, TPointOut(_x,_y) );
-int        wxJoystickEvent_GetZPosition( TSelf(wxJoystickEvent) _obj );
-TBool      wxJoystickEvent_IsButton( TSelf(wxJoystickEvent) _obj );
-TBool      wxJoystickEvent_IsMove( TSelf(wxJoystickEvent) _obj );
-TBool      wxJoystickEvent_IsZMove( TSelf(wxJoystickEvent) _obj );
-void       wxJoystickEvent_SetButtonChange( TSelf(wxJoystickEvent) _obj, int change );
-void       wxJoystickEvent_SetButtonState( TSelf(wxJoystickEvent) _obj, int state );
-void       wxJoystickEvent_SetJoystick( TSelf(wxJoystickEvent) _obj, int stick );
-void       wxJoystickEvent_SetPosition( TSelf(wxJoystickEvent) _obj, void* pos );
-void       wxJoystickEvent_SetZPosition( TSelf(wxJoystickEvent) _obj, int zPos );
-
-/* wxKeyEvent */
-TClassDefExtend(wxKeyEvent,wxEvent)
-TBool      wxKeyEvent_AltDown( TSelf(wxKeyEvent) _obj );
-TBool      wxKeyEvent_ControlDown( TSelf(wxKeyEvent) _obj );
-void       wxKeyEvent_CopyObject( TSelf(wxKeyEvent) _obj, void* obj );
-int        wxKeyEvent_GetKeyCode( TSelf(wxKeyEvent) _obj );
-void       wxKeyEvent_GetPosition( TSelf(wxKeyEvent) _obj, TPointOut(_x,_y) );
-int        wxKeyEvent_GetX( TSelf(wxKeyEvent) _obj );
-int        wxKeyEvent_GetY( TSelf(wxKeyEvent) _obj );
-TBool      wxKeyEvent_HasModifiers( TSelf(wxKeyEvent) _obj );
-TBool      wxKeyEvent_MetaDown( TSelf(wxKeyEvent) _obj );
-void       wxKeyEvent_SetKeyCode( TSelf(wxKeyEvent) _obj, int code );
-TBool      wxKeyEvent_ShiftDown( TSelf(wxKeyEvent) _obj );
-
-/* wxLEDNumberCtrl */
-TClassDefExtend(wxLEDNumberCtrl,wxControl)
-TClass(wxLEDNumberCtrl) wxLEDNumberCtrl_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
-int        wxLEDNumberCtrl_GetAlignment( TSelf(wxLEDNumberCtrl) _obj );
-int        wxLEDNumberCtrl_GetDrawFaded( TSelf(wxLEDNumberCtrl) _obj );
-int        wxLEDNumberCtrl_GetValue( TSelf(wxLEDNumberCtrl) _obj, void* _ref );
-void       wxLEDNumberCtrl_SetAlignment( TSelf(wxLEDNumberCtrl) _obj, int Alignment, int Redraw );
-void       wxLEDNumberCtrl_SetDrawFaded( TSelf(wxLEDNumberCtrl) _obj, int DrawFaded, int Redraw );
-void       wxLEDNumberCtrl_SetValue( TSelf(wxLEDNumberCtrl) _obj, void* Value, int Redraw );
-
-/* wxLayoutAlgorithm */
-TClassDefExtend(wxLayoutAlgorithm,wxObject)
-TClass(wxLayoutAlgorithm) wxLayoutAlgorithm_Create(  );
-void       wxLayoutAlgorithm_Delete( TSelf(wxLayoutAlgorithm) _obj );
-int        wxLayoutAlgorithm_LayoutFrame( TSelf(wxLayoutAlgorithm) _obj, TClass(wxFrame) frame, void* mainWindow );
-int        wxLayoutAlgorithm_LayoutMDIFrame( TSelf(wxLayoutAlgorithm) _obj, TClass(wxFrame) frame, TRect(x,y,w,h), int use );
-int        wxLayoutAlgorithm_LayoutWindow( TSelf(wxLayoutAlgorithm) _obj, TClass(wxFrame) frame, void* mainWindow );
-
-/* wxLayoutConstraints */
-TClassDefExtend(wxLayoutConstraints,wxObject)
-TClass(wxLayoutConstraints) wxLayoutConstraints_Create(  );
-void*      wxLayoutConstraints_bottom( TSelf(wxLayoutConstraints) _obj );
-void*      wxLayoutConstraints_centreX( TSelf(wxLayoutConstraints) _obj );
-void*      wxLayoutConstraints_centreY( TSelf(wxLayoutConstraints) _obj );
-void*      wxLayoutConstraints_height( TSelf(wxLayoutConstraints) _obj );
-void*      wxLayoutConstraints_left( TSelf(wxLayoutConstraints) _obj );
-void*      wxLayoutConstraints_right( TSelf(wxLayoutConstraints) _obj );
-void*      wxLayoutConstraints_top( TSelf(wxLayoutConstraints) _obj );
-void*      wxLayoutConstraints_width( TSelf(wxLayoutConstraints) _obj );
-
-/* wxList */
-TClassDefExtend(wxList,wxObject)
-
-/* wxListBox */
-TClassDefExtend(wxListBox,wxControl)
-void       wxListBox_Append( TSelf(wxListBox) _obj, TString item );
-void       wxListBox_AppendData( TSelf(wxListBox) _obj, TString item, void* data );
-void       wxListBox_Clear( TSelf(wxListBox) _obj );
-TClass(wxListBox) wxListBox_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
-void       wxListBox_Delete( TSelf(wxListBox) _obj, int n );
-int        wxListBox_FindString( TSelf(wxListBox) _obj, TString s );
-TClass(wxClientData) wxListBox_GetClientData( TSelf(wxListBox) _obj, int n );
-int        wxListBox_GetCount( TSelf(wxListBox) _obj );
-int        wxListBox_GetSelection( TSelf(wxListBox) _obj );
-int        wxListBox_GetSelections( TSelf(wxListBox) _obj, int* aSelections, int allocated );
-TStringLen wxListBox_GetString( TSelf(wxListBox) _obj, int n, TStringOutVoid _buf );
-void       wxListBox_InsertItems( TSelf(wxListBox) _obj, void* items, int pos, int count );
-TBool      wxListBox_IsSelected( TSelf(wxListBox) _obj, int n );
-void       wxListBox_SetClientData( TSelf(wxListBox) _obj, int n, TClass(wxClientData) clientData );
-void       wxListBox_SetFirstItem( TSelf(wxListBox) _obj, int n );
-void       wxListBox_SetSelection( TSelf(wxListBox) _obj, int n, TBoolInt select );
-void       wxListBox_SetString( TSelf(wxListBox) _obj, int n, TString s );
-void       wxListBox_SetStringSelection( TSelf(wxListBox) _obj, TString str, TBoolInt sel );
-
-/* wxListCtrl */
-TClassDefExtend(wxListCtrl,wxControl)
-TBoolInt   wxListCtrl_Arrange( TSelf(wxListCtrl) _obj, int flag );
-void       wxListCtrl_ClearAll( TSelf(wxListCtrl) _obj );
-TClass(wxListCtrl) wxListCtrl_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-TBoolInt   wxListCtrl_DeleteAllColumns( TSelf(wxListCtrl) _obj );
-TBoolInt   wxListCtrl_DeleteAllItems( TSelf(wxListCtrl) _obj );
-TBoolInt   wxListCtrl_DeleteColumn( TSelf(wxListCtrl) _obj, int col );
-TBoolInt   wxListCtrl_DeleteItem( TSelf(wxListCtrl) _obj, int item );
-void       wxListCtrl_EditLabel( TSelf(wxListCtrl) _obj, int item );
-TBoolInt   wxListCtrl_EndEditLabel( TSelf(wxListCtrl) _obj, int cancel );
-TBoolInt   wxListCtrl_EnsureVisible( TSelf(wxListCtrl) _obj, int item );
-int        wxListCtrl_FindItem( TSelf(wxListCtrl) _obj, int start, TStringVoid str, TBoolInt partial );
-int        wxListCtrl_FindItemByData( TSelf(wxListCtrl) _obj, int start, int data );
-int        wxListCtrl_FindItemByPosition( TSelf(wxListCtrl) _obj, int start, TPoint(x,y), int direction );
-TBoolInt   wxListCtrl_GetColumn( TSelf(wxListCtrl) _obj, int col, TClass(wxListItem) item );
-int        wxListCtrl_GetColumnCount( TSelf(wxListCtrl) _obj );
-int        wxListCtrl_GetColumnWidth( TSelf(wxListCtrl) _obj, int col );
-int        wxListCtrl_GetCountPerPage( TSelf(wxListCtrl) _obj );
-TClass(wxTextCtrl)  wxListCtrl_GetEditControl( TSelf(wxListCtrl) _obj );
-TClass(wxImageList) wxListCtrl_GetImageList( TSelf(wxListCtrl) _obj, int which );
-TBoolInt   wxListCtrl_GetItem( TSelf(wxListCtrl) _obj, TClass(wxListItem) info );
-int        wxListCtrl_GetItemCount( TSelf(wxListCtrl) _obj );
-int        wxListCtrl_GetItemData( TSelf(wxListCtrl) _obj, int item );
-TBoolInt   wxListCtrl_GetItemPosition( TSelf(wxListCtrl) _obj, int item, int*x, int* y );
-int        wxListCtrl_GetItemRect( TSelf(wxListCtrl) _obj, int item, int code, TRectOutVoid(x,y,w,h) );
-void       wxListCtrl_GetItemSpacing( TSelf(wxListCtrl) _obj, TBool isSmall, TSizeOutVoid(w,h) );
-int        wxListCtrl_GetItemState( TSelf(wxListCtrl) _obj, int item, int stateMask );
-TStringLen wxListCtrl_GetItemText( TSelf(wxListCtrl) _obj, int item, TStringOutVoid buf );
-int        wxListCtrl_GetNextItem( TSelf(wxListCtrl) _obj, int item, int geometry, int state );
-int        wxListCtrl_GetSelectedItemCount( TSelf(wxListCtrl) _obj );
-void       wxListCtrl_GetTextColour( TSelf(wxListCtrl) _obj, TClassRef(wxColour) _ref );
-int        wxListCtrl_GetTopItem( TSelf(wxListCtrl) _obj );
-int        wxListCtrl_HitTest( TSelf(wxListCtrl) _obj, TPoint(x,y), void* flags );
-int        wxListCtrl_InsertColumn( TSelf(wxListCtrl) _obj, int col, TStringVoid heading, int format, int width );
-int        wxListCtrl_InsertColumnFromInfo( TSelf(wxListCtrl) _obj, int col, TClass(wxListItem) info );
-int        wxListCtrl_InsertItem( TSelf(wxListCtrl) _obj, TClass(wxListItem) info );
-int        wxListCtrl_InsertItemWithData( TSelf(wxListCtrl) _obj, int index, TStringVoid label );
-int        wxListCtrl_InsertItemWithImage( TSelf(wxListCtrl) _obj, int index, int imageIndex );
-int        wxListCtrl_InsertItemWithLabel( TSelf(wxListCtrl) _obj, int index, TStringVoid label, int imageIndex );
-TBoolInt   wxListCtrl_ScrollList( TSelf(wxListCtrl) _obj, TVector(dx,dy) );
-void       wxListCtrl_SetBackgroundColour( TSelf(wxListCtrl) _obj, TClass(wxColour) col );
-TBoolInt   wxListCtrl_SetColumn( TSelf(wxListCtrl) _obj, int col, TClass(wxListItem) item );
-TBoolInt   wxListCtrl_SetColumnWidth( TSelf(wxListCtrl) _obj, int col, int width );
-int        wxListCtrl_SetForegroundColour( TSelf(wxListCtrl) _obj, TClass(wxColour) col );
-void       wxListCtrl_SetImageList( TSelf(wxListCtrl) _obj, TClass(wxImageList) imageList, int which );
-TBoolInt   wxListCtrl_SetItem( TSelf(wxListCtrl) _obj, int index, int col, TStringVoid label, int imageId );
-TBoolInt   wxListCtrl_SetItemData( TSelf(wxListCtrl) _obj, int item, int data );
-TBoolInt   wxListCtrl_SetItemFromInfo( TSelf(wxListCtrl) _obj, TClass(wxListItem) info );
-TBoolInt   wxListCtrl_SetItemImage( TSelf(wxListCtrl) _obj, int item, int image, int selImage );
-TBoolInt   wxListCtrl_SetItemPosition( TSelf(wxListCtrl) _obj, int item, TPoint(x,y) );
-TBoolInt   wxListCtrl_SetItemState( TSelf(wxListCtrl) _obj, int item, int state, int stateMask );
-void       wxListCtrl_SetItemText( TSelf(wxListCtrl) _obj, int item, TStringVoid str );
-void       wxListCtrl_SetSingleStyle( TSelf(wxListCtrl) _obj, int style, TBoolInt add );
-void       wxListCtrl_SetTextColour( TSelf(wxListCtrl) _obj, TClass(wxColour) col );
-void       wxListCtrl_SetWindowStyleFlag( TSelf(wxListCtrl) _obj, int style );
-TBoolInt   wxListCtrl_SortItems( TSelf(wxListCtrl) _obj, void* fn, void* eif_obj );
-void       wxListCtrl_UpdateStyle( TSelf(wxListCtrl) _obj );
-
-/* wxListEvent */
-TClassDefExtend(wxListEvent,wxNotifyEvent)
-TBool      wxListEvent_Cancelled( TSelf(wxListEvent) _obj );
-int        wxListEvent_GetCode( TSelf(wxListEvent) _obj );
-int        wxListEvent_GetColumn( TSelf(wxListEvent) _obj );
-int        wxListEvent_GetData( TSelf(wxListEvent) _obj );
-int        wxListEvent_GetImage( TSelf(wxListEvent) _obj );
-int        wxListEvent_GetIndex( TSelf(wxListEvent) _obj );
-void       wxListEvent_GetItem( TSelf(wxListEvent) _obj, TClassRef(wxListItem) _ref );
-TStringLen wxListEvent_GetLabel( TSelf(wxListEvent) _obj, TStringOutVoid _buf );
-int        wxListEvent_GetMask( TSelf(wxListEvent) _obj );
-/*
-int        wxListEvent_GetOldIndex( TSelf(wxListEvent) _obj );
-int        wxListEvent_GetOldItem( TSelf(wxListEvent) _obj );
-*/
-void       wxListEvent_GetPoint( TSelf(wxListEvent) _obj, TPointOutVoid(_x,_y) );
-TStringLen wxListEvent_GetText( TSelf(wxListEvent) _obj, TStringOutVoid _buf );
-
-/* wxListItem */
-TClassDefExtend(wxListItem,wxObject)
-void       wxListItem_Clear( TSelf(wxListItem) _obj );
-void       wxListItem_ClearAttributes( TSelf(wxListItem) _obj );
-TClass(wxListItem) wxListItem_Create(  );
-void       wxListItem_Delete( TSelf(wxListItem) _obj );
-int        wxListItem_GetAlign( TSelf(wxListItem) _obj );
-void*      wxListItem_GetAttributes( TSelf(wxListItem) _obj );
-void       wxListItem_GetBackgroundColour( TSelf(wxListItem) _obj, TClassRef(wxColour) _ref );
-int        wxListItem_GetColumn( TSelf(wxListItem) _obj );
-int        wxListItem_GetData( TSelf(wxListItem) _obj );
-void       wxListItem_GetFont( TSelf(wxListItem) _obj, TClassRef(wxFont) _ref );
-int        wxListItem_GetId( TSelf(wxListItem) _obj );
-int        wxListItem_GetImage( TSelf(wxListItem) _obj );
-int        wxListItem_GetMask( TSelf(wxListItem) _obj );
-int        wxListItem_GetState( TSelf(wxListItem) _obj );
-TStringLen wxListItem_GetText( TSelf(wxListItem) _obj, TStringOutVoid _buf );
-void       wxListItem_GetTextColour( TSelf(wxListItem) _obj, TClassRef(wxColour) _ref );
-int        wxListItem_GetWidth( TSelf(wxListItem) _obj );
-TBool      wxListItem_HasAttributes( TSelf(wxListItem) _obj );
-void       wxListItem_SetAlign( TSelf(wxListItem) _obj, int align );
-void       wxListItem_SetBackgroundColour( TSelf(wxListItem) _obj, TClass(wxColour) colBack );
-void       wxListItem_SetColumn( TSelf(wxListItem) _obj, int col );
-void       wxListItem_SetData( TSelf(wxListItem) _obj, int data );
-void       wxListItem_SetDataPointer( TSelf(wxListItem) _obj, void* data );
-void       wxListItem_SetFont( TSelf(wxListItem) _obj, TClass(wxFont) font );
-void       wxListItem_SetId( TSelf(wxListItem) _obj, int id );
-void       wxListItem_SetImage( TSelf(wxListItem) _obj, int image );
-void       wxListItem_SetMask( TSelf(wxListItem) _obj, int mask );
-void       wxListItem_SetState( TSelf(wxListItem) _obj, int state );
-void       wxListItem_SetStateMask( TSelf(wxListItem) _obj, int stateMask );
-void       wxListItem_SetText( TSelf(wxListItem) _obj, TStringVoid text );
-void       wxListItem_SetTextColour( TSelf(wxListItem) _obj, TClass(wxColour) colText );
-void       wxListItem_SetWidth( TSelf(wxListItem) _obj, int width );
-
-/* wxLocale */
-TClassDef(wxLocale)
-int        wxLocale_AddCatalog( TSelf(wxLocale) _obj, void* szDomain );
-void       wxLocale_AddCatalogLookupPathPrefix( TSelf(wxLocale) _obj, void* prefix );
-TClass(wxLocale) wxLocale_Create( int _name, int _flags );
-void       wxLocale_Delete( TSelf(wxLocale) _obj );
-TClass(wxLocale) wxLocale_GetLocale( TSelf(wxLocale) _obj );
-int        wxLocale_GetName( TSelf(wxLocale) _obj, void* _ref );
-TClass(wxString) wxLocale_GetString( TSelf(wxLocale) _obj, void* szOrigString, void* szDomain );
-TBool      wxLocale_IsLoaded( TSelf(wxLocale) _obj, void* szDomain );
-TBool      wxLocale_IsOk( TSelf(wxLocale) _obj );
-
-/* wxLog */
-TClassDef(wxLog)
-
-/* wxLogChain */
-TClassDefExtend(wxLogChain,wxLog)
-TClass(wxLogChain) wxLogChain_Create( TClass(wxLog) logger );
-void       wxLogChain_Delete( TSelf(wxLogChain) _obj );
-TClass(wxLog) wxLogChain_GetOldLog( TSelf(wxLogChain) _obj );
-TBool      wxLogChain_IsPassingMessages( TSelf(wxLogChain) _obj );
-void       wxLogChain_PassMessages( TSelf(wxLogChain) _obj, TBoolInt bDoPass );
-void       wxLogChain_SetLog( TSelf(wxLogChain) _obj, TClass(wxLog) logger );
-
-/* wxLogGUI */
-TClassDefExtend(wxLogGUI,wxLog)
-
-/* wxLogNull */
-TClassDefExtend(wxLogNull,wxLog)
-
-/* wxLogPassThrough */
-TClassDefExtend(wxLogPassThrough,wxLogChain)
-
-/* wxLogStderr */
-TClassDefExtend(wxLogStderr,wxLog)
-
-/* wxLogStream */
-TClassDefExtend(wxLogStream,wxLog)
-
-/* wxLogTextCtrl */
-TClassDefExtend(wxLogTextCtrl,wxLog)
-
-/* wxLogWindow */
-TClassDefExtend(wxLogWindow,wxLogPassThrough)
-
-/* wxLongLong */
-TClassDef(wxLongLong)
-
-/* wxMBConv */
-TClassDef(wxMBConv)
-
-/* wxMBConvFile */
-TClassDefExtend(wxMBConvFile,wxMBConv)
-
-/* wxMBConvUTF7 */
-TClassDefExtend(wxMBConvUTF7,wxMBConv)
-
-/* wxMBConvUTF8 */
-TClassDefExtend(wxMBConvUTF8,wxMBConv)
-
-/* wxMDIChildFrame */
-TClassDefExtend(wxMDIChildFrame,wxFrame)
-void       wxMDIChildFrame_Activate( TSelf(wxMDIChildFrame) _obj );
-TClass(wxMDIChildFrame) wxMDIChildFrame_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-
-/* wxMDIClientWindow */
-TClassDefExtend(wxMDIClientWindow,wxWindow)
-
-/* wxMDIParentFrame */
-TClassDefExtend(wxMDIParentFrame,wxFrame)
-void       wxMDIParentFrame_ActivateNext( TSelf(wxMDIParentFrame) _obj );
-void       wxMDIParentFrame_ActivatePrevious( TSelf(wxMDIParentFrame) _obj );
-void       wxMDIParentFrame_ArrangeIcons( TSelf(wxMDIParentFrame) _obj );
-void       wxMDIParentFrame_Cascade( TSelf(wxMDIParentFrame) _obj );
-TClass(wxMDIParentFrame)  wxMDIParentFrame_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-TClass(wxMDIChildFrame)   wxMDIParentFrame_GetActiveChild( TSelf(wxMDIParentFrame) _obj );
-TClass(wxMDIClientWindow) wxMDIParentFrame_GetClientWindow( TSelf(wxMDIParentFrame) _obj );
-TClass(wxMenu)            wxMDIParentFrame_GetWindowMenu( TSelf(wxMDIParentFrame) _obj );
-TClass(wxMDIClientWindow) wxMDIParentFrame_OnCreateClient( TSelf(wxMDIParentFrame) _obj );
-void       wxMDIParentFrame_SetWindowMenu( TSelf(wxMDIParentFrame) _obj, TClass(wxMenu) menu );
-void       wxMDIParentFrame_Tile( TSelf(wxMDIParentFrame) _obj );
-
-/* wxMask */
-TClassDefExtend(wxMask,wxObject)
-TClass(wxMask) wxMask_Create( TClass(wxBitmap) bitmap );
-void*      wxMask_CreateColoured( TClass(wxBitmap) bitmap, TClass(wxColour) colour );
-
-/* wxMaximizeEvent */
-TClassDefExtend(wxMaximizeEvent,wxEvent)
-
-/* wxMemoryDC */
-TClassDefExtend(wxMemoryDC,wxDC)
-TClass(wxMemoryDC) wxMemoryDC_Create(  );
-TClass(wxMemoryDC) wxMemoryDC_CreateCompatible( TClass(wxDC) dc );
-void       wxMemoryDC_Delete( TSelf(wxMemoryDC) _obj );
-void       wxMemoryDC_SelectObject( TSelf(wxMemoryDC) _obj, TClass(wxBitmap) bitmap );
-
-/* wxMemoryFSHandler */
-TClassDefExtend(wxMemoryFSHandler,wxFileSystemHandler)
-
-/* wxMemoryInputStream */
-TClassDefExtend(wxMemoryInputStream,wxInputStream)
-
-/* wxMemoryOutputStream */
-TClassDefExtend(wxMemoryOutputStream,wxOutputStream)
-
-/* wxMenu */
-TClassDefExtend(wxMenu,wxEvtHandler)
-void       wxMenu_Append( TSelf(wxMenu) _obj, int id, TString text, TString help, TBool isCheckable );
-void       wxMenu_AppendItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
-void       wxMenu_AppendSeparator( TSelf(wxMenu) _obj );
-void       wxMenu_AppendSub( TSelf(wxMenu) _obj, int id, TString text, TClass(wxMenu) submenu, TString help );
-void       wxMenu_Break( TSelf(wxMenu) _obj );
-void       wxMenu_Check( TSelf(wxMenu) _obj, int id, TBool check );
-TClass(wxMenu) wxMenu_Create( TString title, long style );
-void       wxMenu_DeleteById( TSelf(wxMenu) _obj, int id );
-void       wxMenu_DeleteByItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
-void       wxMenu_DeletePointer( TSelf(wxMenu) _obj );
-void       wxMenu_DestroyById( TSelf(wxMenu) _obj, int id );
-void       wxMenu_DestroyByItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
-void       wxMenu_Enable( TSelf(wxMenu) _obj, int id, TBool enable );
-TClass(wxMenuItem)  wxMenu_FindItem( TSelf(wxMenu) _obj, int id, TClass(wxMenu)* menu );
-int        wxMenu_FindItemByLabel( TSelf(wxMenu) _obj, TString itemString );
-TClass(wxClientData) wxMenu_GetClientData( TSelf(wxMenu) _obj );
-TStringLen wxMenu_GetHelpString( TSelf(wxMenu) _obj, int id, TStringOutVoid _buf );
-TClass(wxWindow) wxMenu_GetInvokingWindow( TSelf(wxMenu) _obj );
-TStringLen wxMenu_GetLabel( TSelf(wxMenu) _obj, int id, TStringOutVoid _buf );
-size_t     wxMenu_GetMenuItemCount( TSelf(wxMenu) _obj );
-int        wxMenu_GetMenuItems( TSelf(wxMenu) _obj, TClass(wxList) _lst );
-TClass(wxMenu) wxMenu_GetParent( TSelf(wxMenu) _obj );
-int        wxMenu_GetStyle( TSelf(wxMenu) _obj );
-TStringLen wxMenu_GetTitle( TSelf(wxMenu) _obj, TStringOutVoid _buf );
-void       wxMenu_Insert( TSelf(wxMenu) _obj, size_t pos, int id, TString text, TString help, TBool isCheckable );
-void       wxMenu_InsertItem( TSelf(wxMenu) _obj, size_t pos, TClass(wxMenuItem) _itm );
-void       wxMenu_InsertSub( TSelf(wxMenu) _obj, size_t pos, int id, TString text, TClass(wxMenu) submenu, TString help );
-TBool      wxMenu_IsAttached( TSelf(wxMenu) _obj );
-TBool      wxMenu_IsChecked( TSelf(wxMenu) _obj, int id );
-TBool      wxMenu_IsEnabled( TSelf(wxMenu) _obj, int id );
-void       wxMenu_Prepend( TSelf(wxMenu) _obj, int id, TString text, TString help, TBool isCheckable );
-void       wxMenu_PrependItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
-void       wxMenu_PrependSub( TSelf(wxMenu) _obj, int id, TString text, TClass(wxMenu) submenu, TString help );
-void       wxMenu_RemoveById( TSelf(wxMenu) _obj, int id, TClass(wxMenuItem) _itm );
-void       wxMenu_RemoveByItem( TSelf(wxMenu) _obj, void* item );
-void       wxMenu_SetClientData( TSelf(wxMenu) _obj, TClass(wxClientData) clientData );
-void       wxMenu_SetEventHandler( TSelf(wxMenu) _obj, TClass(wxEvtHandler) handler );
-void       wxMenu_SetHelpString( TSelf(wxMenu) _obj, int id, TString helpString );
-void       wxMenu_SetInvokingWindow( TSelf(wxMenu) _obj, TClass(wxWindow) win );
-void       wxMenu_SetLabel( TSelf(wxMenu) _obj, int id, TString label );
-void       wxMenu_SetParent( TSelf(wxMenu) _obj, TClass(wxWindow) parent );
-void       wxMenu_SetTitle( TSelf(wxMenu) _obj, TString title );
-void       wxMenu_UpdateUI( TSelf(wxMenu) _obj, void* source );
-
-/* wxMenuBar */
-TClassDefExtend(wxMenuBar,wxEvtHandler)
-int        wxMenuBar_Append( TSelf(wxMenuBar) _obj, TClass(wxMenu) menu, TString title );
-void       wxMenuBar_Check( TSelf(wxMenuBar) _obj, int id, TBool check );
-TClass(wxMenuBar) wxMenuBar_Create( int _style );
-void       wxMenuBar_DeletePointer( TSelf(wxMenuBar) _obj );
-int        wxMenuBar_Enable( TSelf(wxMenuBar) _obj, TBool enable );
-void       wxMenuBar_EnableItem( TSelf(wxMenuBar) _obj, int id, TBool enable );
-void       wxMenuBar_EnableTop( TSelf(wxMenuBar) _obj, int pos, TBool enable );
-void*      wxMenuBar_FindItem( TSelf(wxMenuBar) _obj, int id, TClass(wxMenu) menu );
-int        wxMenuBar_FindMenu( TSelf(wxMenuBar) _obj, TString title );
-int        wxMenuBar_FindMenuItem( TSelf(wxMenuBar) _obj, TString menuString, TString itemString );
-TStringLen wxMenuBar_GetHelpString( TSelf(wxMenuBar) _obj, int id, TStringOutVoid _buf );
-TStringLen wxMenuBar_GetLabel( TSelf(wxMenuBar) _obj, int id, TStringOutVoid _buf );
-TStringLen wxMenuBar_GetLabelTop( TSelf(wxMenuBar) _obj, int pos, TStringOutVoid _buf );
-TClass(wxMenu) wxMenuBar_GetMenu( TSelf(wxMenuBar) _obj, int pos );
-int        wxMenuBar_GetMenuCount( TSelf(wxMenuBar) _obj );
-int        wxMenuBar_Insert( TSelf(wxMenuBar) _obj, int pos, TClass(wxMenu) menu, TString title );
-TBool      wxMenuBar_IsChecked( TSelf(wxMenuBar) _obj, int id );
-TBool      wxMenuBar_IsEnabled( TSelf(wxMenuBar) _obj, int id );
-void*      wxMenuBar_Remove( TSelf(wxMenuBar) _obj, int pos );
-void*      wxMenuBar_Replace( TSelf(wxMenuBar) _obj, int pos, TClass(wxMenu) menu, TString title );
-void       wxMenuBar_SetHelpString( TSelf(wxMenuBar) _obj, int id, TString helpString );
-void       wxMenuBar_SetItemLabel( TSelf(wxMenuBar) _obj, int id, TString label );
-void       wxMenuBar_SetLabel( TSelf(wxMenuBar) _obj, TString s );
-void       wxMenuBar_SetLabelTop( TSelf(wxMenuBar) _obj, int pos, TString label );
-
-/* wxMenuEvent */
-TClassDefExtend(wxMenuEvent,wxEvent)
-void       wxMenuEvent_CopyObject( TSelf(wxMenuEvent) _obj, void* obj );
-int        wxMenuEvent_GetMenuId( TSelf(wxMenuEvent) _obj );
-
-/* wxMenuItem */
-TClassDefExtend(wxMenuItem,wxObject)
-void       wxMenuItem_Check( TSelf(wxMenuItem) _obj, TBool check );
-TClass(wxMenuItem) wxMenuItem_Create(  );
-void       wxMenuItem_Delete( TSelf(wxMenuItem) _obj );
-void       wxMenuItem_Enable( TSelf(wxMenuItem) _obj, TBool enable );
-TStringLen wxMenuItem_GetHelp( TSelf(wxMenuItem) _obj, TStringOutVoid _buf );
-int        wxMenuItem_GetId( TSelf(wxMenuItem) _obj );
-TStringLen wxMenuItem_GetLabel( TSelf(wxMenuItem) _obj, TStringOutVoid _buf );
-TStringLen wxMenuItem_GetLabelFromText( TStringVoid text, TStringOutVoid _buf );
-TClass(wxMenu) wxMenuItem_GetMenu( TSelf(wxMenuItem) _obj );
-void*      wxMenuItem_GetSubMenu( TSelf(wxMenuItem) _obj );
-TStringLen wxMenuItem_GetText( TSelf(wxMenuItem) _obj, TStringOutVoid _buf );
-TBool      wxMenuItem_IsCheckable( TSelf(wxMenuItem) _obj );
-TBool      wxMenuItem_IsChecked( TSelf(wxMenuItem) _obj );
-TBool      wxMenuItem_IsEnabled( TSelf(wxMenuItem) _obj );
-TBool      wxMenuItem_IsSeparator( TSelf(wxMenuItem) _obj );
-TBool      wxMenuItem_IsSubMenu( TSelf(wxMenuItem) _obj );
-void       wxMenuItem_SetCheckable( TSelf(wxMenuItem) _obj, int checkable );
-void       wxMenuItem_SetHelp( TSelf(wxMenuItem) _obj, TStringVoid str );
-void       wxMenuItem_SetId( TSelf(wxMenuItem) _obj, int id );
-void       wxMenuItem_SetSubMenu( TSelf(wxMenuItem) _obj, TClass(wxMenu) menu );
-void       wxMenuItem_SetText( TSelf(wxMenuItem) _obj, TStringVoid str );
-
-/* wxMessageDialog */
-TClassDefExtend(wxMessageDialog,wxDialog)
-TClass(wxMessageDialog) wxMessageDialog_Create( TClass(wxWindow) _prt, TStringVoid _msg, TStringVoid _cap, int _stl );
-void       wxMessageDialog_Delete( TSelf(wxMessageDialog) _obj );
-int        wxMessageDialog_ShowModal( TSelf(wxMessageDialog) _obj );
-
-/* wxMetafile */
-TClassDefExtend(wxMetafile,wxObject)
-TClass(wxMetafile) wxMetafile_Create( TStringVoid _file );
-void       wxMetafile_Delete( TSelf(wxMetafile) _obj );
-TBool      wxMetafile_Ok( TSelf(wxMetafile) _obj );
-TBool      wxMetafile_Play( TSelf(wxMetafile) _obj, TClass(wxDC) _dc );
-TBool      wxMetafile_SetClipboard( TSelf(wxMetafile) _obj, TSize(width,height) );
-
-/* wxMetafileDC */
-TClassDefExtend(wxMetafileDC,wxDC)
-void*      wxMetafileDC_Close( TSelf(wxMetafileDC) _obj );
-TClass(wxMetafileDC) wxMetafileDC_Create( TStringVoid _file );
-void       wxMetafileDC_Delete( TSelf(wxMetafileDC) _obj );
-
-/* wxMimeTypesManager */
-TClassDef(wxMimeTypesManager)
-void       wxMimeTypesManager_AddFallbacks( TSelf(wxMimeTypesManager) _obj, void* _types );
-TClass(wxMimeTypesManager) wxMimeTypesManager_Create(  );
-int        wxMimeTypesManager_EnumAllFileTypes( TSelf(wxMimeTypesManager) _obj, TClass(wxList) _lst );
-void*      wxMimeTypesManager_GetFileTypeFromExtension( TSelf(wxMimeTypesManager) _obj, void* _ext );
-void*      wxMimeTypesManager_GetFileTypeFromMimeType( TSelf(wxMimeTypesManager) _obj, TStringVoid _name );
-TBool      wxMimeTypesManager_IsOfType( TSelf(wxMimeTypesManager) _obj, void* _type, void* _wildcard );
-int        wxMimeTypesManager_ReadMailcap( TSelf(wxMimeTypesManager) _obj, void* _file, int _fb );
-int        wxMimeTypesManager_ReadMimeTypes( TSelf(wxMimeTypesManager) _obj, void* _file );
-
-/* wxMiniFrame */
-TClassDefExtend(wxMiniFrame,wxFrame)
-TClass(wxMiniFrame) wxMiniFrame_Create( TClass(wxWindow) _prt, int _id, TStringVoid _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-
-/* wxModule */
-TClassDefExtend(wxModule,wxObject)
-
-/* wxMouseCaptureChangedEvent */
-TClassDefExtend(wxMouseCaptureChangedEvent,wxEvent)
-
-/* wxMouseEvent */
-TClassDefExtend(wxMouseEvent,wxEvent)
-TBool      wxMouseEvent_AltDown( TSelf(wxMouseEvent) _obj );
-int        wxMouseEvent_Button( TSelf(wxMouseEvent) _obj, int but );
-TBool      wxMouseEvent_ButtonDClick( TSelf(wxMouseEvent) _obj, int but );
-TBool      wxMouseEvent_ButtonDown( TSelf(wxMouseEvent) _obj, int but );
-TBool      wxMouseEvent_ButtonIsDown( TSelf(wxMouseEvent) _obj, int but );
-TBool      wxMouseEvent_ButtonUp( TSelf(wxMouseEvent) _obj, int but );
-TBool      wxMouseEvent_ControlDown( TSelf(wxMouseEvent) _obj );
-void       wxMouseEvent_CopyObject( TSelf(wxMouseEvent) _obj, void* object_dest );
-TBool      wxMouseEvent_Dragging( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_Entering( TSelf(wxMouseEvent) _obj );
-void       wxMouseEvent_GetLogicalPosition( TSelf(wxMouseEvent) _obj, TClass(wxDC) dc, TPointOut(_x,_y) );
-void       wxMouseEvent_GetPosition( TSelf(wxMouseEvent) _obj, TPointOut(_x,_y) );
-int        wxMouseEvent_GetX( TSelf(wxMouseEvent) _obj );
-int        wxMouseEvent_GetY( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_IsButton( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_Leaving( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_LeftDClick( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_LeftDown( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_LeftIsDown( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_LeftUp( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_MetaDown( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_MiddleDClick( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_MiddleDown( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_MiddleIsDown( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_MiddleUp( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_Moving( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_RightDClick( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_RightDown( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_RightIsDown( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_RightUp( TSelf(wxMouseEvent) _obj );
-TBool      wxMouseEvent_ShiftDown( TSelf(wxMouseEvent) _obj );
-
-/* wxMoveEvent */
-TClassDefExtend(wxMoveEvent,wxEvent)
-void       wxMoveEvent_CopyObject( TSelf(wxMoveEvent) _obj, void* obj );
-void       wxMoveEvent_GetPosition( TSelf(wxMoveEvent) _obj, TPointOut(_x,_y) );
-
-/* wxMultiCellCanvas */
-TClassDefExtend(wxMultiCellCanvas,wxFlexGridSizer)
-void       wxMultiCellCanvas_Add( TSelf(wxMultiCellCanvas) _obj, TClass(wxWindow) win, int row, int col );
-void       wxMultiCellCanvas_CalculateConstraints( TSelf(wxMultiCellCanvas) _obj );
-TClass(wxMultiCellCanvas) wxMultiCellCanvas_Create( TClass(wxWindow) parent, int numRows, int numCols );
-int        wxMultiCellCanvas_MaxCols( TSelf(wxMultiCellCanvas) _obj );
-int        wxMultiCellCanvas_MaxRows( TSelf(wxMultiCellCanvas) _obj );
-void       wxMultiCellCanvas_SetMinCellSize( TSelf(wxMultiCellCanvas) _obj, TSize(w,h) );
-
-/* wxMultiCellItemHandle */
-TClassDefExtend(wxMultiCellItemHandle,wxObject)
-TClass(wxMultiCellItemHandle) wxMultiCellItemHandle_Create( int row, int column, int height, int width, int sx, int sy, int style, int wx, int wy, int align );
-void*      wxMultiCellItemHandle_CreateWithSize( TSelf(wxMultiCellItemHandle) _obj, int row, int column, int sx, int sy, int style, int wx, int wy, int align );
-void*      wxMultiCellItemHandle_CreateWithStyle( TSelf(wxMultiCellItemHandle) _obj, int row, int column, int style, int wx, int wy, int align );
-int        wxMultiCellItemHandle_GetAlignment( TSelf(wxMultiCellItemHandle) _obj );
-int        wxMultiCellItemHandle_GetColumn( TSelf(wxMultiCellItemHandle) _obj );
-int        wxMultiCellItemHandle_GetHeight( TSelf(wxMultiCellItemHandle) _obj );
-void       wxMultiCellItemHandle_GetLocalSize( TSelf(wxMultiCellItemHandle) _obj, TSizeOutVoid(_w,_h) );
-int        wxMultiCellItemHandle_GetRow( TSelf(wxMultiCellItemHandle) _obj );
-int        wxMultiCellItemHandle_GetStyle( TSelf(wxMultiCellItemHandle) _obj );
-void       wxMultiCellItemHandle_GetWeight( TSelf(wxMultiCellItemHandle) _obj, TSizeOutVoid(_w,_h) );
-int        wxMultiCellItemHandle_GetWidth( TSelf(wxMultiCellItemHandle) _obj );
-
-/* wxMultiCellSizer */
-TClassDefExtend(wxMultiCellSizer,wxSizer)
-void       wxMultiCellSizer_CalcMin( TSelf(wxMultiCellSizer) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxMultiCellSizer) wxMultiCellSizer_Create( int rows, int cols );
-void       wxMultiCellSizer_Delete( TSelf(wxMultiCellSizer) _obj );
-int        wxMultiCellSizer_EnableGridLines( TSelf(wxMultiCellSizer) _obj, TClass(wxWindow) win );
-void       wxMultiCellSizer_RecalcSizes( TSelf(wxMultiCellSizer) _obj );
-int        wxMultiCellSizer_SetColumnWidth( TSelf(wxMultiCellSizer) _obj, int column, int colSize, int expandable );
-int        wxMultiCellSizer_SetDefaultCellSize( TSelf(wxMultiCellSizer) _obj, TSize(w,h) );
-int        wxMultiCellSizer_SetGridPen( TSelf(wxMultiCellSizer) _obj, TClass(wxPen) pen );
-int        wxMultiCellSizer_SetRowHeight( TSelf(wxMultiCellSizer) _obj, int row, int rowSize, int expandable );
-
-/* wxMutex */
-TClassDef(wxMutex)
-TClass(wxMutex) wxMutex_Create(  );
-void       wxMutex_Delete( TSelf(wxMutex) _obj );
-TBool      wxMutex_IsLocked( TSelf(wxMutex) _obj );
-int        wxMutex_Lock( TSelf(wxMutex) _obj );
-int        wxMutex_TryLock( TSelf(wxMutex) _obj );
-int        wxMutex_Unlock( TSelf(wxMutex) _obj );
-
-/* wxMutexLocker */
-TClassDef(wxMutexLocker)
-
-/* wxNavigationKeyEvent */
-TClassDefExtend(wxNavigationKeyEvent,wxEvent)
-void*      wxNavigationKeyEvent_GetCurrentFocus( TSelf(wxNavigationKeyEvent) _obj );
-int        wxNavigationKeyEvent_GetDirection( TSelf(wxNavigationKeyEvent) _obj );
-TBool      wxNavigationKeyEvent_IsWindowChange( TSelf(wxNavigationKeyEvent) _obj );
-void       wxNavigationKeyEvent_SetCurrentFocus( TSelf(wxNavigationKeyEvent) _obj, TClass(wxWindow) win );
-void       wxNavigationKeyEvent_SetDirection( TSelf(wxNavigationKeyEvent) _obj, int bForward );
-/* void       wxNavigationKeyEvent_SetPropagate( TSelf(wxNavigationKeyEvent) _obj, int bDoIt );*/
-void       wxNavigationKeyEvent_SetWindowChange( TSelf(wxNavigationKeyEvent) _obj, int bIs );
-int        wxNavigationKeyEvent_ShouldPropagate( TSelf(wxNavigationKeyEvent) _obj );
-
-/* wxNewBitmapButton */
-TClassDefExtend(wxNewBitmapButton,wxPanel)
-TClass(wxNewBitmapButton) wxNewBitmapButton_Create( void* labelBitmap, void* labelText, int alignText, TBool isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, TBool isSticky );
-TClass(wxNewBitmapButton) wxNewBitmapButton_CreateFromFile( TSelf(wxNewBitmapButton) bitmapFileName, int bitmapFileType, void* labelText, int alignText, TBool isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, TBool isSticky );
-void       wxNewBitmapButton_Delete( TSelf(wxNewBitmapButton) _obj );
-void       wxNewBitmapButton_DrawDecorations( TSelf(wxNewBitmapButton) _obj, TClass(wxDC) dc );
-void       wxNewBitmapButton_DrawLabel( TSelf(wxNewBitmapButton) _obj, TClass(wxDC) dc );
-int        wxNewBitmapButton_Enable( TSelf(wxNewBitmapButton) _obj, TBool enable );
-void       wxNewBitmapButton_Realize( TSelf(wxNewBitmapButton) _obj, TClass(wxWindow) _prt, int _id, TRect(_x,_y,_w,_h) );
-void       wxNewBitmapButton_RenderAllLabelImages( TSelf(wxNewBitmapButton) _obj );
-void       wxNewBitmapButton_RenderLabelImage( TSelf(wxNewBitmapButton) _obj, void* destBmp, void* srcBmp, TBool isEnabled, TBool isPressed );
-void       wxNewBitmapButton_RenderLabelImages( TSelf(wxNewBitmapButton) _obj );
-void       wxNewBitmapButton_Reshape( TSelf(wxNewBitmapButton) _obj );
-void       wxNewBitmapButton_SetAlignments( TSelf(wxNewBitmapButton) _obj, int alignText, int marginX, int marginY, int textToLabelGap );
-void       wxNewBitmapButton_SetLabel( TSelf(wxNewBitmapButton) _obj, void* labelBitmap, void* labelText );
-
-/* wxNodeBase */
-TClassDef(wxNodeBase)
-
-/* wxNotebook */
-TClassDefExtend(wxNotebook,wxControl)
-int        wxNotebook_AddPage( TSelf(wxNotebook) _obj, TClass(wxWindow) pPage, TStringVoid strText, TBoolInt bSelect, int imageId );
-void       wxNotebook_AdvanceSelection( TSelf(wxNotebook) _obj, TBoolInt bForward );
-TClass(wxNotebook) wxNotebook_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxNotebook_DeleteAllPages( TSelf(wxNotebook) _obj );
-int        wxNotebook_DeletePage( TSelf(wxNotebook) _obj, int nPage );
-TClass(wxImageList) wxNotebook_GetImageList( TSelf(wxNotebook) _obj );
-TClass(wxWindow)    wxNotebook_GetPage( TSelf(wxNotebook) _obj, int nPage );
-int        wxNotebook_GetPageCount( TSelf(wxNotebook) _obj );
-int        wxNotebook_GetPageImage( TSelf(wxNotebook) _obj, int nPage );
-TStringLen wxNotebook_GetPageText( TSelf(wxNotebook) _obj, int nPage, TStringOutVoid _buf );
-int        wxNotebook_GetRowCount( TSelf(wxNotebook) _obj );
-int        wxNotebook_GetSelection( TSelf(wxNotebook) _obj );
-int        wxNotebook_InsertPage( TSelf(wxNotebook) _obj, int nPage, TClass(wxWindow) pPage, TStringVoid strText, TBoolInt bSelect, int imageId );
-int        wxNotebook_RemovePage( TSelf(wxNotebook) _obj, int nPage );
-void       wxNotebook_SetImageList( TSelf(wxNotebook) _obj, TClass(wxImageList) imageList );
-void       wxNotebook_SetPadding( TSelf(wxNotebook) _obj, TSize(_w,_h) );
-int        wxNotebook_SetPageImage( TSelf(wxNotebook) _obj, int nPage, int nImage );
-void       wxNotebook_SetPageSize( TSelf(wxNotebook) _obj, TSize(_w,_h) );
-int        wxNotebook_SetPageText( TSelf(wxNotebook) _obj, int nPage, TStringVoid strText );
-int        wxNotebook_SetSelection( TSelf(wxNotebook) _obj, int nPage );
-
-/* wxNotebookEvent */
-TClassDefExtend(wxNotebookEvent,wxNotifyEvent)
-
-/* wxNotebookSizer */
-TClassDefExtend(wxNotebookSizer,wxSizer)
-void       wxNotebookSizer_CalcMin( TSelf(wxNotebookSizer) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxNotebookSizer) wxNotebookSizer_Create( TClass(wxNotebook) nb );
-TClass(wxNotebook) wxNotebookSizer_GetNotebook( TSelf(wxNotebookSizer) _obj );
-void       wxNotebookSizer_RecalcSizes( TSelf(wxNotebookSizer) _obj );
-
-/* wxNotifyEvent */
-TClassDefExtend(wxNotifyEvent,wxCommandEvent)
-void       wxNotifyEvent_Allow( TSelf(wxNotifyEvent) _obj );
-void       wxNotifyEvent_CopyObject( TSelf(wxNotifyEvent) _obj, void* object_dest );
-TBool      wxNotifyEvent_IsAllowed( TSelf(wxNotifyEvent) _obj );
-void       wxNotifyEvent_Veto( TSelf(wxNotifyEvent) _obj );
-
-/* wxObject */
-TClassDef(wxObject)
-
-/* wxObjectRefData */
-TClassDef(wxObjectRefData)
-
-/* wxOutputStream */
-TClassDefExtend(wxOutputStream,wxStreamBase)
-void       wxOutputStream_Delete( TSelf(wxOutputStream) _obj );
-int        wxOutputStream_LastWrite( TSelf(wxOutputStream) _obj );
-void       wxOutputStream_PutC( TSelf(wxOutputStream) _obj, TChar c );
-int        wxOutputStream_Seek( TSelf(wxOutputStream) _obj, int pos, int mode );
-void       wxOutputStream_Sync( TSelf(wxOutputStream) _obj );
-int        wxOutputStream_Tell( TSelf(wxOutputStream) _obj );
-void       wxOutputStream_Write( TSelf(wxOutputStream) _obj, void* buffer, int size );
-
-/* wxPageSetupDialog */
-TClassDefExtend(wxPageSetupDialog,wxDialog)
-TClass(wxPageSetupDialog) wxPageSetupDialog_Create( TClass(wxWindow) parent, TClass(wxPageSetupDialogData) data );
-void       wxPageSetupDialog_GetPageSetupData( TSelf(wxPageSetupDialog) _obj, TClassRef(wxPageSetupDialogData) _ref );
-
-/* wxPageSetupDialogData */
-TClassDefExtend(wxPageSetupDialogData,wxObject)
-void       wxPageSetupDialogData_Assign( TSelf(wxPageSetupDialogData) _obj, TClassRef(wxPageSetupDialogData) data );
-void       wxPageSetupDialogData_AssignData( TSelf(wxPageSetupDialogData) _obj, TClass(wxPrintData) printData );
-void       wxPageSetupDialogData_CalculateIdFromPaperSize( TSelf(wxPageSetupDialogData) _obj );
-void       wxPageSetupDialogData_CalculatePaperSizeFromId( TSelf(wxPageSetupDialogData) _obj );
-TClass(wxPageSetupDialogData) wxPageSetupDialogData_Create(  );
-TClass(wxPageSetupDialogData) wxPageSetupDialogData_CreateFromData( TClass(wxPrintData) printData );
-void       wxPageSetupDialogData_Delete( TSelf(wxPageSetupDialogData) _obj );
-void       wxPageSetupDialogData_EnableHelp( TSelf(wxPageSetupDialogData) _obj, TBool flag );
-void       wxPageSetupDialogData_EnableMargins( TSelf(wxPageSetupDialogData) _obj, TBool flag );
-void       wxPageSetupDialogData_EnableOrientation( TSelf(wxPageSetupDialogData) _obj, TBool flag );
-void       wxPageSetupDialogData_EnablePaper( TSelf(wxPageSetupDialogData) _obj, TBool flag );
-void       wxPageSetupDialogData_EnablePrinter( TSelf(wxPageSetupDialogData) _obj, TBool flag );
-TBool      wxPageSetupDialogData_GetDefaultInfo( TSelf(wxPageSetupDialogData) _obj );
-TBool      wxPageSetupDialogData_GetDefaultMinMargins( TSelf(wxPageSetupDialogData) _obj );
-TBool      wxPageSetupDialogData_GetEnableHelp( TSelf(wxPageSetupDialogData) _obj );
-TBool      wxPageSetupDialogData_GetEnableMargins( TSelf(wxPageSetupDialogData) _obj );
-TBool      wxPageSetupDialogData_GetEnableOrientation( TSelf(wxPageSetupDialogData) _obj );
-TBool      wxPageSetupDialogData_GetEnablePaper( TSelf(wxPageSetupDialogData) _obj );
-TBool      wxPageSetupDialogData_GetEnablePrinter( TSelf(wxPageSetupDialogData) _obj );
-void       wxPageSetupDialogData_GetMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
-void       wxPageSetupDialogData_GetMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
-void       wxPageSetupDialogData_GetMinMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
-void       wxPageSetupDialogData_GetMinMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
-int        wxPageSetupDialogData_GetPaperId( TSelf(wxPageSetupDialogData) _obj );
-void       wxPageSetupDialogData_GetPaperSize( TSelf(wxPageSetupDialogData) _obj, TSizeOutVoid(_w,_h) );
-void       wxPageSetupDialogData_GetPrintData( TSelf(wxPageSetupDialogData) _obj, TClassRef(wxPrintData) _ref );
-void       wxPageSetupDialogData_SetDefaultInfo( TSelf(wxPageSetupDialogData) _obj, TBool flag );
-void       wxPageSetupDialogData_SetDefaultMinMargins( TSelf(wxPageSetupDialogData) _obj, int flag );
-void       wxPageSetupDialogData_SetMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
-void       wxPageSetupDialogData_SetMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
-void       wxPageSetupDialogData_SetMinMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
-void       wxPageSetupDialogData_SetMinMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
-void       wxPageSetupDialogData_SetPaperId( TSelf(wxPageSetupDialogData) _obj, void* id );
-void       wxPageSetupDialogData_SetPaperSize( TSelf(wxPageSetupDialogData) _obj, TSize(w,h) );
-void       wxPageSetupDialogData_SetPaperSizeId( TSelf(wxPageSetupDialogData) _obj, int id );
-void       wxPageSetupDialogData_SetPrintData( TSelf(wxPageSetupDialogData) _obj, TClass(wxPrintData) printData );
-
-/* wxPaintDC */
-TClassDefExtend(wxPaintDC,wxWindowDC)
-TClass(wxPaintDC) wxPaintDC_Create( TClass(wxWindow) win );
-void       wxPaintDC_Delete( TSelf(wxPaintDC) _obj );
-
-/* wxPaintEvent */
-TClassDefExtend(wxPaintEvent,wxEvent)
-
-/* wxPalette */
-TClassDefExtend(wxPalette,wxGDIObject)
-void       wxPalette_Assign( TSelf(wxPalette) _obj, TClass(wxPalette) palette );
-TClass(wxPalette) wxPalette_CreateDefault(  );
-TClass(wxPalette) wxPalette_CreateRGB( int n, void* red, void* green, void* blue );
-void       wxPalette_Delete( TSelf(wxPalette) _obj );
-int        wxPalette_GetPixel( TSelf(wxPalette) _obj, TColorRGB(red,green,blue) );
-TBoolInt   wxPalette_GetRGB( TSelf(wxPalette) _obj, int pixel, void* red, void* green, void* blue );
-TBool      wxPalette_IsEqual( TSelf(wxPalette) _obj, TClass(wxPalette) palette );
-TBool      wxPalette_Ok( TSelf(wxPalette) _obj );
-
-/* wxPaletteChangedEvent */
-TClassDefExtend(wxPaletteChangedEvent,wxEvent)
-void       wxPaletteChangedEvent_CopyObject( TSelf(wxPaletteChangedEvent) _obj, void* obj );
-void*      wxPaletteChangedEvent_GetChangedWindow( TSelf(wxPaletteChangedEvent) _obj );
-void       wxPaletteChangedEvent_SetChangedWindow( TSelf(wxPaletteChangedEvent) _obj, TClass(wxWindow) win );
-
-/* wxPanel */
-TClassDefExtend(wxPanel,wxWindow)
-TClass(wxPanel)  wxPanel_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-TClass(wxButton) wxPanel_GetDefaultItem( TSelf(wxPanel) _obj );
-void       wxPanel_InitDialog( TSelf(wxPanel) _obj );
-void       wxPanel_SetDefaultItem( TSelf(wxPanel) _obj, TClass(wxButton) btn );
-
-/* wxPathList */
-TClassDefExtend(wxPathList,wxList)
-
-/* wxPen */
-TClassDefExtend(wxPen,wxGDIObject)
-void       wxPen_Assign( TSelf(wxPen) _obj, TClass(wxPen) pen );
-TClass(wxPen) wxPen_CreateDefault(  );
-TClass(wxPen) wxPen_CreateFromBitmap( TClass(wxBitmap) stipple, int width );
-TClass(wxPen) wxPen_CreateFromColour( TClass(wxColour) col, int width, int style );
-TClass(wxPen) wxPen_CreateFromStock( int id );
-void       wxPen_Delete( TSelf(wxPen) _obj );
-int        wxPen_GetCap( TSelf(wxPen) _obj );
-void       wxPen_GetColour( TSelf(wxPen) _obj, TClassRef(wxColour) _ref );
-int        wxPen_GetDashes( TSelf(wxPen) _obj, void* ptr );
-int        wxPen_GetJoin( TSelf(wxPen) _obj );
-void       wxPen_GetStipple( TSelf(wxPen) _obj, TClassRef(wxBitmap) _ref );
-int        wxPen_GetStyle( TSelf(wxPen) _obj );
-int        wxPen_GetWidth( TSelf(wxPen) _obj );
-TBool      wxPen_IsEqual( TSelf(wxPen) _obj, TClass(wxPen) pen );
-TBool      wxPen_Ok( TSelf(wxPen) _obj );
-void       wxPen_SetCap( TSelf(wxPen) _obj, int cap );
-void       wxPen_SetColour( TSelf(wxPen) _obj, TClass(wxColour) col );
-void       wxPen_SetColourSingle( TSelf(wxPen) _obj, TChar r, TChar g, TChar b );
-void       wxPen_SetDashes( TSelf(wxPen) _obj, int nb_dashes, void* dash );
-void       wxPen_SetJoin( TSelf(wxPen) _obj, int join );
-void       wxPen_SetStipple( TSelf(wxPen) _obj, TClass(wxBitmap) stipple );
-void       wxPen_SetStyle( TSelf(wxPen) _obj, int style );
-void       wxPen_SetWidth( TSelf(wxPen) _obj, int width );
-
-/* wxPenList */
-TClassDefExtend(wxPenList,wxList)
-
-/* wxPlotCurve */
-TClassDefExtend(wxPlotCurve,wxObject)
-
-/* wxPlotEvent */
-TClassDefExtend(wxPlotEvent,wxNotifyEvent)
-void*      wxPlotEvent_GetCurve( TSelf(wxPlotEvent) _obj );
-int        wxPlotEvent_GetPosition( TSelf(wxPlotEvent) _obj );
-double     wxPlotEvent_GetZoom( TSelf(wxPlotEvent) _obj );
-void       wxPlotEvent_SetPosition( TSelf(wxPlotEvent) _obj, int pos );
-void       wxPlotEvent_SetZoom( TSelf(wxPlotEvent) _obj, double zoom );
-
-/* wxPlotOnOffCurve */
-TClassDefExtend(wxPlotOnOffCurve,wxObject)
-void       wxPlotOnOffCurve_Add( TSelf(wxPlotOnOffCurve) _obj, int on, int off, TClass(wxClientData) clientData );
-TClass(wxPlotOnOffCurve) wxPlotOnOffCurve_Create( int offsetY );
-void       wxPlotOnOffCurve_Delete( TSelf(wxPlotOnOffCurve) _obj );
-void       wxPlotOnOffCurve_DrawOffLine( TSelf(wxPlotOnOffCurve) _obj, TClass(wxDC) dc, int y, int start, int end );
-void       wxPlotOnOffCurve_DrawOnLine( TSelf(wxPlotOnOffCurve) _obj, TClass(wxDC) dc, int y, int start, int end, TClass(wxClientData) clientData );
-void*      wxPlotOnOffCurve_GetAt( TSelf(wxPlotOnOffCurve) _obj, int index );
-TClass(wxClientData) wxPlotOnOffCurve_GetClientData( TSelf(wxPlotOnOffCurve) _obj, int index );
-int        wxPlotOnOffCurve_GetCount( TSelf(wxPlotOnOffCurve) _obj );
-int        wxPlotOnOffCurve_GetEndX( TSelf(wxPlotOnOffCurve) _obj );
-int        wxPlotOnOffCurve_GetOff( TSelf(wxPlotOnOffCurve) _obj, int index );
-int        wxPlotOnOffCurve_GetOffsetY( TSelf(wxPlotOnOffCurve) _obj );
-int        wxPlotOnOffCurve_GetOn( TSelf(wxPlotOnOffCurve) _obj, int index );
-int        wxPlotOnOffCurve_GetStartX( TSelf(wxPlotOnOffCurve) _obj );
-void       wxPlotOnOffCurve_SetOffsetY( TSelf(wxPlotOnOffCurve) _obj, int offsetY );
-
-/* wxPlotWindow */
-TClassDefExtend(wxPlotWindow,wxScrolledWindow)
-void       wxPlotWindow_Add( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve );
-void       wxPlotWindow_AddOnOff( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve );
-TClass(wxPlotWindow) wxPlotWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int flags );
-void       wxPlotWindow_Delete( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve );
-void       wxPlotWindow_DeleteOnOff( TSelf(wxPlotWindow) _obj, TClass(wxPlotOnOffCurve) curve );
-void       wxPlotWindow_Enlarge( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve, double factor );
-TClass(wxPlotCurve) wxPlotWindow_GetAt( TSelf(wxPlotWindow) _obj, int n );
-int        wxPlotWindow_GetCount( TSelf(wxPlotWindow) _obj );
-TClass(wxPlotCurve) wxPlotWindow_GetCurrent( TSelf(wxPlotWindow) _obj );
-int        wxPlotWindow_GetEnlargeAroundWindowCentre( TSelf(wxPlotWindow) _obj );
-TClass(wxPlotOnOffCurve)      wxPlotWindow_GetOnOffCurveAt( TSelf(wxPlotWindow) _obj, int n );
-int        wxPlotWindow_GetOnOffCurveCount( TSelf(wxPlotWindow) _obj );
-int        wxPlotWindow_GetScrollOnThumbRelease( TSelf(wxPlotWindow) _obj );
-double     wxPlotWindow_GetUnitsPerValue( TSelf(wxPlotWindow) _obj );
-double     wxPlotWindow_GetZoom( TSelf(wxPlotWindow) _obj );
-void       wxPlotWindow_Move( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve, int pixels_up );
-void       wxPlotWindow_RedrawEverything( TSelf(wxPlotWindow) _obj );
-void       wxPlotWindow_RedrawXAxis( TSelf(wxPlotWindow) _obj );
-void       wxPlotWindow_RedrawYAxis( TSelf(wxPlotWindow) _obj );
-void       wxPlotWindow_ResetScrollbar( TSelf(wxPlotWindow) _obj );
-void       wxPlotWindow_SetCurrent( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) current );
-void       wxPlotWindow_SetEnlargeAroundWindowCentre( TSelf(wxPlotWindow) _obj, int enlargeAroundWindowCentre );
-void       wxPlotWindow_SetScrollOnThumbRelease( TSelf(wxPlotWindow) _obj, int scrollOnThumbRelease );
-void       wxPlotWindow_SetUnitsPerValue( TSelf(wxPlotWindow) _obj, double upv );
-void       wxPlotWindow_SetZoom( TSelf(wxPlotWindow) _obj, double zoom );
-
-/* wxPoint */
-TClassDef(wxPoint)
-TClass(wxPoint) wxPoint_Create( TPoint(xx,yy) );
-void       wxPoint_Destroy( TSelf(wxPoint) _obj );
-int        wxPoint_GetX( TSelf(wxPoint) _obj );
-int        wxPoint_GetY( TSelf(wxPoint) _obj );
-void       wxPoint_SetX( TSelf(wxPoint) _obj, int w );
-void       wxPoint_SetY( TSelf(wxPoint) _obj, int h );
-
-/* wxPopupTransientWindow */
-TClassDefExtend(wxPopupTransientWindow,wxPopupWindow)
-
-/* wxPopupWindow */
-TClassDefExtend(wxPopupWindow,wxWindow)
-
-/* wxPostScriptDC */
-TClassDefExtend(wxPostScriptDC,wxDC)
-
-/* wxPreviewCanvas */
-TClassDefExtend(wxPreviewCanvas,wxScrolledWindow)
-TClass(wxPreviewCanvas) wxPreviewCanvas_Create( TClass(wxPrintPreview) preview, TClass(wxWindow) parent, TRect(x,y,w,h), int style );
-
-/* wxPreviewControlBar */
-TClassDefExtend(wxPreviewControlBar,wxPanel)
-
-/* wxPreviewFrame */
-TClassDefExtend(wxPreviewFrame,wxFrame)
-
-/* wxPrintData */
-TClassDefExtend(wxPrintData,wxObject)
-void       wxPrintData_Assign( TSelf(wxPrintData) _obj, TClass(wxPrintData) data );
-TClass(wxPrintData) wxPrintData_Create(  );
-void       wxPrintData_Delete( TSelf(wxPrintData) _obj );
-TBool      wxPrintData_GetCollate( TSelf(wxPrintData) _obj );
-TBool      wxPrintData_GetColour( TSelf(wxPrintData) _obj );
-int        wxPrintData_GetDuplex( TSelf(wxPrintData) _obj );
-TStringLen wxPrintData_GetFilename( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
-TStringLen wxPrintData_GetFontMetricPath( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
-int        wxPrintData_GetNoCopies( TSelf(wxPrintData) _obj );
-int        wxPrintData_GetOrientation( TSelf(wxPrintData) _obj );
-int        wxPrintData_GetPaperId( TSelf(wxPrintData) _obj );
-void       wxPrintData_GetPaperSize( TSelf(wxPrintData) _obj, TSizeOutVoid(_w,_h) );
-TStringLen wxPrintData_GetPreviewCommand( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
-int        wxPrintData_GetPrintMode( TSelf(wxPrintData) _obj );
-TStringLen wxPrintData_GetPrinterCommand( TSelf(wxPrintData) _obj, TStringOutVoid  _ref );
-TStringLen wxPrintData_GetPrinterName( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
-TStringLen wxPrintData_GetPrinterOptions( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
-double     wxPrintData_GetPrinterScaleX( TSelf(wxPrintData) _obj );
-double     wxPrintData_GetPrinterScaleY( TSelf(wxPrintData) _obj );
-int        wxPrintData_GetPrinterTranslateX( TSelf(wxPrintData) _obj );
-int        wxPrintData_GetPrinterTranslateY( TSelf(wxPrintData) _obj );
-int        wxPrintData_GetQuality( TSelf(wxPrintData) _obj );
-void       wxPrintData_SetCollate( TSelf(wxPrintData) _obj, TBoolInt flag );
-void       wxPrintData_SetColour( TSelf(wxPrintData) _obj, TBoolInt colour );
-void       wxPrintData_SetDuplex( TSelf(wxPrintData) _obj, int duplex );
-void       wxPrintData_SetFilename( TSelf(wxPrintData) _obj, TStringVoid filename );
-void       wxPrintData_SetFontMetricPath( TSelf(wxPrintData) _obj, TStringVoid path );
-void       wxPrintData_SetNoCopies( TSelf(wxPrintData) _obj, int v );
-void       wxPrintData_SetOrientation( TSelf(wxPrintData) _obj, int orient );
-void       wxPrintData_SetPaperId( TSelf(wxPrintData) _obj, int sizeId );
-void       wxPrintData_SetPaperSize( TSelf(wxPrintData) _obj, TSize(w,h) );
-void       wxPrintData_SetPreviewCommand( TSelf(wxPrintData) _obj, TClass(wxCommand) command );
-void       wxPrintData_SetPrintMode( TSelf(wxPrintData) _obj, int printMode );
-void       wxPrintData_SetPrinterCommand( TSelf(wxPrintData) _obj, TClass(wxCommand) command );
-void       wxPrintData_SetPrinterName( TSelf(wxPrintData) _obj, TStringVoid name );
-void       wxPrintData_SetPrinterOptions( TSelf(wxPrintData) _obj, TStringVoid options );
-void       wxPrintData_SetPrinterScaleX( TSelf(wxPrintData) _obj, double x );
-void       wxPrintData_SetPrinterScaleY( TSelf(wxPrintData) _obj, double y );
-void       wxPrintData_SetPrinterScaling( TSelf(wxPrintData) _obj, double x, double y );
-void       wxPrintData_SetPrinterTranslateX( TSelf(wxPrintData) _obj, int x );
-void       wxPrintData_SetPrinterTranslateY( TSelf(wxPrintData) _obj, int y );
-void       wxPrintData_SetPrinterTranslation( TSelf(wxPrintData) _obj, TPoint(x,y) );
-void       wxPrintData_SetQuality( TSelf(wxPrintData) _obj, int quality );
-
-/* wxPostScriptPrintNativeData */
-TClassDefExtend(wxPostScriptPrintNativeData,wxObject)
-TClass(wxPostScriptPrintNativeData) wxPostScriptPrintNativeData_Create(  );
-void       wxPostScriptPrintNativeData_Delete( TSelf(wxPostScriptPrintNativeData) _obj );
-
-/* wxPrintDialog */
-TClassDefExtend(wxPrintDialog,wxDialog)
-TClass(wxPrintDialog) wxPrintDialog_Create( TClass(wxWindow) parent, TClass(wxPrintDialogData) data );
-TClass(wxDC)         wxPrintDialog_GetPrintDC( TSelf(wxPrintDialog) _obj );
-void       wxPrintDialog_GetPrintData( TSelf(wxPrintDialog) _obj, TClassRef(wxPrintData) _ref );
-TClass(wxPrintDialogData) wxPrintDialog_GetPrintDialogData( TSelf(wxPrintDialog) _obj );
-
-/* wxPrintDialogData */
-TClassDefExtend(wxPrintDialogData,wxObject)
-void       wxPrintDialogData_Assign( TSelf(wxPrintDialogData) _obj, TClass(wxPrintDialogData) data );
-void       wxPrintDialogData_AssignData( TSelf(wxPrintDialogData) _obj, TClass(wxPrintData) data );
-TClass(wxPrintDialogData) wxPrintDialogData_CreateDefault(  );
-TClass(wxPrintDialogData) wxPrintDialogData_CreateFromData( TClass(wxPrintData) printData );
-void       wxPrintDialogData_Delete( TSelf(wxPrintDialogData) _obj );
-void       wxPrintDialogData_EnableHelp( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-void       wxPrintDialogData_EnablePageNumbers( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-void       wxPrintDialogData_EnablePrintToFile( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-void       wxPrintDialogData_EnableSelection( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-int        wxPrintDialogData_GetAllPages( TSelf(wxPrintDialogData) _obj );
-TBoolInt   wxPrintDialogData_GetCollate( TSelf(wxPrintDialogData) _obj );
-TBoolInt   wxPrintDialogData_GetEnableHelp( TSelf(wxPrintDialogData) _obj );
-TBoolInt   wxPrintDialogData_GetEnablePageNumbers( TSelf(wxPrintDialogData) _obj );
-TBoolInt   wxPrintDialogData_GetEnablePrintToFile( TSelf(wxPrintDialogData) _obj );
-TBoolInt   wxPrintDialogData_GetEnableSelection( TSelf(wxPrintDialogData) _obj );
-int        wxPrintDialogData_GetFromPage( TSelf(wxPrintDialogData) _obj );
-int        wxPrintDialogData_GetMaxPage( TSelf(wxPrintDialogData) _obj );
-int        wxPrintDialogData_GetMinPage( TSelf(wxPrintDialogData) _obj );
-int        wxPrintDialogData_GetNoCopies( TSelf(wxPrintDialogData) _obj );
-void       wxPrintDialogData_GetPrintData( TSelf(wxPrintDialogData) _obj, TClassRef(wxPrintData) _ref );
-TBoolInt   wxPrintDialogData_GetPrintToFile( TSelf(wxPrintDialogData) _obj );
-TBoolInt   wxPrintDialogData_GetSelection( TSelf(wxPrintDialogData) _obj );
-int        wxPrintDialogData_GetToPage( TSelf(wxPrintDialogData) _obj );
-void       wxPrintDialogData_SetAllPages( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-void       wxPrintDialogData_SetCollate( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-void       wxPrintDialogData_SetFromPage( TSelf(wxPrintDialogData) _obj, int v );
-void       wxPrintDialogData_SetMaxPage( TSelf(wxPrintDialogData) _obj, int v );
-void       wxPrintDialogData_SetMinPage( TSelf(wxPrintDialogData) _obj, int v );
-void       wxPrintDialogData_SetNoCopies( TSelf(wxPrintDialogData) _obj, int v );
-void       wxPrintDialogData_SetPrintData( TSelf(wxPrintDialogData) _obj, TClass(wxPrintData) printData );
-void       wxPrintDialogData_SetPrintToFile( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-void       wxPrintDialogData_SetSelection( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
-void       wxPrintDialogData_SetToPage( TSelf(wxPrintDialogData) _obj, int v );
-
-/* wxPrintPreview */
-TClassDefExtend(wxPrintPreview,wxObject)
-TClass(wxPrintPreview) wxPrintPreview_CreateFromData( TClass(wxPrintout) printout, TClass(wxPrintout) printoutForPrinting, TClass(wxPrintData) data );
-TClass(wxPrintPreview) wxPrintPreview_CreateFromDialogData( TClass(wxPrintout) printout, TClass(wxPrintout) printoutForPrinting, TClass(wxPrintDialogData) data );
-void       wxPrintPreview_Delete( TSelf(wxPrintPreview) _obj );
-void       wxPrintPreview_DetermineScaling( TSelf(wxPrintPreview) _obj );
-TBoolInt   wxPrintPreview_DrawBlankPage( TSelf(wxPrintPreview) _obj, TClass(wxPreviewCanvas) canvas, TClass(wxDC) dc );
-TClass(wxPreviewCanvas)  wxPrintPreview_GetCanvas( TSelf(wxPrintPreview) _obj );
-int        wxPrintPreview_GetCurrentPage( TSelf(wxPrintPreview) _obj );
-TClass(wxFrame) wxPrintPreview_GetFrame( TSelf(wxPrintPreview) _obj );
-int        wxPrintPreview_GetMaxPage( TSelf(wxPrintPreview) _obj );
-int        wxPrintPreview_GetMinPage( TSelf(wxPrintPreview) _obj );
-void       wxPrintPreview_GetPrintDialogData( TSelf(wxPrintPreview) _obj, TClassRef(wxPrintDialogData) _ref );
-TClass(wxPrintout) wxPrintPreview_GetPrintout( TSelf(wxPrintPreview) _obj );
-TClass(wxPrintout) wxPrintPreview_GetPrintoutForPrinting( TSelf(wxPrintPreview) _obj );
-int        wxPrintPreview_GetZoom( TSelf(wxPrintPreview) _obj );
-TBool      wxPrintPreview_Ok( TSelf(wxPrintPreview) _obj );
-TBoolInt   wxPrintPreview_PaintPage( TSelf(wxPrintPreview) _obj, TClass(wxPrintPreview) canvas, TClass(wxDC) dc );
-TBoolInt   wxPrintPreview_Print( TSelf(wxPrintPreview) _obj, TBoolInt interactive );
-TBoolInt   wxPrintPreview_RenderPage( TSelf(wxPrintPreview) _obj, int pageNum );
-void       wxPrintPreview_SetCanvas( TSelf(wxPrintPreview) _obj, TClass(wxPreviewCanvas) canvas );
-TBoolInt   wxPrintPreview_SetCurrentPage( TSelf(wxPrintPreview) _obj, int pageNum );
-void       wxPrintPreview_SetFrame( TSelf(wxPrintPreview) _obj, TClass(wxFrame) frame );
-void       wxPrintPreview_SetOk( TSelf(wxPrintPreview) _obj, TBoolInt ok );
-void       wxPrintPreview_SetPrintout( TSelf(wxPrintPreview) _obj, TClass(wxPrintout) printout );
-void       wxPrintPreview_SetZoom( TSelf(wxPrintPreview) _obj, int percent );
-
-/* wxPrinter */
-TClassDefExtend(wxPrinter,wxObject)
-TClass(wxPrinter) wxPrinter_Create( TClass(wxPrintDialogData) data );
-TClass(wxWindow)  wxPrinter_CreateAbortWindow( TSelf(wxPrinter) _obj, TClass(wxWindow) parent, TClass(wxPrintout) printout );
-void       wxPrinter_Delete( TSelf(wxPrinter) _obj );
-TBoolInt   wxPrinter_GetAbort( TSelf(wxPrinter) _obj );
-int        wxPrinter_GetLastError( TSelf(wxPrinter) _obj );
-void       wxPrinter_GetPrintDialogData( TSelf(wxPrinter) _obj, TClassRef(wxPrintDialogData) _ref );
-TBoolInt   wxPrinter_Print( TSelf(wxPrinter) _obj, TClass(wxWindow) parent, TClass(wxPrintout) printout, TBoolInt prompt );
-TClass(wxDC)  wxPrinter_PrintDialog( TSelf(wxPrinter) _obj, TClass(wxWindow) parent );
-void       wxPrinter_ReportError( TSelf(wxPrinter) _obj, TClass(wxWindow) parent, TClass(wxPrintout) printout, TStringVoid message );
-TBoolInt   wxPrinter_Setup( TSelf(wxPrinter) _obj, TClass(wxWindow) parent );
-
-/* wxPrinterDC */
-TClassDefExtend(wxPrinterDC,wxDC)
-
-/* wxPrintout */
-TClassDefExtend(wxPrintout,wxObject)
-
-/* wxPrivateDropTarget */
-TClassDefExtend(wxPrivateDropTarget,wxDropTarget)
-
-/* wxProcess */
-TClassDefExtend(wxProcess,wxEvtHandler)
-void       wxProcess_CloseOutput( TSelf(wxProcess) _obj );
-TClass(wxProcess) wxProcess_CreateDefault( TClass(wxWindow) _prt, int _id );
-TClass(wxProcess) wxProcess_CreateRedirect( TClass(wxWindow) _prt, TBool _rdr );
-void       wxProcess_Delete( TSelf(wxProcess) _obj );
-void       wxProcess_Detach( TSelf(wxProcess) _obj );
-TClass(wxInputStream) wxProcess_GetErrorStream( TSelf(wxProcess) _obj );
-TClass(wxInputStream) wxProcess_GetInputStream( TSelf(wxProcess) _obj );
-TClass(wxOutputStream) wxProcess_GetOutputStream( TSelf(wxProcess) _obj );
-TBool      wxProcess_IsRedirected( TSelf(wxProcess) _obj );
-void       wxProcess_Redirect( TSelf(wxProcess) _obj );
-
-/* wxProcessEvent */
-TClassDefExtend(wxProcessEvent,wxEvent)
-int        wxProcessEvent_GetExitCode( TSelf(wxProcessEvent) _obj );
-int        wxProcessEvent_GetPid( TSelf(wxProcessEvent) _obj );
-
-/* wxProgressDialog */
-TClassDefExtend(wxProgressDialog,wxFrame)
-
-/* wxProtocol */
-TClassDefExtend(wxProtocol,wxSocketClient)
-
-/* wxQuantize */
-TClassDefExtend(wxQuantize,wxObject)
-
-/* wxQueryCol */
-TClassDefExtend(wxQueryCol,wxObject)
-
-/* wxQueryField */
-TClassDefExtend(wxQueryField,wxObject)
-
-/* wxQueryLayoutInfoEvent */
-TClassDefExtend(wxQueryLayoutInfoEvent,wxEvent)
-TClass(wxQueryLayoutInfoEvent) wxQueryLayoutInfoEvent_Create( int id );
-int        wxQueryLayoutInfoEvent_GetAlignment( TSelf(wxQueryLayoutInfoEvent) _obj );
-int        wxQueryLayoutInfoEvent_GetFlags( TSelf(wxQueryLayoutInfoEvent) _obj );
-int        wxQueryLayoutInfoEvent_GetOrientation( TSelf(wxQueryLayoutInfoEvent) _obj );
-int        wxQueryLayoutInfoEvent_GetRequestedLength( TSelf(wxQueryLayoutInfoEvent) _obj );
-void       wxQueryLayoutInfoEvent_GetSize( TSelf(wxQueryLayoutInfoEvent) _obj, TSizeOutVoid(_w,_h) );
-void       wxQueryLayoutInfoEvent_SetAlignment( TSelf(wxQueryLayoutInfoEvent) _obj, int align );
-void       wxQueryLayoutInfoEvent_SetFlags( TSelf(wxQueryLayoutInfoEvent) _obj, int flags );
-void       wxQueryLayoutInfoEvent_SetOrientation( TSelf(wxQueryLayoutInfoEvent) _obj, int orient );
-void       wxQueryLayoutInfoEvent_SetRequestedLength( TSelf(wxQueryLayoutInfoEvent) _obj, int length );
-void       wxQueryLayoutInfoEvent_SetSize( TSelf(wxQueryLayoutInfoEvent) _obj, TSize(w,h) );
-
-/* wxQueryNewPaletteEvent */
-TClassDefExtend(wxQueryNewPaletteEvent,wxEvent)
-void       wxQueryNewPaletteEvent_CopyObject( TSelf(wxQueryNewPaletteEvent) _obj, void* obj );
-int        wxQueryNewPaletteEvent_GetPaletteRealized( TSelf(wxQueryNewPaletteEvent) _obj );
-void       wxQueryNewPaletteEvent_SetPaletteRealized( TSelf(wxQueryNewPaletteEvent) _obj, int realized );
-
-/* wxRadioBox */
-TClassDefExtend(wxRadioBox,wxControl)
-TClass(wxRadioBox) wxRadioBox_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n, _str), int _dim, int _stl );
-void       wxRadioBox_EnableItem( TSelf(wxRadioBox) _obj, int item, TBoolInt enable );
-int        wxRadioBox_FindString( TSelf(wxRadioBox) _obj, TStringVoid s );
-TStringLen wxRadioBox_GetItemLabel( TSelf(wxRadioBox) _obj, int item, TStringOutVoid _buf );
-int        wxRadioBox_GetNumberOfRowsOrCols( TSelf(wxRadioBox) _obj );
-int        wxRadioBox_GetSelection( TSelf(wxRadioBox) _obj );
-TStringLen wxRadioBox_GetStringSelection( TSelf(wxRadioBox) _obj, TStringOutVoid _buf );
-int        wxRadioBox_Number( TSelf(wxRadioBox) _obj );
-void       wxRadioBox_SetItemBitmap( TSelf(wxRadioBox) _obj, int item, TClass(wxBitmap) bitmap );
-void       wxRadioBox_SetItemLabel( TSelf(wxRadioBox) _obj, int item, TStringVoid label );
-void       wxRadioBox_SetNumberOfRowsOrCols( TSelf(wxRadioBox) _obj, int n );
-void       wxRadioBox_SetSelection( TSelf(wxRadioBox) _obj, int _n );
-void       wxRadioBox_SetStringSelection( TSelf(wxRadioBox) _obj, TStringVoid s );
-void       wxRadioBox_ShowItem( TSelf(wxRadioBox) _obj, int item, TBoolInt show );
-
-/* wxRadioButton */
-TClassDefExtend(wxRadioButton,wxControl)
-TClass(wxRadioButton) wxRadioButton_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxRadioButton_GetValue( TSelf(wxRadioButton) _obj );
-void       wxRadioButton_SetValue( TSelf(wxRadioButton) _obj, int value );
-
-/* wxRealPoint */
-TClassDef(wxRealPoint)
-
-/* wxRecordSet */
-TClassDefExtend(wxRecordSet,wxObject)
-
-/* wxRect */
-TClassDef(wxRect)
-
-/* wxRegEx */
-TClassDef(wxRegEx)
-
-/* wxRegion */
-TClassDefExtend(wxRegion,wxGDIObject)
-void       wxRegion_Assign( TSelf(wxRegion) _obj, TClass(wxRegion) region );
-void       wxRegion_Clear( TSelf(wxRegion) _obj );
-TBool      wxRegion_ContainsPoint( TSelf(wxRegion) _obj, TPoint(x,y) );
-TBool      wxRegion_ContainsRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
-TClass(wxRegion) wxRegion_CreateDefault(  );
-TClass(wxRegion) wxRegion_CreateFromRect( TRect(x,y,w,h) );
-void       wxRegion_Delete( TSelf(wxRegion) _obj );
-int        wxRegion_Empty( TSelf(wxRegion) _obj );
-void       wxRegion_GetBox( TSelf(wxRegion) _obj, TRectOutVoid(_x,_y,_w,_h) );
-int        wxRegion_IntersectRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
-int        wxRegion_IntersectRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
-int        wxRegion_SubtractRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
-int        wxRegion_SubtractRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
-int        wxRegion_UnionRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
-int        wxRegion_UnionRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
-int        wxRegion_XorRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
-int        wxRegion_XorRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
-
-/* wxRegionIterator */
-TClassDefExtend(wxRegionIterator,wxObject)
-TClass(wxRegionIterator) wxRegionIterator_Create(  );
-TClass(wxRegionIterator) wxRegionIterator_CreateFromRegion( TClass(wxRegion) region );
-void       wxRegionIterator_Delete( TSelf(wxRegionIterator) _obj );
-int        wxRegionIterator_GetHeight( TSelf(wxRegionIterator) _obj );
-int        wxRegionIterator_GetWidth( TSelf(wxRegionIterator) _obj );
-int        wxRegionIterator_GetX( TSelf(wxRegionIterator) _obj );
-int        wxRegionIterator_GetY( TSelf(wxRegionIterator) _obj );
-int        wxRegionIterator_HaveRects( TSelf(wxRegionIterator) _obj );
-void       wxRegionIterator_Next( TSelf(wxRegionIterator) _obj );
-void       wxRegionIterator_Reset( TSelf(wxRegionIterator) _obj );
-void       wxRegionIterator_ResetToRegion( TSelf(wxRegionIterator) _obj, TClass(wxRegion) region );
-
-/* wxRemotelyScrolledTreeCtrl */
-TClassDefExtend(wxRemotelyScrolledTreeCtrl,wxTreeCtrl)
-void       wxRemotelyScrolledTreeCtrl_AdjustRemoteScrollbars( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
-void       wxRemotelyScrolledTreeCtrl_CalcTreeSize( TSelf(wxRemotelyScrolledTreeCtrl) _obj, TRectOutVoid(_x,_y,_w,_h) );
-void       wxRemotelyScrolledTreeCtrl_CalcTreeSizeItem( TSelf(wxRemotelyScrolledTreeCtrl) _obj, void* id, TRectOutVoid(_x,_y,_w,_h) );
-TClass(wxRemotelyScrolledTreeCtrl) wxRemotelyScrolledTreeCtrl_Create( void* _obj, void* _cmp, TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
-void       wxRemotelyScrolledTreeCtrl_Delete( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
-void*      wxRemotelyScrolledTreeCtrl_GetCompanionWindow( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
-int        wxRemotelyScrolledTreeCtrl_GetScrollPos( TSelf(wxRemotelyScrolledTreeCtrl) _obj, int orient );
-TClass(wxScrolledWindow) wxRemotelyScrolledTreeCtrl_GetScrolledWindow( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
-void       wxRemotelyScrolledTreeCtrl_GetViewStart( TSelf(wxRemotelyScrolledTreeCtrl) _obj, TPointOutVoid(_x,_y) );
-void       wxRemotelyScrolledTreeCtrl_HideVScrollbar( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
-void       wxRemotelyScrolledTreeCtrl_PrepareDC( TSelf(wxRemotelyScrolledTreeCtrl) _obj, TClass(wxDC) dc );
-void       wxRemotelyScrolledTreeCtrl_ScrollToLine( TSelf(wxRemotelyScrolledTreeCtrl) _obj, int posHoriz, int posVert );
-void       wxRemotelyScrolledTreeCtrl_SetCompanionWindow( TSelf(wxRemotelyScrolledTreeCtrl) _obj, void* companion );
-void       wxRemotelyScrolledTreeCtrl_SetScrollbars( TSelf(wxRemotelyScrolledTreeCtrl) _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, int noRefresh );
-
-/* wxSVGFileDC */
-TClassDefExtend(wxSVGFileDC,wxDC)
-void*      wxSVGFileDC_ComputeScaleAndOrigin( TSelf(wxSVGFileDC) obj );
-TClass(wxSVGFileDC) wxSVGFileDC_Create( void* f );
-void*      wxSVGFileDC_CreateWithSize( TSelf(wxSVGFileDC) f, int a_width, int a_height );
-void*      wxSVGFileDC_CreateWithSizeAndResolution( TSelf(wxSVGFileDC) f, int a_width, int a_height, float a_dpi );
-void*      wxSVGFileDC_Delete( TSelf(wxSVGFileDC) obj );
-
-/* wxSashEvent */
-TClassDefExtend(wxSashEvent,wxEvent)
-TClass(wxSashEvent) wxSashEvent_Create( int id, int edge );
-void       wxSashEvent_GetDragRect( TSelf(wxSashEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
-int        wxSashEvent_GetDragStatus( TSelf(wxSashEvent) _obj );
-int        wxSashEvent_GetEdge( TSelf(wxSashEvent) _obj );
-void       wxSashEvent_SetDragRect( TSelf(wxSashEvent) _obj, TRect(x,y,w,h) );
-void       wxSashEvent_SetDragStatus( TSelf(wxSashEvent) _obj, int status );
-void       wxSashEvent_SetEdge( TSelf(wxSashEvent) _obj, int edge );
-
-/* wxSashLayoutWindow */
-TClassDefExtend(wxSashLayoutWindow,wxSashWindow)
-TClass(wxSashLayoutWindow) wxSashLayoutWindow_Create( TClass(wxWindow) _par, int _id, TRect(_x,_y,_w,_h), int _stl );
-int        wxSashLayoutWindow_GetAlignment( TSelf(wxSashLayoutWindow) _obj );
-int        wxSashLayoutWindow_GetOrientation( TSelf(wxSashLayoutWindow) _obj );
-void       wxSashLayoutWindow_SetAlignment( TSelf(wxSashLayoutWindow) _obj, int align );
-void       wxSashLayoutWindow_SetDefaultSize( TSelf(wxSashLayoutWindow) _obj, TSize(w,h) );
-void       wxSashLayoutWindow_SetOrientation( TSelf(wxSashLayoutWindow) _obj, int orient );
-
-/* wxSashWindow */
-TClassDefExtend(wxSashWindow,wxWindow)
-TClass(wxSashWindow) wxSashWindow_Create( TClass(wxWindow) _par, int _id, TRect(_x,_y,_w,_h), int _stl );
-int        wxSashWindow_GetDefaultBorderSize( TSelf(wxSashWindow) _obj );
-int        wxSashWindow_GetEdgeMargin( TSelf(wxSashWindow) _obj, int edge );
-int        wxSashWindow_GetExtraBorderSize( TSelf(wxSashWindow) _obj );
-int        wxSashWindow_GetMaximumSizeX( TSelf(wxSashWindow) _obj );
-int        wxSashWindow_GetMaximumSizeY( TSelf(wxSashWindow) _obj );
-int        wxSashWindow_GetMinimumSizeX( TSelf(wxSashWindow) _obj );
-int        wxSashWindow_GetMinimumSizeY( TSelf(wxSashWindow) _obj );
-int        wxSashWindow_GetSashVisible( TSelf(wxSashWindow) _obj, int edge );
-TBool      wxSashWindow_HasBorder( TSelf(wxSashWindow) _obj, int edge );
-void       wxSashWindow_SetDefaultBorderSize( TSelf(wxSashWindow) _obj, int width );
-void       wxSashWindow_SetExtraBorderSize( TSelf(wxSashWindow) _obj, int width );
-void       wxSashWindow_SetMaximumSizeX( TSelf(wxSashWindow) _obj, int max );
-void       wxSashWindow_SetMaximumSizeY( TSelf(wxSashWindow) _obj, int max );
-void       wxSashWindow_SetMinimumSizeX( TSelf(wxSashWindow) _obj, int min );
-void       wxSashWindow_SetMinimumSizeY( TSelf(wxSashWindow) _obj, int min );
-void       wxSashWindow_SetSashBorder( TSelf(wxSashWindow) _obj, int edge, int border );
-void       wxSashWindow_SetSashVisible( TSelf(wxSashWindow) _obj, int edge, int sash );
-
-/* wxScintilla */
-TClassDef(wxScintilla)
-TClass(wxScintilla) wxScintilla_Create( void* obj, void* fnc, TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxScintilla_Exec( TSelf(wxScintilla) obj, int code, int param1, int param2 );
-
-/* wxScopedArray */
-TClassDef(wxScopedArray)
-
-/* wxScopedPtr */
-TClassDef(wxScopedPtr)
-
-/* wxScreenDC */
-TClassDefExtend(wxScreenDC,wxDC)
-TClass(wxScreenDC) wxScreenDC_Create(  );
-void       wxScreenDC_Delete( TSelf(wxScreenDC) _obj );
-int        wxScreenDC_EndDrawingOnTop( TSelf(wxScreenDC) _obj );
-int        wxScreenDC_StartDrawingOnTop( TSelf(wxScreenDC) _obj, int l, int t, TSize(w,h) );
-int        wxScreenDC_StartDrawingOnTopOfWin( TSelf(wxScreenDC) _obj, TClass(wxWindow) win );
-
-/* wxScrollBar */
-TClassDefExtend(wxScrollBar,wxControl)
-TClass(wxScrollBar) wxScrollBar_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxScrollBar_GetPageSize( TSelf(wxScrollBar) _obj );
-int        wxScrollBar_GetRange( TSelf(wxScrollBar) _obj );
-int        wxScrollBar_GetThumbPosition( TSelf(wxScrollBar) _obj );
-int        wxScrollBar_GetThumbSize( TSelf(wxScrollBar) _obj );
-void       wxScrollBar_SetScrollbar( TSelf(wxScrollBar) _obj, int position, int thumbSize, int range, int pageSize, TBool refresh );
-void       wxScrollBar_SetThumbPosition( TSelf(wxScrollBar) _obj, int viewStart );
-
-/* wxScrollEvent */
-TClassDefExtend(wxScrollEvent,wxEvent)
-int        wxScrollEvent_GetOrientation( TSelf(wxScrollEvent) _obj );
-int        wxScrollEvent_GetPosition( TSelf(wxScrollEvent) _obj );
-
-/* wxScrollWinEvent */
-TClassDefExtend(wxScrollWinEvent,wxEvent)
-int        wxScrollWinEvent_GetOrientation( TSelf(wxScrollWinEvent) _obj );
-int        wxScrollWinEvent_GetPosition( TSelf(wxScrollWinEvent) _obj );
-void       wxScrollWinEvent_SetOrientation( TSelf(wxScrollWinEvent) _obj, int orient );
-void       wxScrollWinEvent_SetPosition( TSelf(wxScrollWinEvent) _obj, int pos );
-
-/* wxScrolledWindow */
-TClassDefExtend(wxScrolledWindow,wxPanel)
-void       wxScrolledWindow_AdjustScrollbars( TSelf(wxScrolledWindow) _obj );
-void       wxScrolledWindow_CalcScrolledPosition( TSelf(wxScrolledWindow) _obj, TPoint(x,y), TPointOutVoid(xx,yy) );
-void       wxScrolledWindow_CalcUnscrolledPosition( TSelf(wxScrolledWindow) _obj, TPoint(x,y), TPointOutVoid(xx,yy) );
-TClass(wxScrolledWindow) wxScrolledWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxScrolledWindow_EnableScrolling( TSelf(wxScrolledWindow) _obj, TBool x_scrolling, TBool y_scrolling );
-double     wxScrolledWindow_GetScaleX( TSelf(wxScrolledWindow) _obj );
-double     wxScrolledWindow_GetScaleY( TSelf(wxScrolledWindow) _obj );
-int        wxScrolledWindow_GetScrollPageSize( TSelf(wxScrolledWindow) _obj, int orient );
-void       wxScrolledWindow_GetScrollPixelsPerUnit( TSelf(wxScrolledWindow) _obj, TPointOutVoid(_x,_y) );
-TClass(wxWindow) wxScrolledWindow_GetTargetWindow( TSelf(wxScrolledWindow) _obj );
-void       wxScrolledWindow_GetViewStart( TSelf(wxScrolledWindow) _obj, TPointOutVoid(_x,_y) );
-void       wxScrolledWindow_GetVirtualSize( TSelf(wxScrolledWindow) _obj, TSizeOutVoid(_x,_y) );
-void       wxScrolledWindow_OnDraw( TSelf(wxScrolledWindow) _obj, TClass(wxDC) dc );
-void       wxScrolledWindow_PrepareDC( TSelf(wxScrolledWindow) _obj, TClass(wxDC) dc );
-void       wxScrolledWindow_Scroll( TSelf(wxScrolledWindow) _obj, TPoint(x_pos,y_pos) );
-void       wxScrolledWindow_SetScale( TSelf(wxScrolledWindow) _obj, double xs, double ys );
-void       wxScrolledWindow_SetScrollPageSize( TSelf(wxScrolledWindow) _obj, int orient, int pageSize );
-void       wxScrolledWindow_SetScrollbars( TSelf(wxScrolledWindow) _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, TBoolInt noRefresh );
-void       wxScrolledWindow_SetTargetWindow( TSelf(wxScrolledWindow) _obj, TClass(wxWindow) target );
-void       wxScrolledWindow_ViewStart( TSelf(wxScrolledWindow) _obj, TPointOutVoid(_x,_y) );
-
-/* wxSemaphore */
-TClassDef(wxSemaphore)
-
-/* wxServer */
-TClassDefExtend(wxServer,wxServerBase)
-
-/* wxServerBase */
-TClassDefExtend(wxServerBase,wxObject)
-
-/* wxSetCursorEvent */
-TClassDefExtend(wxSetCursorEvent,wxEvent)
-TClass(wxCursor) wxSetCursorEvent_GetCursor( TSelf(wxSetCursorEvent) _obj );
-int        wxSetCursorEvent_GetX( TSelf(wxSetCursorEvent) _obj );
-int        wxSetCursorEvent_GetY( TSelf(wxSetCursorEvent) _obj );
-TBool      wxSetCursorEvent_HasCursor( TSelf(wxSetCursorEvent) _obj );
-void       wxSetCursorEvent_SetCursor( TSelf(wxSetCursorEvent) _obj, TClass(wxCursor) cursor );
-
-/* wxShowEvent */
-TClassDefExtend(wxShowEvent,wxEvent)
-void       wxShowEvent_CopyObject( TSelf(wxShowEvent) _obj, void* obj );
-int        wxShowEvent_GetShow( TSelf(wxShowEvent) _obj );
-void       wxShowEvent_SetShow( TSelf(wxShowEvent) _obj, int show );
-
-/* wxSimpleHelpProvider */
-TClassDefExtend(wxSimpleHelpProvider,wxHelpProvider)
-TClass(wxSimpleHelpProvider) wxSimpleHelpProvider_Create(  );
-
-/* wxSingleChoiceDialog */
-TClassDefExtend(wxSingleChoiceDialog,wxDialog)
-
-/* wxSingleInstanceChecker */
-TClassDef(wxSingleInstanceChecker)
-int        wxSingleInstanceChecker_Create( void* _obj, TStringVoid name, TStringVoid path );
-TClass(wxSingleInstanceChecker) wxSingleInstanceChecker_CreateDefault(  );
-void       wxSingleInstanceChecker_Delete( TSelf(wxSingleInstanceChecker) _obj );
-TBool      wxSingleInstanceChecker_IsAnotherRunning( TSelf(wxSingleInstanceChecker) _obj );
-
-/* wxSize */
-TClassDef(wxSize)
-TClass(wxSize) wxSize_Create( TSize(w,h) );
-void       wxSize_Destroy( TSelf(wxSize) _obj );
-int        wxSize_GetHeight( TSelf(wxSize) _obj );
-int        wxSize_GetWidth( TSelf(wxSize) _obj );
-void       wxSize_SetHeight( TSelf(wxSize) _obj, int h );
-void       wxSize_SetWidth( TSelf(wxSize) _obj, int w );
-
-/* wxSizeEvent */
-TClassDefExtend(wxSizeEvent,wxEvent)
-void       wxSizeEvent_CopyObject( TSelf(wxSizeEvent) _obj, void* obj );
-void       wxSizeEvent_GetSize( TSelf(wxSizeEvent) _obj, TSizeOut(_w,_h) );
-
-/* wxSizer */
-TClassDefExtend(wxSizer,wxObject)
-void       wxSizer_Add( TSelf(wxSizer) _obj, TSize(width,height), int option, int flag, int border, void* userData );
-void       wxSizer_AddSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
-void       wxSizer_AddWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window, int option, int flag, int border, void* userData );
-void       wxSizer_CalcMin( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );
-void       wxSizer_Fit( TSelf(wxSizer) _obj, TClass(wxWindow) window );
-int        wxSizer_GetChildren( TSelf(wxSizer) _obj, void* _res, int _cnt );
-void       wxSizer_GetMinSize( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );
-void       wxSizer_GetPosition( TSelf(wxSizer) _obj, TPointOutVoid(_x,_y) );
-void       wxSizer_GetSize( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );
-void       wxSizer_Insert( TSelf(wxSizer) _obj, int before, TSize(width,height), int option, int flag, int border, void* userData );
-void       wxSizer_InsertSizer( TSelf(wxSizer) _obj, int before, TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
-void       wxSizer_InsertWindow( TSelf(wxSizer) _obj, int before, TClass(wxWindow) window, int option, int flag, int border, void* userData );
-void       wxSizer_Layout( TSelf(wxSizer) _obj );
-void       wxSizer_Prepend( TSelf(wxSizer) _obj, TSize(width,height), int option, int flag, int border, void* userData );
-void       wxSizer_PrependSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
-void       wxSizer_PrependWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window, int option, int flag, int border, void* userData );
-void       wxSizer_RecalcSizes( TSelf(wxSizer) _obj );
-int        wxSizer_Remove( TSelf(wxSizer) _obj, int pos );
-int        wxSizer_RemoveSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer );
-int        wxSizer_RemoveWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window );
-void       wxSizer_SetDimension( TSelf(wxSizer) _obj, TRect(x,y,width,height) );
-void       wxSizer_SetItemMinSize( TSelf(wxSizer) _obj, int pos, TSize(width,height) );
-void       wxSizer_SetItemMinSizeSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, TSize(width,height) );
-void       wxSizer_SetItemMinSizeWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window, TSize(width,height) );
-void       wxSizer_SetMinSize( TSelf(wxSizer) _obj, TSize(width,height) );
-void       wxSizer_SetSizeHints( TSelf(wxSizer) _obj, TClass(wxWindow) window );
-
-/* wxSizerItem */
-TClassDefExtend(wxSizerItem,wxObject)
-void       wxSizerItem_CalcMin( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxSizerItem) wxSizerItem_Create( TSize(width,height), int option, int flag, int border, void* userData );
-void*      wxSizerItem_CreateInSizer( TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
-void*      wxSizerItem_CreateInWindow( TClass(wxWindow) window, int option, int flag, int border, void* userData );
-int        wxSizerItem_GetBorder( TSelf(wxSizerItem) _obj );
-int        wxSizerItem_GetFlag( TSelf(wxSizerItem) _obj );
-void       wxSizerItem_GetMinSize( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_h) );
-int        wxSizerItem_GetOption( TSelf(wxSizerItem) _obj );
-void       wxSizerItem_GetPosition( TSelf(wxSizerItem) _obj, TPointOutVoid(_x,_y) );
-float      wxSizerItem_GetRatio( TSelf(wxSizerItem) _obj );
-void       wxSizerItem_GetSize( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxSizer) wxSizerItem_GetSizer( TSelf(wxSizerItem) _obj );
-void*      wxSizerItem_GetUserData( TSelf(wxSizerItem) _obj );
-TClass(wxWindow) wxSizerItem_GetWindow( TSelf(wxSizerItem) _obj );
-TBool      wxSizerItem_IsSizer( TSelf(wxSizerItem) _obj );
-TBool      wxSizerItem_IsSpacer( TSelf(wxSizerItem) _obj );
-TBool      wxSizerItem_IsWindow( TSelf(wxSizerItem) _obj );
-void       wxSizerItem_SetBorder( TSelf(wxSizerItem) _obj, int border );
-void       wxSizerItem_SetDimension( TSelf(wxSizerItem) _obj, TRect(_x,_y,_w,_h) );
-void       wxSizerItem_SetFlag( TSelf(wxSizerItem) _obj, int flag );
-void       wxSizerItem_SetFloatRatio( TSelf(wxSizerItem) _obj, float ratio );
-void       wxSizerItem_SetInitSize( TSelf(wxSizerItem) _obj, TPoint(x,y) );
-void       wxSizerItem_SetOption( TSelf(wxSizerItem) _obj, int option );
-void       wxSizerItem_SetRatio( TSelf(wxSizerItem) _obj, TSize(width,height) );
-void       wxSizerItem_SetSizer( TSelf(wxSizerItem) _obj, TClass(wxSizer) sizer );
-void       wxSizerItem_SetWindow( TSelf(wxSizerItem) _obj, TClass(wxWindow) window );
-
-/* wxSlider */
-TClassDefExtend(wxSlider,wxControl)
-void       wxSlider_ClearSel( TSelf(wxSlider) _obj );
-void       wxSlider_ClearTicks( TSelf(wxSlider) _obj );
-TClass(wxSlider) wxSlider_Create( TClass(wxWindow) _prt, int _id, int _init, int _min, int _max, TRect(_lft,_top,_wdt,_hgt), long _stl );
-int        wxSlider_GetLineSize( TSelf(wxSlider) _obj );
-int        wxSlider_GetMax( TSelf(wxSlider) _obj );
-int        wxSlider_GetMin( TSelf(wxSlider) _obj );
-int        wxSlider_GetPageSize( TSelf(wxSlider) _obj );
-int        wxSlider_GetSelEnd( TSelf(wxSlider) _obj );
-int        wxSlider_GetSelStart( TSelf(wxSlider) _obj );
-int        wxSlider_GetThumbLength( TSelf(wxSlider) _obj );
-int        wxSlider_GetTickFreq( TSelf(wxSlider) _obj );
-int        wxSlider_GetValue( TSelf(wxSlider) _obj );
-void       wxSlider_SetLineSize( TSelf(wxSlider) _obj, int lineSize );
-void       wxSlider_SetPageSize( TSelf(wxSlider) _obj, int pageSize );
-void       wxSlider_SetRange( TSelf(wxSlider) _obj, int minValue, int maxValue );
-void       wxSlider_SetSelection( TSelf(wxSlider) _obj, int minPos, int maxPos );
-void       wxSlider_SetThumbLength( TSelf(wxSlider) _obj, int len );
-void       wxSlider_SetTick( TSelf(wxSlider) _obj, int tickPos );
-void       wxSlider_SetTickFreq( TSelf(wxSlider) _obj, int n, int pos );
-void       wxSlider_SetValue( TSelf(wxSlider) _obj, int value );
-
-/* wxSockAddress */
-TClassDefExtend(wxSockAddress,wxObject)
-
-/* wxSocketBase */
-TClassDefExtend(wxSocketBase,wxObject)
-
-/* wxSocketClient */
-TClassDefExtend(wxSocketClient,wxSocketBase)
-
-/* wxSocketEvent */
-TClassDefExtend(wxSocketEvent,wxEvent)
-
-/* wxSocketInputStream */
-TClassDefExtend(wxSocketInputStream,wxInputStream)
-
-/* wxSocketOutputStream */
-TClassDefExtend(wxSocketOutputStream,wxOutputStream)
-
-/* wxSocketServer */
-TClassDefExtend(wxSocketServer,wxSocketBase)
-
-/* wxSpinButton */
-TClassDefExtend(wxSpinButton,wxControl)
-TClass(wxSpinButton) wxSpinButton_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), long _stl );
-int        wxSpinButton_GetMax( TSelf(wxSpinButton) _obj );
-int        wxSpinButton_GetMin( TSelf(wxSpinButton) _obj );
-int        wxSpinButton_GetValue( TSelf(wxSpinButton) _obj );
-void       wxSpinButton_SetRange( TSelf(wxSpinButton) _obj, int minVal, int maxVal );
-void       wxSpinButton_SetValue( TSelf(wxSpinButton) _obj, int val );
-
-/* wxSpinCtrl */
-TClassDefExtend(wxSpinCtrl,wxControl)
-TClass(wxSpinCtrl) wxSpinCtrl_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), long _stl, int _min, int _max, int _init );
-int        wxSpinCtrl_GetMax( TSelf(wxSpinCtrl) _obj );
-int        wxSpinCtrl_GetMin( TSelf(wxSpinCtrl) _obj );
-int        wxSpinCtrl_GetValue( TSelf(wxSpinCtrl) _obj );
-void       wxSpinCtrl_SetRange( TSelf(wxSpinCtrl) _obj, int min_val, int max_val );
-void       wxSpinCtrl_SetValue( TSelf(wxSpinCtrl) _obj, int val );
-
-/* wxSpinEvent */
-TClassDefExtend(wxSpinEvent,wxNotifyEvent)
-int        wxSpinEvent_GetPosition( TSelf(wxSpinEvent) _obj );
-void       wxSpinEvent_SetPosition( TSelf(wxSpinEvent) _obj, int pos );
-
-/* wxSplashScreen */
-TClassDefExtend(wxSplashScreen,wxFrame)
-
-/* wxSplitterEvent */
-TClassDefExtend(wxSplitterEvent,wxNotifyEvent)
-
-/* wxSplitterScrolledWindow */
-TClassDefExtend(wxSplitterScrolledWindow,wxScrolledWindow)
-TClass(wxSplitterScrolledWindow) wxSplitterScrolledWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
-
-/* wxSplitterWindow */
-TClassDefExtend(wxSplitterWindow,wxWindow)
-TClass(wxSplitterWindow) wxSplitterWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxSplitterWindow_GetBorderSize( TSelf(wxSplitterWindow) _obj );
-int        wxSplitterWindow_GetMinimumPaneSize( TSelf(wxSplitterWindow) _obj );
-int        wxSplitterWindow_GetSashPosition( TSelf(wxSplitterWindow) _obj );
-int        wxSplitterWindow_GetSashSize( TSelf(wxSplitterWindow) _obj );
-int        wxSplitterWindow_GetSplitMode( TSelf(wxSplitterWindow) _obj );
-TClass(wxWindow) wxSplitterWindow_GetWindow1( TSelf(wxSplitterWindow) _obj );
-TClass(wxWindow) wxSplitterWindow_GetWindow2( TSelf(wxSplitterWindow) _obj );
-void       wxSplitterWindow_Initialize( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) window );
-TBool      wxSplitterWindow_IsSplit( TSelf(wxSplitterWindow) _obj );
-TBoolInt   wxSplitterWindow_ReplaceWindow( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) winOld, TClass(wxWindow) winNew );
-void       wxSplitterWindow_SetBorderSize( TSelf(wxSplitterWindow) _obj, int width );
-void       wxSplitterWindow_SetMinimumPaneSize( TSelf(wxSplitterWindow) _obj, int min );
-void       wxSplitterWindow_SetSashPosition( TSelf(wxSplitterWindow) _obj, int position, TBoolInt redraw );
-void       wxSplitterWindow_SetSashSize( TSelf(wxSplitterWindow) _obj, int width );
-void       wxSplitterWindow_SetSplitMode( TSelf(wxSplitterWindow) _obj, int mode );
-TBool      wxSplitterWindow_SplitHorizontally( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) window1, TClass(wxWindow) window2, int sashPosition );
-TBool      wxSplitterWindow_SplitVertically( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) window1, TClass(wxWindow) window2, int sashPosition );
-TBool      wxSplitterWindow_Unsplit( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) toRemove );
-
-/* wxStaticBitmap */
-TClassDefExtend(wxStaticBitmap,wxControl)
-TClass(wxStaticBitmap) wxStaticBitmap_Create( TClass(wxWindow) _prt, int _id, TClass(wxBitmap) bitmap, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxStaticBitmap_Delete( TSelf(wxStaticBitmap) _obj );
-void       wxStaticBitmap_GetBitmap( TSelf(wxStaticBitmap) _obj, TClassRef(wxBitmap) _ref );
-void       wxStaticBitmap_GetIcon( TSelf(wxStaticBitmap) _obj, TClassRef(wxIcon) _ref );
-void       wxStaticBitmap_SetBitmap( TSelf(wxStaticBitmap) _obj, TClass(wxBitmap) bitmap );
-void       wxStaticBitmap_SetIcon( TSelf(wxStaticBitmap) _obj, TClass(wxIcon) icon );
-
-/* wxStaticBox */
-TClassDefExtend(wxStaticBox,wxControl)
-TClass(wxStaticBox) wxStaticBox_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-
-/* wxStaticBoxSizer */
-TClassDefExtend(wxStaticBoxSizer,wxBoxSizer)
-void       wxStaticBoxSizer_CalcMin( TSelf(wxStaticBoxSizer) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxStaticBoxSizer) wxStaticBoxSizer_Create( TClass(wxStaticBox) box, int orient );
-TClass(wxStaticBox) wxStaticBoxSizer_GetStaticBox( TSelf(wxStaticBoxSizer) _obj );
-void       wxStaticBoxSizer_RecalcSizes( TSelf(wxStaticBoxSizer) _obj );
-
-/* wxStaticLine */
-TClassDefExtend(wxStaticLine,wxControl)
-TClass(wxStaticLine) wxStaticLine_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxStaticLine_GetDefaultSize( TSelf(wxStaticLine) _obj );
-TBool      wxStaticLine_IsVertical( TSelf(wxStaticLine) _obj );
-
-/* wxStaticText */
-TClassDefExtend(wxStaticText,wxControl)
-TClass(wxStaticText) wxStaticText_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
-
-/* wxStatusBar */
-TClassDefExtend(wxStatusBar,wxWindow)
-TClass(wxStatusBar) wxStatusBar_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-int        wxStatusBar_GetBorderX( TSelf(wxStatusBar) _obj );
-int        wxStatusBar_GetBorderY( TSelf(wxStatusBar) _obj );
-int        wxStatusBar_GetFieldsCount( TSelf(wxStatusBar) _obj );
-TStringLen wxStatusBar_GetStatusText( TSelf(wxStatusBar) _obj, int number, TStringOutVoid _buf );
-void       wxStatusBar_SetFieldsCount( TSelf(wxStatusBar) _obj, int number, int* widths );
-void       wxStatusBar_SetMinHeight( TSelf(wxStatusBar) _obj, int height );
-void       wxStatusBar_SetStatusText( TSelf(wxStatusBar) _obj, TStringVoid text, int number );
-void       wxStatusBar_SetStatusWidths( TSelf(wxStatusBar) _obj, int n, int* widths );
-
-/* wxStopWatch */
-TClassDef(wxStopWatch)
-TClass(wxStopWatch) wxStopWatch_Create();
-void      wxStopWatch_Delete(TSelf(wxStopWatch) _obj);
-void      wxStopWatch_Start(TSelf(wxStopWatch) _obj, int msec);
-void      wxStopWatch_Pause(TSelf(wxStopWatch) _obj);
-void      wxStopWatch_Resume(TSelf(wxStopWatch) _obj);
-int       wxStopWatch_Time(TSelf(wxStopWatch) _obj);
-
-
-/* wxStreamBase */
-TClassDef(wxStreamBase)
-int        wxStreamBase_GetLastError( TSelf(wxStreamBase) _obj );
-int        wxStreamBase_GetSize( TSelf(wxStreamBase) _obj );
-TBool      wxStreamBase_IsOk( TSelf(wxStreamBase) _obj );
-
-/* wxStreamBuffer */
-TClassDef(wxStreamBuffer)
-
-/* wxStreamToTextRedirector */
-TClassDef(wxStreamToTextRedirector)
-
-/* wxString */
-TClassDef(wxString)
-
-/* wxStringBuffer */
-TClassDef(wxStringBuffer)
-
-/* wxStringClientData */
-TClassDefExtend(wxStringClientData,wxClientData)
-
-/* wxStringList */
-TClassDefExtend(wxStringList,wxList)
-
-/* wxStringTokenizer */
-TClassDefExtend(wxStringTokenizer,wxObject)
-
-/* wxSysColourChangedEvent */
-TClassDefExtend(wxSysColourChangedEvent,wxEvent)
-
-/* wxSystemOptions */
-TClassDefExtend(wxSystemOptions,wxObject)
-
-/* wxSystemSettings */
-TClassDefExtend(wxSystemSettings,wxObject)
-void       wxSystemSettings_GetSystemColour( int index, TClassRef(wxColour) _ref );
-void       wxSystemSettings_GetSystemFont( int index, TClassRef(wxFont) _ref );
-int        wxSystemSettings_GetSystemMetric( int index );
-
-/* wxTabCtrl */
-TClassDefExtend(wxTabCtrl,wxControl)
-
-/* wxTabEvent */
-TClassDefExtend(wxTabEvent,wxCommandEvent)
-
-/* wxTablesInUse */
-TClassDefExtend(wxTablesInUse,wxObject)
-
-/* wxTaskBarIcon */
-TClassDefExtend(wxTaskBarIcon,wxEvtHandler)
-TClass(wxTaskBarIcon) wxTaskBarIcon_Create();
-void       wxTaskBarIcon_Delete( TSelf(wxTaskBarIcon) _obj );
-/* TClass(wxMenu)  wxTaskBarIcon_CreatePopupMenu( TSelf(wxTaskBarIcon) _obj ); */
-TBool      wxTaskBarIcon_IsIconInstalled( TSelf(wxTaskBarIcon) _obj );
-TBool      wxTaskBarIcon_IsOk( TSelf(wxTaskBarIcon) _obj );
-TBool      wxTaskBarIcon_PopupMenu( TSelf(wxTaskBarIcon) _obj, TClass(wxMenu) menu );
-TBool      wxTaskBarIcon_RemoveIcon( TSelf(wxTaskBarIcon) _obj );
-TBool      wxTaskBarIcon_SetIcon( TSelf(wxTaskBarIcon) _obj, TClass(wxIcon) icon, TString text );
-
-/* wxTempFile */
-TClassDef(wxTempFile)
-
-/* wxTextAttr */
-TClassDef(wxTextAttr)
-
-/* wxTextCtrl */
-TClassDefExtend(wxTextCtrl,wxControl)
-void       wxTextCtrl_AppendText( TSelf(wxTextCtrl) _obj, TString text );
-TBool      wxTextCtrl_CanCopy( TSelf(wxTextCtrl) _obj );
-TBool      wxTextCtrl_CanCut( TSelf(wxTextCtrl) _obj );
-TBool      wxTextCtrl_CanPaste( TSelf(wxTextCtrl) _obj );
-TBool      wxTextCtrl_CanRedo( TSelf(wxTextCtrl) _obj );
-TBool      wxTextCtrl_CanUndo( TSelf(wxTextCtrl) _obj );
-void       wxTextCtrl_Clear( TSelf(wxTextCtrl) _obj );
-void       wxTextCtrl_Copy( TSelf(wxTextCtrl) _obj );
-TClass(wxTextCtrl) wxTextCtrl_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), long _stl );
-void       wxTextCtrl_Cut( TSelf(wxTextCtrl) _obj );
-void       wxTextCtrl_DiscardEdits( TSelf(wxTextCtrl) _obj );
-long       wxTextCtrl_GetInsertionPoint( TSelf(wxTextCtrl) _obj );
-long       wxTextCtrl_GetLastPosition( TSelf(wxTextCtrl) _obj );
-int        wxTextCtrl_GetLineLength( TSelf(wxTextCtrl) _obj, long lineNo );
-TStringLen wxTextCtrl_GetLineText( TSelf(wxTextCtrl) _obj, long lineNo, TStringOutVoid _buf );
-int        wxTextCtrl_GetNumberOfLines( TSelf(wxTextCtrl) _obj );
-void       wxTextCtrl_GetSelection( TSelf(wxTextCtrl) _obj, void* from, void* to );
-TStringLen wxTextCtrl_GetValue( TSelf(wxTextCtrl) _obj, TStringOutVoid _buf );
-TBool      wxTextCtrl_IsEditable( TSelf(wxTextCtrl) _obj );
-TBool      wxTextCtrl_IsModified( TSelf(wxTextCtrl) _obj );
-int        wxTextCtrl_LoadFile( TSelf(wxTextCtrl) _obj, TString file );
-void       wxTextCtrl_Paste( TSelf(wxTextCtrl) _obj );
-int        wxTextCtrl_PositionToXY( TSelf(wxTextCtrl) _obj, long pos, long* x, long* y );
-void       wxTextCtrl_Redo( TSelf(wxTextCtrl) _obj );
-void       wxTextCtrl_Remove( TSelf(wxTextCtrl) _obj, long from, long to );
-void       wxTextCtrl_Replace( TSelf(wxTextCtrl) _obj, long from, long to, TString value );
-int        wxTextCtrl_SaveFile( TSelf(wxTextCtrl) _obj, TString file );
-void       wxTextCtrl_SetEditable( TSelf(wxTextCtrl) _obj, TBool editable );
-void       wxTextCtrl_SetInsertionPoint( TSelf(wxTextCtrl) _obj, long pos );
-void       wxTextCtrl_SetInsertionPointEnd( TSelf(wxTextCtrl) _obj );
-void       wxTextCtrl_SetSelection( TSelf(wxTextCtrl) _obj, long from, long to );
-void       wxTextCtrl_SetValue( TSelf(wxTextCtrl) _obj, TString value );
-void       wxTextCtrl_ShowPosition( TSelf(wxTextCtrl) _obj, long pos );
-void       wxTextCtrl_Undo( TSelf(wxTextCtrl) _obj );
-void       wxTextCtrl_WriteText( TSelf(wxTextCtrl) _obj, TString text );
-long       wxTextCtrl_XYToPosition( TSelf(wxTextCtrl) _obj, TPointLong(x,y) );
-
-/* wxTextDataObject */
-TClassDefExtend(wxTextDataObject,wxDataObjectSimple)
-TClass(TextDataObject) TextDataObject_Create( TStringVoid _txt );
-void       TextDataObject_Delete( TSelf(TextDataObject) _obj );
-size_t TextDataObject_GetTextLength( TSelf(TextDataObject) _obj );
-TStringLen       TextDataObject_GetText( TSelf(TextDataObject) _obj, TStringOutVoid _buf );
-void       TextDataObject_SetText( TSelf(TextDataObject) _obj, TString text );
-
-/* wxTextDropTarget */
-TClassDefExtend(wxTextDropTarget,wxDropTarget)
-
-/* wxTextEntryDialog */
-TClassDefExtend(wxTextEntryDialog,wxDialog)
-
-/* wxTextFile */
-TClassDef(wxTextFile)
-
-/* wxTextInputStream */
-TClassDef(wxTextInputStream)
-
-/* wxTextOutputStream */
-TClassDef(wxTextOutputStream)
-
-/* wxTextValidator */
-TClassDefExtend(wxTextValidator,wxValidator)
-TClass(wxTextValidator) wxTextValidator_Create( int style, void* val );
-TArrayLen  wxTextValidator_GetExcludeList( TSelf(wxTextValidator) _obj, TArrayStringOutVoid _ref );
-TArrayLen  wxTextValidator_GetIncludeList( TSelf(wxTextValidator) _obj, TArrayStringOutVoid _ref );
-int        wxTextValidator_GetStyle( TSelf(wxTextValidator) _obj );
-void       wxTextValidator_OnChar( TSelf(wxTextValidator) _obj, TClass(wxEvent) event );
-void       wxTextValidator_SetExcludeList( TSelf(wxTextValidator) _obj, TClass(wxList) list, int count );
-void       wxTextValidator_SetIncludeList( TSelf(wxTextValidator) _obj, TClass(wxList) list, int count );
-void       wxTextValidator_SetStyle( TSelf(wxTextValidator) _obj, int style );
-
-/* wxThinSplitterWindow */
-TClassDefExtend(wxThinSplitterWindow,wxSplitterWindow)
-TClass(wxThinSplitterWindow) wxThinSplitterWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
-void       wxThinSplitterWindow_DrawSash( TSelf(wxThinSplitterWindow) _obj, TClass(wxDC) dc );
-int        wxThinSplitterWindow_SashHitTest( TSelf(wxThinSplitterWindow) _obj, TPoint(x,y), int tolerance );
-void       wxThinSplitterWindow_SizeWindows( TSelf(wxThinSplitterWindow) _obj );
-
-/* wxThread */
-TClassDef(wxThread)
-
-/* wxTime */
-TClassDefExtend(wxTime,wxObject)
-
-/* wxTimeSpan */
-TClassDef(wxTimeSpan)
-
-/* wxTimer */
-TClassDefExtend(wxTimer,wxObject)
-TClass(wxTimer) wxTimer_Create( TClass(wxWindow) _prt, int _id );
-void       wxTimer_Delete( TSelf(wxTimer) _obj );
-int        wxTimer_GetInterval( TSelf(wxTimer) _obj );
-TBool      wxTimer_IsOneShot( TSelf(wxTimer) _obj );
-TBool      wxTimer_IsRuning( TSelf(wxTimer) _obj );
-TBool      wxTimer_Start( TSelf(wxTimer) _obj, int _int, TBool _one );
-void       wxTimer_Stop( TSelf(wxTimer) _obj );
-
-/* wxTimerBase */
-TClassDefExtend(wxTimerBase,wxObject)
-
-/* wxTimerEvent */
-TClassDefExtend(wxTimerEvent,wxEvent)
-int        wxTimerEvent_GetInterval( TSelf(wxTimerEvent) _obj );
-
-/* wxTimerEx */
-TClassDefExtend(wxTimerEx,wxTimer)
-
-/* wxTimerRunner */
-TClassDef(wxTimerRunner)
-
-/* wxTipProvider */
-TClassDef(wxTipProvider)
-
-/* wxTipWindow */
-TClassDefExtend(wxTipWindow,wxPopupTransientWindow)
-void       wxTipWindow_Close( TSelf(wxTipWindow) _obj );
-TClass(wxTipWindow) wxTipWindow_Create( TClass(wxWindow) parent, TStringVoid text, int maxLength );
-void       wxTipWindow_SetBoundingRect( TSelf(wxTipWindow) _obj, TRect(x,y,w,h) );
-void       wxTipWindow_SetTipWindowPtr( TSelf(wxTipWindow) _obj, void* windowPtr );
-
-/* wxToggleButton */
-TClassDefExtend(wxToggleButton,wxControl)
-TClass(wxToggleButton) wxToggleButton_Create( TClass(wxWindow) parent, int id, void* label, TRect(x,y,w,h), int style );
-int        wxToggleButton_Enable( TSelf(wxToggleButton) _obj, TBool enable );
-int        wxToggleButton_GetValue( TSelf(wxToggleButton) _obj );
-void       wxToggleButton_SetLabel( TSelf(wxToggleButton) _obj, void* label );
-void       wxToggleButton_SetValue( TSelf(wxToggleButton) _obj, int state );
-
-/* wxToolBar */
-TClassDefExtend(wxToolBar,wxToolBarBase)
-TBoolInt   wxToolBar_AddControl( TSelf(wxToolBar) _obj, TClass(wxControl) ctrl );
-void       wxToolBar_AddSeparator( TSelf(wxToolBar) _obj );
-void       wxToolBar_AddTool( TSelf(wxToolBar) _obj, int id, TClass(wxBitmap) bmp, TStringVoid shelp, TStringVoid lhelp );
-void       wxToolBar_AddToolEx( TSelf(wxToolBar) _obj, int id, TClass(wxBitmap) bmp1, TClass(wxBitmap) bmp2, TBoolInt isToggle, TPoint(x,y), TClass(wxObject) data, TStringVoid shelp, TStringVoid lhelp );
-TClass(wxToolBar) wxToolBar_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxToolBar_Delete( TSelf(wxToolBar) _obj );
-TBoolInt   wxToolBar_DeleteTool( TSelf(wxToolBar) _obj, int id );
-TBoolInt   wxToolBar_DeleteToolByPos( TSelf(wxToolBar) _obj, int pos );
-void       wxToolBar_EnableTool( TSelf(wxToolBar) _obj, int id, TBool enable );
-void       wxToolBar_GetMargins( TSelf(wxToolBar) _obj, TPointOutVoid(x,y) );
-void       wxToolBar_GetToolBitmapSize( TSelf(wxToolBar) _obj, TSizeOutVoid(_x,_y) );
-TClass(wxObject) wxToolBar_GetToolClientData( TSelf(wxToolBar) _obj, int id );
-TBool      wxToolBar_GetToolEnabled( TSelf(wxToolBar) _obj, int id );
-TStringLen wxToolBar_GetToolLongHelp( TSelf(wxToolBar) _obj, int id, TStringOutVoid _buf );
-int        wxToolBar_GetToolPacking( TSelf(wxToolBar) _obj );
-TStringLen wxToolBar_GetToolShortHelp( TSelf(wxToolBar) _obj, int id, TStringOutVoid _buf );
-void       wxToolBar_GetToolSize( TSelf(wxToolBar) _obj, TPointOutVoid(_x,_y) );
-TBoolInt   wxToolBar_GetToolState( TSelf(wxToolBar) _obj, int id );
-void       wxToolBar_InsertControl( TSelf(wxToolBar) _obj, int pos, TClass(wxControl) ctrl );
-void       wxToolBar_InsertSeparator( TSelf(wxToolBar) _obj, int pos );
-void       wxToolBar_InsertTool( TSelf(wxToolBar) _obj, int pos, int id, TClass(wxBitmap) bmp1, TClass(wxBitmap) bmp2, TBoolInt isToggle, TClass(wxObject) data, TStringVoid shelp, TStringVoid lhelp );
-TBoolInt   wxToolBar_Realize( TSelf(wxToolBar) _obj );
-void       wxToolBar_RemoveTool( TSelf(wxToolBar) _obj, int id );
-void       wxToolBar_SetMargins( TSelf(wxToolBar) _obj, TPoint(x,y) );
-void       wxToolBar_SetToolBitmapSize( TSelf(wxToolBar) _obj, TSize(x,y) );
-void       wxToolBar_SetToolClientData( TSelf(wxToolBar) _obj, int id, TClass(wxObject) data );
-void       wxToolBar_SetToolLongHelp( TSelf(wxToolBar) _obj, int id, TStringVoid str );
-void       wxToolBar_SetToolPacking( TSelf(wxToolBar) _obj, int packing );
-void       wxToolBar_SetToolSeparation( TSelf(wxToolBar) _obj, int separation );
-void       wxToolBar_SetToolShortHelp( TSelf(wxToolBar) _obj, int id, TStringVoid str );
-void       wxToolBar_ToggleTool( TSelf(wxToolBar) _obj, int id, TBoolInt toggle );
-
-/* wxToolBarBase */
-TClassDefExtend(wxToolBarBase,wxControl)
-
-/* wxToolLayoutItem */
-TClassDefExtend(wxToolLayoutItem,wxObject)
-TBool      wxToolLayoutItem_IsSeparator( TSelf(wxToolLayoutItem) _obj );
-void       wxToolLayoutItem_Rect( TSelf(wxToolLayoutItem) _obj, TRectOutVoid(_x,_y,_w,_h) );
-
-/* wxToolTip */
-TClassDefExtend(wxToolTip,wxObject)
-
-/* wxToolWindow */
-TClassDefExtend(wxToolWindow,wxFrame)
-void       wxToolWindow_AddMiniButton( TSelf(wxToolWindow) _obj, void* _btn );
-TClass(wxToolWindow) wxToolWindow_Create( void* _obj, void* _btn, void* _ttl );
-TClass(wxClient) wxToolWindow_GetClient( TSelf(wxToolWindow) _obj );
-void       wxToolWindow_SetClient( TSelf(wxToolWindow) _obj, TClass(wxWindow) _wnd );
-void       wxToolWindow_SetTitleFont( TSelf(wxToolWindow) _obj, void* _fnt );
-
-/* wxTreeCompanionWindow */
-TClassDefExtend(wxTreeCompanionWindow,wxWindow)
-TClass(wxTreeCompanionWindow) wxTreeCompanionWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
-void       wxTreeCompanionWindow_DrawItem( TSelf(wxTreeCompanionWindow) _obj, TClass(wxDC) dc, void* id, TRect(x,y,w,h));
-TClass(wxTreeCtrl) wxTreeCompanionWindow_GetTreeCtrl( TSelf(wxTreeCompanionWindow) _obj );
-void       wxTreeCompanionWindow_SetTreeCtrl( TSelf(wxTreeCompanionWindow) _obj, TClass(wxTreeCtrl) treeCtrl );
-
-/* wxTreeCtrl */
-TClassDefExtend(wxTreeCtrl,wxControl)
-void       wxTreeCtrl_AddRoot( TSelf(wxTreeCtrl) _obj, TStringVoid text, int image, int selectedImage, TClass(wxTreeItemData) data, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_AppendItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, TStringVoid text, int image, int selectedImage, TClass(wxTreeItemData)  data, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_Collapse( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_CollapseAndReset( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-TClass(wxTreeCtrl) wxTreeCtrl_Create( void* _obj, void* _cmp, TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
-void       wxTreeCtrl_Delete( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_DeleteAllItems( TSelf(wxTreeCtrl) _obj );
-void       wxTreeCtrl_DeleteChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_EditLabel( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_EndEditLabel( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt discardChanges );
-void       wxTreeCtrl_EnsureVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_Expand( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-int        wxTreeCtrl_GetBoundingRect( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt textOnly, TRectOutVoid(x,y,w,h) );
-int        wxTreeCtrl_GetChildrenCount( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt recursively );
-int        wxTreeCtrl_GetCount( TSelf(wxTreeCtrl) _obj );
-TClass(wxTextCtrl) wxTreeCtrl_GetEditControl( TSelf(wxTreeCtrl) _obj );
-void       wxTreeCtrl_GetFirstChild( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int* cookie, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetFirstVisibleItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
-TClass(wxImageList) wxTreeCtrl_GetImageList( TSelf(wxTreeCtrl) _obj );
-int        wxTreeCtrl_GetIndent( TSelf(wxTreeCtrl) _obj );
-void*      wxTreeCtrl_GetItemData( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-int        wxTreeCtrl_GetItemImage( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int which );
-TStringLen wxTreeCtrl_GetItemText( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TStringOutVoid _buf );
-void       wxTreeCtrl_GetLastChild( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetNextChild( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int* cookie, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetNextSibling( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetNextVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetParent( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetPrevSibling( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetPrevVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetRootItem( TSelf(wxTreeCtrl) _obj, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_GetSelection( TSelf(wxTreeCtrl) _obj, TClassRef(wxTreeItemId) _item );
-TArrayLen  wxTreeCtrl_GetSelections( TSelf(wxTreeCtrl) _obj, TArrayIntOutVoid selections );
-int        wxTreeCtrl_GetSpacing( TSelf(wxTreeCtrl) _obj );
-TClass(wxImageList)  wxTreeCtrl_GetStateImageList( TSelf(wxTreeCtrl) _obj );
-void       wxTreeCtrl_HitTest( TSelf(wxTreeCtrl) _obj, TPoint(_x,_y), int* flags, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_InsertItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, TClass(wxTreeItemId) idPrevious, TStringVoid text, int image, int selectedImage, void* data, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_InsertItemByIndex( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, int index, TStringVoid text, int image, int selectedImage, void* data, TClassRef(wxTreeItemId) _item );
-TBool      wxTreeCtrl_IsBold( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-TBool      wxTreeCtrl_IsExpanded( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-TBool      wxTreeCtrl_IsSelected( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-TBool      wxTreeCtrl_IsVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-int        wxTreeCtrl_ItemHasChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-int        wxTreeCtrl_OnCompareItems( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item1, TClass(wxTreeItemId) item2 );
-void       wxTreeCtrl_PrependItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, TStringVoid text, int image, int selectedImage, void* data, TClassRef(wxTreeItemId) _item );
-void       wxTreeCtrl_ScrollTo( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_SelectItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_SetImageList( TSelf(wxTreeCtrl) _obj, TClass(wxImageList) imageList );
-void       wxTreeCtrl_SetIndent( TSelf(wxTreeCtrl) _obj, int indent );
-void       wxTreeCtrl_SetItemBackgroundColour( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClass(wxColour) col );
-void       wxTreeCtrl_SetItemBold( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt bold );
-void       wxTreeCtrl_SetItemData( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, void* data );
-void       wxTreeCtrl_SetItemDropHighlight( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt highlight );
-void       wxTreeCtrl_SetItemFont( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClass(wxFont) font );
-void       wxTreeCtrl_SetItemHasChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt hasChildren );
-void       wxTreeCtrl_SetItemImage( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int image, int which );
-void       wxTreeCtrl_SetItemText( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TStringVoid text );
-void       wxTreeCtrl_SetItemTextColour( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClass(wxColour) col );
-void       wxTreeCtrl_SetSpacing( TSelf(wxTreeCtrl) _obj, int spacing );
-void       wxTreeCtrl_SetStateImageList( TSelf(wxTreeCtrl) _obj, TClass(wxImageList) imageList );
-void       wxTreeCtrl_SortChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_Toggle( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
-void       wxTreeCtrl_Unselect( TSelf(wxTreeCtrl) _obj );
-void       wxTreeCtrl_UnselectAll( TSelf(wxTreeCtrl) _obj );
-
-/* wxTreeEvent */
-TClassDefExtend(wxTreeEvent,wxNotifyEvent)
-int        wxTreeEvent_GetCode( TSelf(wxTreeEvent) _obj );
-void       wxTreeEvent_GetItem( TSelf(wxTreeEvent) _obj, TClassRef(wxTreeItemId) _ref );
-TStringLen wxTreeEvent_GetLabel( TSelf(wxTreeEvent) _obj, TStringOutVoid _buf );
-void       wxTreeEvent_GetOldItem( TSelf(wxTreeEvent) _obj, TClassRef(wxTreeItemId) _ref );
-void       wxTreeEvent_GetPoint( TSelf(wxTreeEvent) _obj, TPointOutVoid(_x,_y) );
-
-/* wxTreeItemData */
-TClassDefExtend(wxTreeItemData,wxClientData)
-
-/* wxTreeItemId */
-TClassDef(wxTreeItemId)
-TClass(wxTreeItemId) wxTreeItemId_Create(  );
-void       wxTreeItemId_Delete( TSelf(wxTreeItemId) _obj );
-TBool      wxTreeItemId_IsOk( TSelf(wxTreeItemId) _obj );
-
-/* wxTreeLayout */
-TClassDefExtend(wxTreeLayout,wxObject)
-
-/* wxTreeLayoutStored */
-TClassDefExtend(wxTreeLayoutStored,wxTreeLayout)
-
-/* wxURL */
-TClassDefExtend(wxURL,wxObject)
-
-/* wxUpdateUIEvent */
-TClassDefExtend(wxUpdateUIEvent,wxEvent)
-void       wxUpdateUIEvent_Check( TSelf(wxUpdateUIEvent) _obj, TBool check );
-void       wxUpdateUIEvent_CopyObject( TSelf(wxUpdateUIEvent) _obj, void* obj );
-void       wxUpdateUIEvent_Enable( TSelf(wxUpdateUIEvent) _obj, TBool enable );
-TBool      wxUpdateUIEvent_GetChecked( TSelf(wxUpdateUIEvent) _obj );
-TBool      wxUpdateUIEvent_GetEnabled( TSelf(wxUpdateUIEvent) _obj );
-int        wxUpdateUIEvent_GetSetChecked( TSelf(wxUpdateUIEvent) _obj );
-int        wxUpdateUIEvent_GetSetEnabled( TSelf(wxUpdateUIEvent) _obj );
-int        wxUpdateUIEvent_GetSetText( TSelf(wxUpdateUIEvent) _obj );
-TStringLen wxUpdateUIEvent_GetText( TSelf(wxUpdateUIEvent) _obj, TStringOutVoid _buf );
-void       wxUpdateUIEvent_SetText( TSelf(wxUpdateUIEvent) _obj, TString text );
-
-/* wxValidator */
-TClassDefExtend(wxValidator,wxEvtHandler)
-TClass(wxValidator) wxValidator_Create(  );
-void       wxValidator_Delete( TSelf(wxValidator) _obj );
-TClass(wxWindow) wxValidator_GetWindow( TSelf(wxValidator) _obj );
-TBool      wxValidator_IsSilent(  );
-void       wxValidator_SetBellOnError( TBool doIt );
-void       wxValidator_SetWindow( TSelf(wxValidator) _obj, TClass(wxWindow) win );
-int        wxValidator_TransferFromWindow( TSelf(wxValidator) _obj );
-int        wxValidator_TransferToWindow( TSelf(wxValidator) _obj );
-TBool      wxValidator_Validate( TSelf(wxValidator) _obj, TClass(wxWindow) parent );
-
-/* wxVariant */
-TClassDefExtend(wxVariant,wxObject)
-
-/* wxVariantData */
-TClassDefExtend(wxVariantData,wxObject)
-
-/* wxView */
-TClassDefExtend(wxView,wxEvtHandler)
-
-/* wxSound */
-TClassDefExtend(wxSound,wxEvtHandler)
-
-/* wxWindow */
-TClassDefExtend(wxWindow,wxEvtHandler)
-void       wxWindow_AddChild( TSelf(wxWindow) _obj, TClass(wxWindow) child );
-void       wxWindow_AddConstraintReference( TSelf(wxWindow) _obj, TClass(wxWindow) otherWin );
-void       wxWindow_CaptureMouse( TSelf(wxWindow) _obj );
-void       wxWindow_Center( TSelf(wxWindow) _obj, int direction );
-void       wxWindow_CenterOnParent( TSelf(wxWindow) _obj, int dir );
-void       wxWindow_Clear( TSelf(wxWindow) _obj );
-TBool      wxWindow_Close( TSelf(wxWindow) _obj, TBool _force );
-void       wxWindow_ConvertDialogToPixels( TSelf(wxWindow) _obj, TPointOut(_x,_y) );
-void       wxWindow_ConvertPixelsToDialog( TSelf(wxWindow) _obj, TPointOut(_x,_y) );
-TClass(wxWindow) wxWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_x,_y,_w,_h), int _stl );
-void       wxWindow_DeleteRelatedConstraints( TSelf(wxWindow) _obj );
-TBool      wxWindow_Destroy( TSelf(wxWindow) _obj );
-TBool      wxWindow_DestroyChildren( TSelf(wxWindow) _obj );
-TBool      wxWindow_Disable( TSelf(wxWindow) _obj );
-int        wxWindow_DoPhase( TSelf(wxWindow) _obj, int phase );
-TBoolInt   wxWindow_Enable( TSelf(wxWindow) _obj );
-TClass(wxWindow) wxWindow_FindFocus( TSelf(wxWindow) _obj );
-TClass(wxWindow) wxWindow_FindWindow( TSelf(wxWindow) _obj, TString name );
-void       wxWindow_Fit( TSelf(wxWindow) _obj );
-void       wxWindow_Freeze( TSelf(wxWindow) _obj );
-void       wxWindow_GetAdjustedBestSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
-int        wxWindow_GetAutoLayout( TSelf(wxWindow) _obj );
-void       wxWindow_GetBackgroundColour( TSelf(wxWindow) _obj, TClassRef(wxColour) _ref );
-void       wxWindow_GetBestSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
-TClass(wxCaret) wxWindow_GetCaret( TSelf(wxWindow) _obj );
-int        wxWindow_GetCharHeight( TSelf(wxWindow) _obj );
-int        wxWindow_GetCharWidth( TSelf(wxWindow) _obj );
-int        wxWindow_GetChildren( TSelf(wxWindow) _obj, void* _res, int _cnt );
-TClass(wxClientData) wxWindow_GetClientData( TSelf(wxWindow) _obj );
-void       wxWindow_GetClientSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
-void       wxWindow_GetClientSizeConstraint( TSelf(wxWindow) _obj, TSizeOut(_w,_h) );
-TClass(wxLayoutConstraints) wxWindow_GetConstraints( TSelf(wxWindow) _obj );
-void*      wxWindow_GetConstraintsInvolvedIn( TSelf(wxWindow) _obj );
-TClass(wxCursor) wxWindow_GetCursor( TSelf(wxWindow) _obj );
-TClass(wxDropTarget) wxWindow_GetDropTarget( TSelf(wxWindow) _obj );
-TClass(wxEvtHandler) wxWindow_GetEventHandler( TSelf(wxWindow) _obj );
-void       wxWindow_GetFont( TSelf(wxWindow) _obj, TClassRef(wxFont) _ref );
-void       wxWindow_GetForegroundColour( TSelf(wxWindow) _obj, TClassRef(wxColour) _ref );
-void*      wxWindow_GetHandle( TSelf(wxWindow) _obj );
-int        wxWindow_GetId( TSelf(wxWindow) _obj );
-TStringLen wxWindow_GetLabel( TSelf(wxWindow) _obj, TStringOutVoid _buf );
-int        wxWindow_GetLabelEmpty( TSelf(wxWindow) _obj );
-int        wxWindow_GetMaxHeight( TSelf(wxWindow) _obj );
-int        wxWindow_GetMaxWidth( TSelf(wxWindow) _obj );
-int        wxWindow_GetMinHeight( TSelf(wxWindow) _obj );
-int        wxWindow_GetMinWidth( TSelf(wxWindow) _obj );
-TStringLen wxWindow_GetName( TSelf(wxWindow) _obj, TStringOutVoid _buf );
-TClass(wxWindow) wxWindow_GetParent( TSelf(wxWindow) _obj );
-void       wxWindow_GetPosition( TSelf(wxWindow) _obj, TPointOutVoid(_x,_y) );
-void       wxWindow_GetPositionConstraint( TSelf(wxWindow) _obj, TPointOut(_x,_y) );
-void       wxWindow_GetRect( TSelf(wxWindow) _obj, TRectOutVoid(_x,_y,_w,_h) );
-int        wxWindow_GetScrollPos( TSelf(wxWindow) _obj, int orient );
-int        wxWindow_GetScrollRange( TSelf(wxWindow) _obj, int orient );
-int        wxWindow_GetScrollThumb( TSelf(wxWindow) _obj, int orient );
-void       wxWindow_GetSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
-void       wxWindow_GetSizeConstraint( TSelf(wxWindow) _obj, TSizeOut(_w,_h) );
-TClass(wxSizer) wxWindow_GetSizer( TSelf(wxWindow) _obj );
-void       wxWindow_GetTextExtent( TSelf(wxWindow) _obj, TString string, int* x, int* y, int* descent, int* externalLeading, TClass(wxFont) theFont );
-TStringLen wxWindow_GetToolTip( TSelf(wxWindow) _obj, TStringOutVoid _buf );
-TClass(wxRegion) wxWindow_GetUpdateRegion( TSelf(wxWindow) _obj );
-TClass(wxValidator) wxWindow_GetValidator( TSelf(wxWindow) _obj );
-int        wxWindow_GetWindowStyleFlag( TSelf(wxWindow) _obj );
-TBool      wxWindow_HasFlag( TSelf(wxWindow) _obj, int flag );
-TBool      wxWindow_Hide( TSelf(wxWindow) _obj );
-void       wxWindow_InitDialog( TSelf(wxWindow) _obj );
-TBool      wxWindow_IsBeingDeleted( TSelf(wxWindow) _obj );
-TBool      wxWindow_IsEnabled( TSelf(wxWindow) _obj );
-TBool      wxWindow_IsExposed( TSelf(wxWindow) _obj, TRect(x,y,w,h) );
-TBool      wxWindow_IsShown( TSelf(wxWindow) _obj );
-TBool      wxWindow_IsTopLevel( TSelf(wxWindow) _obj );
-int        wxWindow_Layout( TSelf(wxWindow) _obj );
-int        wxWindow_LayoutPhase1( TSelf(wxWindow) _obj, int* noChanges );
-int        wxWindow_LayoutPhase2( TSelf(wxWindow) _obj, int* noChanges );
-void       wxWindow_Lower( TSelf(wxWindow) _obj );
-void       wxWindow_MakeModal( TSelf(wxWindow) _obj, TBool modal );
-void       wxWindow_Move( TSelf(wxWindow) _obj, TPoint(x,y) );
-void       wxWindow_MoveConstraint( TSelf(wxWindow) _obj, TPoint(x,y) );
-void*      wxWindow_PopEventHandler( TSelf(wxWindow) _obj, TBool deleteHandler );
-int        wxWindow_PopupMenu( TSelf(wxWindow) _obj, TClass(wxMenu) menu, TPoint(x,y) );
-void       wxWindow_PrepareDC( TSelf(wxWindow) _obj, TClass(wxDC) dc );
-void       wxWindow_PushEventHandler( TSelf(wxWindow) _obj, TClass(wxEvtHandler) handler );
-void       wxWindow_Raise( TSelf(wxWindow) _obj );
-void       wxWindow_Refresh( TSelf(wxWindow) _obj, TBool eraseBackground );
-void       wxWindow_RefreshRect( TSelf(wxWindow) _obj, TBool eraseBackground, TRect(x,y,w,h) );
-void       wxWindow_ReleaseMouse( TSelf(wxWindow) _obj );
-void       wxWindow_RemoveChild( TSelf(wxWindow) _obj, TClass(wxWindow) child );
-void       wxWindow_RemoveConstraintReference( TSelf(wxWindow) _obj, TClass(wxWindow) otherWin );
-int        wxWindow_Reparent( TSelf(wxWindow) _obj, TClass(wxWindow) _par );
-void       wxWindow_ResetConstraints( TSelf(wxWindow) _obj );
-void       wxWindow_ScreenToClient( TSelf(wxWindow) _obj, int* x, int* y );
-void       wxWindow_ScrollWindow( TSelf(wxWindow) _obj, TVector(dx,dy) );
-void       wxWindow_ScrollWindowRect( TSelf(wxWindow) _obj, TVector(dx,dy), TRect(x,y,w,h) );
-void       wxWindow_SetAcceleratorTable( TSelf(wxWindow) _obj, TClass(wxAcceleratorTable) accel );
-void       wxWindow_SetAutoLayout( TSelf(wxWindow) _obj, TBool autoLayout );
-int        wxWindow_SetBackgroundColour( TSelf(wxWindow) _obj, TClass(wxColour) colour );
-void       wxWindow_SetCaret( TSelf(wxWindow) _obj, TClass(wxCaret) caret );
-void       wxWindow_SetClientData( TSelf(wxWindow) _obj, TClass(wxClientData) data );
-void       wxWindow_SetClientObject( TSelf(wxWindow) _obj, TClass(wxClientData) data );
-void       wxWindow_SetClientSize( TSelf(wxWindow) _obj, TSize(width,height) );
-void       wxWindow_SetConstraintSizes( TSelf(wxWindow) _obj, int recurse );
-void       wxWindow_SetConstraints( TSelf(wxWindow) _obj, TClass(wxLayoutConstraints) constraints );
-int        wxWindow_SetCursor( TSelf(wxWindow) _obj, TClass(wxCursor) cursor );
-void       wxWindow_SetDropTarget( TSelf(wxWindow) _obj, TClass(wxDropTarget) dropTarget );
-void       wxWindow_SetExtraStyle( TSelf(wxWindow) _obj, long exStyle );
-void       wxWindow_SetFocus( TSelf(wxWindow) _obj );
-int        wxWindow_SetFont( TSelf(wxWindow) _obj, TClass(wxFont) font );
-int        wxWindow_SetForegroundColour( TSelf(wxWindow) _obj, TClass(wxColour) colour );
-void       wxWindow_SetId( TSelf(wxWindow) _obj, int _id );
-void       wxWindow_SetLabel( TSelf(wxWindow) _obj, TString _title );
-void       wxWindow_SetName( TSelf(wxWindow) _obj, TString _name );
-void       wxWindow_SetScrollPos( TSelf(wxWindow) _obj, int orient, int pos, TBool refresh );
-void       wxWindow_SetScrollbar( TSelf(wxWindow) _obj, int orient, int pos, int thumbVisible, int range, TBool refresh );
-void       wxWindow_SetSize( TSelf(wxWindow) _obj, TRect(x,y,width,height), int sizeFlags );
-void       wxWindow_SetSizeConstraint( TSelf(wxWindow) _obj, TRect(x,y,w,h) );
-void       wxWindow_SetSizeHints( TSelf(wxWindow) _obj, int minW, int minH, int maxW, int maxH, int incW, int incH );
-void       wxWindow_SetSizer( TSelf(wxWindow) _obj, TClass(wxSizer) sizer );
-void       wxWindow_SetToolTip( TSelf(wxWindow) _obj, TString tip );
-void       wxWindow_SetValidator( TSelf(wxWindow) _obj, TClass(wxValidator) validator );
-void       wxWindow_SetWindowStyleFlag( TSelf(wxWindow) _obj, long style );
-TBool      wxWindow_Show( TSelf(wxWindow) _obj );
-void       wxWindow_Thaw( TSelf(wxWindow) _obj );
-TBoolInt   wxWindow_TransferDataFromWindow( TSelf(wxWindow) _obj );
-TBoolInt   wxWindow_TransferDataToWindow( TSelf(wxWindow) _obj );
-void       wxWindow_UnsetConstraints( TSelf(wxWindow) _obj, void* c );
-void       wxWindow_UpdateWindowUI( TSelf(wxWindow) _obj );
-TBool      wxWindow_Validate( TSelf(wxWindow) _obj );
-void       wxWindow_WarpPointer( TSelf(wxWindow) _obj, TPoint(x,y) );
-
-/* wxWindowCreateEvent */
-TClassDefExtend(wxWindowCreateEvent,wxCommandEvent)
-TClass(wxWindow) wxWindowCreateEvent_GetWindow( TSelf(wxWindowCreateEvent) _obj );
-
-/* wxWindowDC */
-TClassDefExtend(wxWindowDC,wxDC)
-TClass(wxWindowDC) wxWindowDC_Create( TClass(wxWindow) win );
-void       wxWindowDC_Delete( TSelf(wxWindowDC) _obj );
-
-/* wxWindowDestroyEvent */
-TClassDefExtend(wxWindowDestroyEvent,wxCommandEvent)
-TClass(wxWindow) wxWindowDestroyEvent_GetWindow( TSelf(wxWindowDestroyEvent) _obj );
-
-/* wxWindowDisabler */
-TClassDef(wxWindowDisabler)
-
-/* wxWizard */
-TClassDefExtend(wxWizard,wxDialog)
-void       wxWizard_Chain( TClass(wxWizardPageSimple) f, TClass(wxWizardPageSimple) s );
-TClass(wxWizard) wxWizard_Create( TClass(wxWindow) _prt, int _id, TStringVoid _txt, TClass(wxBitmap) _bmp, TRect(_lft,_top,_wdt,_hgt) );
-TClass(wxWizardPage) wxWizard_GetCurrentPage( TSelf(wxWizard) _obj );
-void       wxWizard_GetPageSize( TSelf(wxWizard) _obj, TSizeOutVoid(_w,_h) );
-int        wxWizard_RunWizard( TSelf(wxWizard) _obj, TClass(wxWizardPage) firstPage );
-void       wxWizard_SetPageSize( TSelf(wxWizard) _obj, TSize(w,h) );
-
-/* wxWizardEvent */
-TClassDefExtend(wxWizardEvent,wxNotifyEvent)
-int        wxWizardEvent_GetDirection( TSelf(wxWizardEvent) _obj );
-
-/* wxWizardPage */
-TClassDefExtend(wxWizardPage,wxPanel)
-
-/* wxWizardPageSimple */
-TClassDefExtend(wxWizardPageSimple,wxWizardPage)
-TClass(wxWizardPageSimple) wxWizardPageSimple_Create( TClass(wxWizard) _prt );
-void       wxWizardPageSimple_GetBitmap( TSelf(wxWizardPageSimple) _obj, TClassRef(wxBitmap) _ref );
-TClass(wxWizardPageSimple) wxWizardPageSimple_GetNext( TSelf(wxWizardPageSimple) _obj );
-TClass(wxWizardPageSimple) wxWizardPageSimple_GetPrev( TSelf(wxWizardPageSimple) _obj );
-void       wxWizardPageSimple_SetNext( TSelf(wxWizardPageSimple) _obj, TClass(wxWizardPageSimple) next );
-void       wxWizardPageSimple_SetPrev( TSelf(wxWizardPageSimple) _obj, TClass(wxWizardPageSimple) prev );
-
-/* wxXmlResource */
-TClassDefExtend(wxXmlResource,wxObject)
-void       wxXmlResource_AddHandler( TSelf(wxXmlResource) _obj, TClass(wxEvtHandler) handler );
-void       wxXmlResource_AddSubclassFactory( TSelf(wxXmlResource) _obj, void* factory );
-int        wxXmlResource_AttachUnknownControl( TSelf(wxXmlResource) _obj, TStringVoid name, TClass(wxControl) control, TClass(wxWindow) parent );
-void       wxXmlResource_ClearHandlers( TSelf(wxXmlResource) _obj );
-int        wxXmlResource_CompareVersion( TSelf(wxXmlResource) _obj, int major, int minor, int release, int revision );
-TClass(wxXmlResource) wxXmlResource_Create( void* _obj, int flags );
-TClass(wxXmlResource) wxXmlResource_CreateFromFile( TSelf(wxXmlResource) _obj, void* filemask, int flags );
-void       wxXmlResource_Delete( TSelf(wxXmlResource) _obj );
-void*      wxXmlResource_Get(  );
-int        wxXmlResource_GetFlags( TSelf(wxXmlResource) _obj );
-long       wxXmlResource_GetVersion( TSelf(wxXmlResource) _obj );
-int        wxXmlResource_GetXRCID( TSelf(wxXmlResource) str_id );
-void       wxXmlResource_InitAllHandlers( TSelf(wxXmlResource) _obj );
-int        wxXmlResource_InitializeObject( TSelf(wxXmlResource) _obj, void* _inst, TClass(wxWindow) parent, TStringVoid name, void* classname );
-void       wxXmlResource_InsertHandler( TSelf(wxXmlResource) _obj, TClass(wxEvtHandler) handler );
-int        wxXmlResource_Load( TSelf(wxXmlResource) _obj, void* filemask );
-void       wxXmlResource_LoadBitmap( TSelf(wxXmlResource) _obj, TStringVoid name, TClassRef(wxBitmap) _ref );
-void*      wxXmlResource_LoadDialog( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
-void*      wxXmlResource_LoadFrame( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
-void       wxXmlResource_LoadIcon( TSelf(wxXmlResource) _obj, TStringVoid name, TClassRef(wxIcon) _ref );
-void*      wxXmlResource_LoadMenu( TSelf(wxXmlResource) _obj, TStringVoid name );
-void*      wxXmlResource_LoadMenuBar( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
-void*      wxXmlResource_LoadObject( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name, void* classname );
-void*      wxXmlResource_LoadPanel( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
-void*      wxXmlResource_LoadToolBar( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
-void*      wxXmlResource_Set( TSelf(wxXmlResource) res );
-void       wxXmlResource_SetFlags( TSelf(wxXmlResource) _obj, int flags );
-
-/* wxXmlResourceHandler */
-TClassDefExtend(wxXmlResourceHandler,wxObject)
-
-/* wxZipInputStream */
-TClassDefExtend(wxZipInputStream,wxInputStream)
-
-/* wxZlibInputStream */
-TClassDefExtend(wxZlibInputStream,wxFilterInputStream)
-
-/* wxZlibOutputStream */
-TClassDefExtend(wxZlibOutputStream,wxFilterOutputStream)
-
-
-#endif /* WXC_GLUE_H */
-
diff --git a/wxc/include/ewxw/wxc_types.h b/wxc/include/ewxw/wxc_types.h
deleted file mode 100644
--- a/wxc/include/ewxw/wxc_types.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef WXC_TYPES_H
-#define WXC_TYPES_H
-
-/* Types: we use standard pre-processor definitions to add more
-   type information to the C signatures. These 'types' can be
-   either read by other tools to automatically generate a marshalling
-   layer for foreign languages, or you can define the macros in such
-   a way that they contain more type information while compiling the
-   library itself. 
-   
-   All macros start with "T" to avoid clashes with other libraries. 
-*/
-#undef TClassDef
-#undef TClassDefExtend
-#undef TChar
-#undef TBool
-#undef TBoolInt
-#undef TClass
-#undef TSelf
-#undef TClassRef      
-#undef TClosureFun
-#undef TString
-#undef TStringVoid
-#undef TStringOut
-#undef TStringOutVoid
-#undef TStringLen
-#undef TPoint
-#undef TPointLong
-#undef TPointOut
-#undef TPointOutVoid
-#undef TSize
-#undef TSizeOut
-#undef TSizeOutVoid
-#undef TVector
-#undef TVectorOut
-#undef TVectorOutVoid
-#undef TRect
-#undef TRectOut
-#undef TRectOutVoid
-#undef TArrayString
-#undef TArrayInt
-#undef TArrayObject
-#undef TArrayLen
-#undef TArrayIntOut
-#undef TArrayIntOutVoid
-#undef TArrayStringOut
-#undef TArrayStringOutVoid
-#undef TArrayObjectOut
-#undef TArrayObjectOutVoid
-#undef TColorRGB
-
-/* Class definitions */
-#define TClassDef(tp)     
-#define TClassDefExtend(tp,parent)
-
-/* Types that can be 'untyped' or C++ typed */
-#ifdef WXC_USE_TYPED_INTERFACE
-# define TClass(tp)     tp*
-# define TBool          bool
-# define TClosureFun    ClosureFun
-#else
-# define TClass(tp)     void*
-# define TBool          int
-# define TClosureFun    void*
-#endif
-
-/* basic types */
-#ifdef wxUSE_UNICODE
-#define TChar             wchar_t
-#else
-#define TChar             char
-#endif
-
-/* boolean as int */
-#define TBoolInt          int
-
-/* classes. 
-   "Ref" is used for classes assigned by reference.
-   "Self" is used for the 'this' or 'self' pointer.
-*/
-#define TSelf(tp)         TClass(tp)
-#define TClassRef(tp)     TClass(tp)
-
-/* strings */
-#define TString           TChar*
-#define TStringOut        TChar*
-#define TStringLen        int
-
-/* structures */
-#define TPoint(x,y)       int x,  int y
-#define TPointOut(x,y)    int* x, int* y
-#define TVector(x,y)      int x,  int y
-#define TVectorOut(x,y)   int* x, int* y
-#define TSize(w,h)        int w,  int h
-#define TSizeOut(w,h)     int* w, int* h
-#define TRect(x,y,w,h)    int x,  int y,  int w,  int h
-#define TRectOut(x,y,w,h) int* x, int* y, int* w, int* h
-#define TColorRGB(r,g,b)  char r, char g, char b
-
-/* arrays */
-#define TArrayLen               int
-#define TArrayIntOut            intptr_t*
-#define TArrayStringOut         TString*
-#define TArrayObjectOut(tp)     TClass(tp)*
-
-#define TArrayString(n,p)       int n, TString* p
-#define TArrayInt(n,p)          int n, int* p
-#define TArrayObject(n,tp,p)    int n, TClass(tp)* p
-
-/* Define "Void" variants for void* declared signatures.
-   we only use this for compatibility with the original ewxw_glue.h */
-#ifdef WXC_USE_TYPED_INTERFACE
-# define TStringVoid             TString
-# define TStringOutVoid          TStringOut
-# define TPointOutVoid(x,y)      TPointOut(x,y)
-# define TVectorOutVoid(x,y)     TVectorOut(x,y)
-# define TSizeOutVoid(w,h)       TSizeOut(w,h)
-# define TRectOutVoid(x,y,w,h)   TRectOut(x,y,w,h)
-# define TArrayIntOutVoid        TArrayIntOut
-# define TArrayStringOutVoid     TArrayStringOut
-# define TArrayObjectOutVoid(tp) TArrayObjectOut(tp)
-#else
-# define TStringVoid           void*
-# define TStringOutVoid        void*
-# define TPointOutVoid(x,y)    void* x, void* y
-# define TVectorOutVoid(x,y)   void* x, void* y
-# define TSizeOutVoid(w,h)     void* w, void* h
-# define TRectOutVoid(x,y,w,h) void* x, void* y, void* w, void* h
-# define TArrayIntOutVoid        void*
-# define TArrayStringOutVoid     void*
-# define TArrayObjectOutVoid(tp) void*
-#endif
-
-/* Define "Long" variants for long declared signatures.
-   we only use this for compatibility with the original ewxw_glue.h */
-#define TPointLong(x,y)       long x,  long y
-#define TPointOutLong(x,y)    long* x, long* y
-#define TVectorLong(x,y)      long x,  long y
-#define TVectorOutLong(x,y)   long* x, long* y
-#define TSizeLong(w,h)        long w,  long h
-#define TSizeOutLong(w,h)     long* w, long* h
-#define TRectLong(x,y,w,h)    long x,  long y,  long w,  long h
-#define TRectOutLong(x,y,w,h) long* x, long* y, long* w, long* h
-
-#endif /* WXC_TYPES_H */
diff --git a/wxc/include/sound.h b/wxc/include/sound.h
--- a/wxc/include/sound.h
+++ b/wxc/include/sound.h
@@ -9,3 +9,4 @@
 TBool  wxSound_IsOk(TSelf(wxSound) self);
 TBool  wxSound_Play(TSelf(wxSound) self, int flag );
 TBool  wxSound_PlayCompatible(TSelf(wxSound) self, TBool async, TBool looped );
+void  wxSound_Stop(TSelf(wxSound) self);
diff --git a/wxc/include/wrapper.h b/wxc/include/wrapper.h
--- a/wxc/include/wrapper.h
+++ b/wxc/include/wrapper.h
@@ -13,7 +13,9 @@
 
 #include "ewxw_def.h"
 #include "wx/wx.h"
+#if (wxVERSION_NUMBER >= 2600)
 #include "wx/apptrait.h"
+#endif
 #include "wx/tabctrl.h"
 #include "wx/notebook.h"
 #include "wx/spinctrl.h"
diff --git a/wxc/include/wxc.h b/wxc/include/wxc.h
--- a/wxc/include/wxc.h
+++ b/wxc/include/wxc.h
@@ -12,8 +12,8 @@
 /*-----------------------------------------------------------------------------
   Standard includes
 -----------------------------------------------------------------------------*/
-#include "ewxw/wxc_types.h"
-#include "ewxw/wxc_glue.h"
+#include "wxc_types.h"
+#include "wxc_glue.h"
 
 
 /*-----------------------------------------------------------------------------
diff --git a/wxc/include/wxc_glue.h b/wxc/include/wxc_glue.h
new file mode 100644
--- /dev/null
+++ b/wxc/include/wxc_glue.h
@@ -0,0 +1,4786 @@
+#ifndef WXC_GLUE_H
+#define WXC_GLUE_H
+
+/* $Id: wxc_glue.h,v 1.23 2005/02/25 11:14:58 dleijen Exp $ */
+
+/* Null */
+TClass(wxAcceleratorTable) Null_AcceleratorTable(  );
+TClass(wxBitmap) Null_Bitmap(  );
+TClass(wxBrush) Null_Brush(  );
+TClass(wxColour) Null_Colour(  );
+TClass(wxCursor) Null_Cursor(  );
+TClass(wxFont) Null_Font(  );
+TClass(wxIcon) Null_Icon(  );
+TClass(wxPalette) Null_Palette(  );
+TClass(wxPen) Null_Pen(  );
+
+/* Events */
+int        expEVT_ACTIVATE(  );
+int        expEVT_ACTIVATE_APP(  );
+int        expEVT_CALENDAR_DAY_CHANGED(  );
+int        expEVT_CALENDAR_DOUBLECLICKED(  );
+int        expEVT_CALENDAR_MONTH_CHANGED(  );
+int        expEVT_CALENDAR_SEL_CHANGED(  );
+int        expEVT_CALENDAR_WEEKDAY_CLICKED(  );
+int        expEVT_CALENDAR_YEAR_CHANGED(  );
+int        expEVT_CHAR(  );
+int        expEVT_CHAR_HOOK(  );
+int        expEVT_CLOSE_WINDOW(  );
+int        expEVT_COMMAND_BUTTON_CLICKED(  );
+int        expEVT_COMMAND_CHECKBOX_CLICKED(  );
+int        expEVT_COMMAND_CHECKLISTBOX_TOGGLED(  );
+int        expEVT_COMMAND_CHOICE_SELECTED(  );
+int        expEVT_COMMAND_COMBOBOX_SELECTED(  );
+int        expEVT_COMMAND_ENTER(  );
+int        expEVT_COMMAND_FIND(  );
+int        expEVT_COMMAND_FIND_CLOSE(  );
+int        expEVT_COMMAND_FIND_NEXT(  );
+int        expEVT_COMMAND_FIND_REPLACE(  );
+int        expEVT_COMMAND_FIND_REPLACE_ALL(  );
+int        expEVT_COMMAND_KILL_FOCUS(  );
+int        expEVT_COMMAND_LEFT_CLICK(  );
+int        expEVT_COMMAND_LEFT_DCLICK(  );
+int        expEVT_COMMAND_LISTBOX_DOUBLECLICKED(  );
+int        expEVT_COMMAND_LISTBOX_SELECTED(  );
+int        expEVT_COMMAND_LIST_BEGIN_DRAG(  );
+int        expEVT_COMMAND_LIST_BEGIN_LABEL_EDIT(  );
+int        expEVT_COMMAND_LIST_BEGIN_RDRAG(  );
+int        expEVT_COMMAND_LIST_COL_CLICK(  );
+int        expEVT_COMMAND_LIST_DELETE_ALL_ITEMS(  );
+int        expEVT_COMMAND_LIST_DELETE_ITEM(  );
+int        expEVT_COMMAND_LIST_END_LABEL_EDIT(  );
+int        expEVT_COMMAND_LIST_INSERT_ITEM(  );
+int        expEVT_COMMAND_LIST_ITEM_ACTIVATED(  );
+int        expEVT_COMMAND_LIST_ITEM_DESELECTED(  );
+int        expEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK(  );
+int        expEVT_COMMAND_LIST_ITEM_RIGHT_CLICK(  );
+int        expEVT_COMMAND_LIST_ITEM_SELECTED(  );
+int        expEVT_COMMAND_LIST_ITEM_FOCUSED(  );
+int        expEVT_COMMAND_LIST_KEY_DOWN(  );
+int        expEVT_COMMAND_MENU_SELECTED(  );
+int        expEVT_COMMAND_NOTEBOOK_PAGE_CHANGED(  );
+int        expEVT_COMMAND_NOTEBOOK_PAGE_CHANGING(  );
+int        expEVT_COMMAND_RADIOBOX_SELECTED(  );
+int        expEVT_COMMAND_RADIOBUTTON_SELECTED(  );
+int        expEVT_COMMAND_RIGHT_CLICK(  );
+int        expEVT_COMMAND_RIGHT_DCLICK(  );
+int        expEVT_COMMAND_SCROLLBAR_UPDATED(  );
+int        expEVT_COMMAND_SET_FOCUS(  );
+int        expEVT_COMMAND_SLIDER_UPDATED(  );
+int        expEVT_COMMAND_SPINCTRL_UPDATED(  );
+int        expEVT_COMMAND_SPLITTER_DOUBLECLICKED(  );
+int        expEVT_COMMAND_SPLITTER_SASH_POS_CHANGED(  );
+int        expEVT_COMMAND_SPLITTER_SASH_POS_CHANGING(  );
+int        expEVT_COMMAND_SPLITTER_UNSPLIT(  );
+int        expEVT_COMMAND_TAB_SEL_CHANGED(  );
+int        expEVT_COMMAND_TAB_SEL_CHANGING(  );
+int        expEVT_COMMAND_TEXT_ENTER(  );
+int        expEVT_COMMAND_TEXT_UPDATED(  );
+int        expEVT_COMMAND_TOGGLEBUTTON_CLICKED(  );
+int        expEVT_COMMAND_TOOL_CLICKED(  );
+int        expEVT_COMMAND_TOOL_ENTER(  );
+int        expEVT_COMMAND_TOOL_RCLICKED(  );
+int        expEVT_COMMAND_TREE_BEGIN_DRAG(  );
+int        expEVT_COMMAND_TREE_BEGIN_LABEL_EDIT(  );
+int        expEVT_COMMAND_TREE_BEGIN_RDRAG(  );
+int        expEVT_COMMAND_TREE_DELETE_ITEM(  );
+int        expEVT_COMMAND_TREE_END_DRAG(  );
+int        expEVT_COMMAND_TREE_END_LABEL_EDIT(  );
+int        expEVT_COMMAND_TREE_GET_INFO(  );
+int        expEVT_COMMAND_TREE_ITEM_ACTIVATED(  );
+int        expEVT_COMMAND_TREE_ITEM_COLLAPSED(  );
+int        expEVT_COMMAND_TREE_ITEM_COLLAPSING(  );
+int        expEVT_COMMAND_TREE_ITEM_EXPANDED(  );
+int        expEVT_COMMAND_TREE_ITEM_EXPANDING(  );
+int        expEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK(  );
+int        expEVT_COMMAND_TREE_ITEM_RIGHT_CLICK(  );
+int        expEVT_COMMAND_TREE_KEY_DOWN(  );
+int        expEVT_COMMAND_TREE_SEL_CHANGED(  );
+int        expEVT_COMMAND_TREE_SEL_CHANGING(  );
+int        expEVT_COMMAND_TREE_SET_INFO(  );
+int        expEVT_COMMAND_VLBOX_SELECTED(  );
+int        expEVT_COMPARE_ITEM(  );
+int        expEVT_CONTEXT_MENU(  );
+int        expEVT_CREATE(  );
+int        expEVT_DESTROY(  );
+int        expEVT_DETAILED_HELP(  );
+int        expEVT_DIALUP_CONNECTED(  );
+int        expEVT_DIALUP_DISCONNECTED(  );
+int        expEVT_DRAW_ITEM(  );
+int        expEVT_DROP_FILES(  );
+int        expEVT_DYNAMIC_SASH_SPLIT(  );
+int        expEVT_DYNAMIC_SASH_UNIFY(  );
+int        expEVT_END_PROCESS(  );
+int        expEVT_END_SESSION(  );
+int        expEVT_ENTER_WINDOW(  );
+int        expEVT_ERASE_BACKGROUND(  );
+int        expEVT_GRID_CELL_CHANGE(  );
+int        expEVT_GRID_CELL_LEFT_CLICK(  );
+int        expEVT_GRID_CELL_LEFT_DCLICK(  );
+int        expEVT_GRID_CELL_RIGHT_CLICK(  );
+int        expEVT_GRID_CELL_RIGHT_DCLICK(  );
+int        expEVT_GRID_COL_SIZE(  );
+int        expEVT_GRID_EDITOR_CREATED(  );
+int        expEVT_GRID_EDITOR_HIDDEN(  );
+int        expEVT_GRID_EDITOR_SHOWN(  );
+int        expEVT_GRID_LABEL_LEFT_CLICK(  );
+int        expEVT_GRID_LABEL_LEFT_DCLICK(  );
+int        expEVT_GRID_LABEL_RIGHT_CLICK(  );
+int        expEVT_GRID_LABEL_RIGHT_DCLICK(  );
+int        expEVT_GRID_RANGE_SELECT(  );
+int        expEVT_GRID_ROW_SIZE(  );
+int        expEVT_GRID_SELECT_CELL(  );
+int        expEVT_HELP(  );
+int        expEVT_ICONIZE(  );
+int        expEVT_IDLE(  );
+int        expEVT_INIT_DIALOG(  );
+int        expEVT_JOY_BUTTON_DOWN(  );
+int        expEVT_JOY_BUTTON_UP(  );
+int        expEVT_JOY_MOVE(  );
+int        expEVT_JOY_ZMOVE(  );
+int        expEVT_KEY_DOWN(  );
+int        expEVT_KEY_UP(  );
+int        expEVT_KILL_FOCUS(  );
+int        expEVT_LEAVE_WINDOW(  );
+int        expEVT_LEFT_DCLICK(  );
+int        expEVT_LEFT_DOWN(  );
+int        expEVT_LEFT_UP(  );
+int        expEVT_MAXIMIZE(  );
+int        expEVT_MEASURE_ITEM(  );
+int        expEVT_MENU_CHAR(  );
+int        expEVT_MENU_HIGHLIGHT(  );
+int        expEVT_MENU_INIT(  );
+int        expEVT_MIDDLE_DCLICK(  );
+int        expEVT_MIDDLE_DOWN(  );
+int        expEVT_MIDDLE_UP(  );
+int        expEVT_MOTION(  );
+int        expEVT_MOUSE_CAPTURE_CHANGED(  );
+int        expEVT_MOVE(  );
+int        expEVT_NAVIGATION_KEY(  );
+int        expEVT_NC_ENTER_WINDOW(  );
+int        expEVT_NC_LEAVE_WINDOW(  );
+int        expEVT_NC_LEFT_DCLICK(  );
+int        expEVT_NC_LEFT_DOWN(  );
+int        expEVT_NC_LEFT_UP(  );
+int        expEVT_NC_MIDDLE_DCLICK(  );
+int        expEVT_NC_MIDDLE_DOWN(  );
+int        expEVT_NC_MIDDLE_UP(  );
+int        expEVT_NC_MOTION(  );
+int        expEVT_NC_PAINT(  );
+int        expEVT_NC_RIGHT_DCLICK(  );
+int        expEVT_NC_RIGHT_DOWN(  );
+int        expEVT_NC_RIGHT_UP(  );
+int        expEVT_PAINT(  );
+int        expEVT_PAINT_ICON(  );
+int        expEVT_PALETTE_CHANGED(  );
+int        expEVT_PLOT_AREA_CREATE(  );
+int        expEVT_PLOT_AREA_SEL_CHANGED(  );
+int        expEVT_PLOT_AREA_SEL_CHANGING(  );
+int        expEVT_PLOT_AREA_SEL_CREATED(  );
+int        expEVT_PLOT_AREA_SEL_CREATING(  );
+int        expEVT_PLOT_BEGIN_TITLE_EDIT(  );
+int        expEVT_PLOT_BEGIN_X_LABEL_EDIT(  );
+int        expEVT_PLOT_BEGIN_Y_LABEL_EDIT(  );
+int        expEVT_PLOT_CLICKED(  );
+int        expEVT_PLOT_DOUBLECLICKED(  );
+int        expEVT_PLOT_END_TITLE_EDIT(  );
+int        expEVT_PLOT_END_X_LABEL_EDIT(  );
+int        expEVT_PLOT_END_Y_LABEL_EDIT(  );
+int        expEVT_PLOT_SEL_CHANGED(  );
+int        expEVT_PLOT_SEL_CHANGING(  );
+int        expEVT_PLOT_VALUE_SEL_CHANGED(  );
+int        expEVT_PLOT_VALUE_SEL_CHANGING(  );
+int        expEVT_PLOT_VALUE_SEL_CREATED(  );
+int        expEVT_PLOT_VALUE_SEL_CREATING(  );
+int        expEVT_PLOT_ZOOM_IN(  );
+int        expEVT_PLOT_ZOOM_OUT(  );
+int        expEVT_POPUP_MENU_INIT(  );
+int        expEVT_POWER(  );
+int        expEVT_POWER_SUSPENDING(  );
+int        expEVT_POWER_SUSPENDED(  );
+int        expEVT_POWER_SUSPEND_CANCEL(  );
+int        expEVT_POWER_RESUME(  );
+int        expEVT_QUERY_END_SESSION(  );
+int        expEVT_QUERY_NEW_PALETTE(  );
+int        expEVT_RIGHT_DCLICK(  );
+int        expEVT_RIGHT_DOWN(  );
+int        expEVT_RIGHT_UP(  );
+int        expEVT_SCROLLWIN_BOTTOM(  );
+int        expEVT_SCROLLWIN_LINEDOWN(  );
+int        expEVT_SCROLLWIN_LINEUP(  );
+int        expEVT_SCROLLWIN_PAGEDOWN(  );
+int        expEVT_SCROLLWIN_PAGEUP(  );
+int        expEVT_SCROLLWIN_THUMBRELEASE(  );
+int        expEVT_SCROLLWIN_THUMBTRACK(  );
+int        expEVT_SCROLLWIN_TOP(  );
+int        expEVT_SCROLL_BOTTOM(  );
+int        expEVT_SCROLL_LINEDOWN(  );
+int        expEVT_SCROLL_LINEUP(  );
+int        expEVT_SCROLL_PAGEDOWN(  );
+int        expEVT_SCROLL_PAGEUP(  );
+int        expEVT_SCROLL_THUMBRELEASE(  );
+int        expEVT_SCROLL_THUMBTRACK(  );
+int        expEVT_SCROLL_TOP(  );
+int        expEVT_SETTING_CHANGED(  );
+int        expEVT_SET_CURSOR(  );
+int        expEVT_SET_FOCUS(  );
+int        expEVT_SHOW(  );
+int        expEVT_SIZE(  );
+int        expEVT_SOCKET(  );
+int        expEVT_SYS_COLOUR_CHANGED(  );
+int        expEVT_TASKBAR_MOVE(  );
+int        expEVT_TASKBAR_LEFT_DOWN(  );
+int        expEVT_TASKBAR_LEFT_UP(  );
+int        expEVT_TASKBAR_RIGHT_DOWN(  );
+int        expEVT_TASKBAR_RIGHT_UP(  );
+int        expEVT_TASKBAR_LEFT_DCLICK(  );
+int        expEVT_TASKBAR_RIGHT_DCLICK(  );
+int        expEVT_TIMER(  );
+int        expEVT_UPDATE_UI(  );
+int        expEVT_USER_FIRST(  );
+int        expEVT_WIZARD_CANCEL(  );
+int        expEVT_WIZARD_PAGE_CHANGED(  );
+int        expEVT_WIZARD_PAGE_CHANGING(  );
+
+
+/* Misc. */
+int        ELJSysErrorCode(  );
+void*      ELJSysErrorMsg( int nErrCode );
+void       LogErrorMsg( TStringVoid _msg );
+void       LogFatalErrorMsg( TStringVoid _msg );
+void       LogMessageMsg( TStringVoid _msg );
+void       LogWarningMsg( TStringVoid _msg );
+TBool      Quantize( TClass(wxImage) src, TClass(wxImage) dest, int desiredNoColours, void* eightBitData, int flags );
+TBool      QuantizePalette( TClass(wxImage) src, TClass(wxImage) dest, void* pPalette, int desiredNoColours, void* eightBitData, int flags );
+void       wxCFree( void* _ptr );
+TClass(ELJLocale) wxGetELJLocale(  );
+void*      wxGetELJTranslation( TStringVoid sz );
+void       wxMutexGui_Enter(  );
+void       wxMutexGui_Leave(  );
+
+/* ELJApp */
+TClassDefExtend(ELJApp,wxApp)
+void       ELJApp_Bell(  );
+TClass(ELJLog) ELJApp_CreateLogTarget(  );
+void       ELJApp_Dispatch(  );
+void       ELJApp_DisplaySize( TSizeOutVoid(_w,_h) );
+void       ELJApp_EnableTooltips( TBool _enable );
+void       ELJApp_EnableTopLevelWindows( int _enb );
+int        ELJApp_ExecuteProcess( TStringVoid _cmd, int _snc, TClass(wxProcess) _prc );
+void       ELJApp_Exit(  );
+void       ELJApp_ExitMainLoop(  );
+void*      ELJApp_FindWindowById( int _id, TClass(wxWindow) _prt );
+TClass(wxWindow) ELJApp_FindWindowByLabel( TStringVoid _lbl, TClass(wxWindow) _prt );
+TClass(wxWindow) ELJApp_FindWindowByName( TStringVoid _lbl, TClass(wxWindow) _prt );
+TClass(wxApp) ELJApp_GetApp(  );
+TStringLen ELJApp_GetAppName( TStringOutVoid _buf );
+TStringLen ELJApp_GetClassName( TStringOutVoid _buf );
+int        ELJApp_GetExitOnFrameDelete(  );
+TStringLen ELJApp_GetOsDescription( TStringOutVoid _buf );
+int        ELJApp_GetOsVersion( void* _maj, void* _min );
+TClass(wxWindow) ELJApp_GetTopWindow(  );
+int        ELJApp_GetUseBestVisual(  );
+TStringLen ELJApp_GetUserHome( void* _usr, TStringOutVoid _buf );
+TStringLen ELJApp_GetUserId( TStringOutVoid _buf );
+TStringLen ELJApp_GetUserName( TStringOutVoid _buf );
+TStringLen ELJApp_GetVendorName( TStringOutVoid _buf );
+/* int        ELJApp_GetWantDebugOutput(  ); */
+void       ELJApp_InitAllImageHandlers(  );
+int        ELJApp_Initialized(  );
+int        ELJApp_MainLoop(  );
+void       ELJApp_MousePosition( TPointOutVoid(_x,_y) );
+int        ELJApp_Pending(  );
+int        ELJApp_SafeYield( TClass(wxWindow) _win );
+/* int        ELJApp_SendIdleEvents(  ); */
+/* int        ELJApp_SendIdleEventsToWindow( TClass(wxWindow) win ); */
+void       ELJApp_SetAppName( TString name );
+void       ELJApp_SetClassName( TString name );
+void       ELJApp_SetExitOnFrameDelete( int flag );
+void       ELJApp_SetPrintMode( int mode );
+void       ELJApp_SetTooltipDelay( int _ms );
+void       ELJApp_SetTopWindow( TClass(wxWindow) _wnd );
+void       ELJApp_SetUseBestVisual( int flag );
+void       ELJApp_SetVendorName( TString name );
+void       ELJApp_Sleep( int _scs );
+void       ELJApp_USleep( int _mscs );
+int        ELJApp_Yield(  );
+TBoolInt   ELJApp_IsTerminating(  );
+
+
+/* ELJArtProv */
+TClassDefExtend(ELJArtProv,wxArtProvider)
+TClass(ELJArtProv) ELJArtProv_Create( void* _obj, void* _clb );
+void       ELJArtProv_Release( TSelf(ELJArtProv) _obj );
+
+/* ELJClient */
+TClassDefExtend(ELJClient,wxClient)
+TClass(ELJClient) ELJClient_Create( void* _eobj, void* _cnct );
+void       ELJClient_Delete( TSelf(ELJClient) _obj );
+void       ELJClient_MakeConnection( TSelf(ELJClient) _obj, void* host, TClass(wxServer) server, void* topic );
+
+/* ELJCommand */
+TClassDefExtend(ELJCommand,wxCommand)
+TBool      ELJCommand_CanUndo( TSelf(ELJCommand) _obj );
+TClass(ELJCommand) ELJCommand_Create( int _und, void* _nme, void* _obj, void* _clb );
+void       ELJCommand_Delete( TSelf(ELJCommand) _obj );
+TStringLen ELJCommand_GetName( TSelf(ELJCommand) _obj, TStringOutVoid _buf );
+
+/* ELJConnection */
+TClassDefExtend(ELJConnection,wxConnection)
+int        ELJConnection_Advise( TSelf(ELJConnection) _obj, void* item, void* data, int size, int format );
+void       ELJConnection_Compress( TSelf(ELJConnection) _obj, int on );
+TClass(ELJConnection) ELJConnection_Create( void* _obj, void* buffer, int size );
+TClass(ELJConnection) ELJConnection_CreateDefault( TSelf(ELJConnection) _obj );
+void       ELJConnection_Delete( TSelf(ELJConnection) _obj );
+int        ELJConnection_Disconnect( TSelf(ELJConnection) _obj );
+int        ELJConnection_Execute( TSelf(ELJConnection) _obj, void* data, int size, int format );
+int        ELJConnection_Poke( TSelf(ELJConnection) _obj, void* item, void* data, int size, int format );
+void*      ELJConnection_Request( TSelf(ELJConnection) _obj, void* item, TClass(wxSize) size, int format );
+void       ELJConnection_SetOnAdvise( TSelf(ELJConnection) _obj, void* _fnc );
+void       ELJConnection_SetOnDisconnect( TSelf(ELJConnection) _obj, void* _fnc );
+void       ELJConnection_SetOnExecute( TSelf(ELJConnection) _obj, void* _fnc );
+void       ELJConnection_SetOnPoke( TSelf(ELJConnection) _obj, void* _fnc );
+void       ELJConnection_SetOnRequest( TSelf(ELJConnection) _obj, void* _fnc );
+void       ELJConnection_SetOnStartAdvise( TSelf(ELJConnection) _obj, void* _fnc );
+void       ELJConnection_SetOnStopAdvise( TSelf(ELJConnection) _obj, void* _fnc );
+int        ELJConnection_StartAdvise( TSelf(ELJConnection) _obj, void* item );
+int        ELJConnection_StopAdvise( TSelf(ELJConnection) _obj, void* item );
+
+/* ELJDragDataObject */
+TClassDef(ELJDragDataObject)
+TClass(ELJDragDataObject) ELJDragDataObject_Create( void* _obj, void* _fmt, void* _func1, void* _func2, void* _func3 );
+void       ELJDragDataObject_Delete( TSelf(ELJDragDataObject) _obj );
+
+/* ELJDropTarget */
+TClassDefExtend(ELJDropTarget,wxDropTarget)
+TClass(ELJDropTarget) ELJDropTarget_Create( void* _obj );
+void       ELJDropTarget_Delete( TSelf(ELJDropTarget) _obj );
+void       ELJDropTarget_SetOnData( TSelf(ELJDropTarget) _obj, void* _func );
+void       ELJDropTarget_SetOnDragOver( TSelf(ELJDropTarget) _obj, void* _func );
+void       ELJDropTarget_SetOnDrop( TSelf(ELJDropTarget) _obj, void* _func );
+void       ELJDropTarget_SetOnEnter( TSelf(ELJDropTarget) _obj, void* _func );
+void       ELJDropTarget_SetOnLeave( TSelf(ELJDropTarget) _obj, void* _func );
+
+/* ELJFileDropTarget */
+TClassDefExtend(ELJFileDropTarget,wxFileDropTarget)
+TClass(ELJFileDropTarget) ELJFileDropTarget_Create( void* _obj, void* _func );
+void       ELJFileDropTarget_Delete( TSelf(ELJFileDropTarget) _obj );
+void       ELJFileDropTarget_SetOnData( TSelf(ELJFileDropTarget) _obj, void* _func );
+void       ELJFileDropTarget_SetOnDragOver( TSelf(ELJFileDropTarget) _obj, void* _func );
+void       ELJFileDropTarget_SetOnDrop( TSelf(ELJFileDropTarget) _obj, void* _func );
+void       ELJFileDropTarget_SetOnEnter( TSelf(ELJFileDropTarget) _obj, void* _func );
+void       ELJFileDropTarget_SetOnLeave( TSelf(ELJFileDropTarget) _obj, void* _func );
+
+/* ELJGridTable */
+TClassDefExtend(ELJGridTable,wxGridTableBase)
+TClass(ELJGridTable) ELJGridTable_Create( void* _obj, void* _EifGetNumberRows, void* _EifGetNumberCols, void* _EifGetValue, void* _EifSetValue, void* _EifIsEmptyCell, void* _EifClear, void* _EifInsertRows, void* _EifAppendRows, void* _EifDeleteRows, void* _EifInsertCols, void* _EifAppendCols, void* _EifDeleteCols, void* _EifSetRowLabelValue, void* _EifSetColLabelValue, void* _EifGetRowLabelValue, void* _EifGetColLabelValue );
+void       ELJGridTable_Delete( TSelf(ELJGridTable) _obj );
+TClass(wxView) ELJGridTable_GetView( TSelf(ELJGridTable) _obj );
+void*      ELJGridTable_SendTableMessage( TSelf(ELJGridTable) _obj, int id, int val1, int val2 );
+
+/* ELJLocale */
+TClassDefExtend(ELJLocale,wxLocale)
+
+/* ELJLog */
+TClassDefExtend(ELJLog,wxLog)
+void       ELJLog_AddTraceMask( TSelf(ELJLog) _obj, TStringVoid str );
+TClass(ELJLog) ELJLog_Create( void* _obj, void* _fnc );
+void       ELJLog_Delete( TSelf(ELJLog) _obj );
+void       ELJLog_DontCreateOnDemand( TSelf(ELJLog) _obj );
+int        ELJLog_EnableLogging( TSelf(ELJLog) _obj, TBool doIt );
+void       ELJLog_Flush( TSelf(ELJLog) _obj );
+void       ELJLog_FlushActive( TSelf(ELJLog) _obj );
+void*      ELJLog_GetActiveTarget(  );
+void*      ELJLog_GetTimestamp( TSelf(ELJLog) _obj );
+int        ELJLog_GetTraceMask( TSelf(ELJLog) _obj );
+int        ELJLog_GetVerbose( TSelf(ELJLog) _obj );
+TBool      ELJLog_HasPendingMessages( TSelf(ELJLog) _obj );
+TBool      ELJLog_IsAllowedTraceMask( TSelf(ELJLog) _obj, TClass(wxMask) mask );
+TBool      ELJLog_IsEnabled( TSelf(ELJLog) _obj );
+void       ELJLog_OnLog( TSelf(ELJLog) _obj, int level, void* szString, int t );
+void       ELJLog_RemoveTraceMask( TSelf(ELJLog) _obj, TStringVoid str );
+void       ELJLog_Resume( TSelf(ELJLog) _obj );
+void*      ELJLog_SetActiveTarget( TSelf(ELJLog) pLogger );
+void       ELJLog_SetTimestamp( TSelf(ELJLog) _obj, void* ts );
+void       ELJLog_SetTraceMask( TSelf(ELJLog) _obj, int ulMask );
+void       ELJLog_SetVerbose( TSelf(ELJLog) _obj, int bVerbose );
+void       ELJLog_Suspend( TSelf(ELJLog) _obj );
+
+/* ELJMessageParameters */
+TClassDef(ELJMessageParameters)
+TClass(ELJMessageParameters) wxMessageParameters_Create( TStringVoid _file, TStringVoid _type, void* _object, void* _func );
+void       wxMessageParameters_Delete( TSelf(ELJMessageParameters) _obj );
+
+/* ELJPlotCurve */
+TClassDefExtend(ELJPlotCurve,wxPlotCurve)
+TClass(ELJPlotCurve) ELJPlotCurve_Create( void* _obj, void* _str, void* _end, void* _y, int offsetY, double startY, double endY );
+void       ELJPlotCurve_Delete( TSelf(ELJPlotCurve) _obj );
+double     ELJPlotCurve_GetEndY( TSelf(ELJPlotCurve) _obj );
+int        ELJPlotCurve_GetOffsetY( TSelf(ELJPlotCurve) _obj );
+double     ELJPlotCurve_GetStartY( TSelf(ELJPlotCurve) _obj );
+void       ELJPlotCurve_SetEndY( TSelf(ELJPlotCurve) _obj, double endY );
+void       ELJPlotCurve_SetOffsetY( TSelf(ELJPlotCurve) _obj, int offsetY );
+void       ELJPlotCurve_SetPenNormal( TSelf(ELJPlotCurve) _obj, TClass(wxPen) pen );
+void       ELJPlotCurve_SetPenSelected( TSelf(ELJPlotCurve) _obj, TClass(wxPen) pen );
+void       ELJPlotCurve_SetStartY( TSelf(ELJPlotCurve) _obj, double startY );
+
+/* ELJPreviewControlBar */
+TClassDefExtend(ELJPreviewControlBar,wxPreviewControlBar)
+TClass(ELJPreviewControlBar) ELJPreviewControlBar_Create( void* preview, int buttons, TClass(wxWindow) parent, void* title, TRect(x,y,w,h), int style );
+
+/* ELJPreviewFrame */
+TClassDefExtend(ELJPreviewFrame,wxPreviewFrame)
+TClass(ELJPreviewFrame) ELJPreviewFrame_Create( void* _obj, void* _init, void* _create_canvas, void* _create_toolbar, void* preview, TClass(wxWindow) parent, void* title, TRect(x,y,w,h), int style );
+void*      ELJPreviewFrame_GetControlBar( TSelf(ELJPreviewFrame) _obj );
+TClass(wxPreviewCanvas) ELJPreviewFrame_GetPreviewCanvas( TSelf(ELJPreviewFrame) _obj );
+TClass(wxPrintPreview) ELJPreviewFrame_GetPrintPreview( TSelf(ELJPreviewFrame) _obj );
+void       ELJPreviewFrame_Initialize( TSelf(ELJPreviewFrame) _obj );
+void       ELJPreviewFrame_SetControlBar( TSelf(ELJPreviewFrame) _obj, void* obj );
+void       ELJPreviewFrame_SetPreviewCanvas( TSelf(ELJPreviewFrame) _obj, TClass(wxPreviewCanvas) obj );
+void       ELJPreviewFrame_SetPrintPreview( TSelf(ELJPreviewFrame) _obj, TClass(wxPrintPreview) obj );
+
+/* ELJPrintout */
+/*
+TClassDefExtend(ELJPrintout,wxPrintout)
+TClass(ELJPrintout) ELJPrintout_Create( void* title, void* _obj, void* _DoOnBeginDocument, void* _DoOnEndDocument, void* _DoOnBeginPrinting, void* _DoOnEndPrinting, void* _DoOnPreparePrinting, void* _DoOnPrintPage, void* _DoOnHasPage, void* _DoOnPageInfo );
+void       ELJPrintout_Delete( TSelf(ELJPrintout) _obj );
+TClass(wxDC) ELJPrintout_GetDC( TSelf(ELJPrintout) _obj );
+void       ELJPrintout_GetPPIPrinter( TSelf(ELJPrintout) _obj, TPointOutVoid(_x,_y) );
+void       ELJPrintout_GetPPIScreen( TSelf(ELJPrintout) _obj, TPointOutVoid(_x,_y) );
+void       ELJPrintout_GetPageSizeMM( TSelf(ELJPrintout) _obj, TSizeOutVoid(_w,_h) );
+void       ELJPrintout_GetPageSizePixels( TSelf(ELJPrintout) _obj, TSizeOutVoid(_w,_h) );
+TStringLen ELJPrintout_GetTitle( TSelf(ELJPrintout) _obj, TStringOutVoid _buf );
+TBool      ELJPrintout_IsPreview( TSelf(ELJPrintout) _obj );
+void       ELJPrintout_SetDC( TSelf(ELJPrintout) _obj, TClass(wxDC) dc );
+void       ELJPrintout_SetIsPreview( TSelf(ELJPrintout) _obj, int p );
+void       ELJPrintout_SetPPIPrinter( TSelf(ELJPrintout) _obj, TPoint(x,y) );
+void       ELJPrintout_SetPPIScreen( TSelf(ELJPrintout) _obj, TPoint(x,y) );
+void       ELJPrintout_SetPageSizeMM( TSelf(ELJPrintout) _obj, TSize(w,h) );
+void       ELJPrintout_SetPageSizePixels( TSelf(ELJPrintout) _obj, TSize(w,h) );
+*/
+
+/* ELJServer */
+TClassDefExtend(ELJServer,wxServer)
+TClass(ELJServer) ELJServer_Create( void* _eobj, void* _cnct );
+void       ELJServer_Delete( TSelf(ELJServer) _obj );
+int        ELJServer_Initialize( TSelf(ELJServer) _obj, TStringVoid name );
+
+/* ELJTextDropTarget */
+TClassDefExtend(ELJTextDropTarget,wxTextDropTarget)
+TClass(ELJTextDropTarget) ELJTextDropTarget_Create( void* _obj, void* _func );
+void       ELJTextDropTarget_Delete( TSelf(ELJTextDropTarget) _obj );
+void       ELJTextDropTarget_SetOnData( TSelf(ELJTextDropTarget) _obj, void* _func );
+void       ELJTextDropTarget_SetOnDragOver( TSelf(ELJTextDropTarget) _obj, void* _func );
+void       ELJTextDropTarget_SetOnDrop( TSelf(ELJTextDropTarget) _obj, void* _func );
+void       ELJTextDropTarget_SetOnEnter( TSelf(ELJTextDropTarget) _obj, void* _func );
+void       ELJTextDropTarget_SetOnLeave( TSelf(ELJTextDropTarget) _obj, void* _func );
+
+/* ELJTextValidator */
+TClassDefExtend(ELJTextValidator,wxTextValidator)
+TClass(ELJTextValidator) ELJTextValidator_Create( void* _obj, void* _fnc, TStringVoid _txt, int _stl );
+
+/* cbAntiflickerPlugin */
+TClassDefExtend(cbAntiflickerPlugin,cbPluginBase)
+TClass(cbAntiflickerPlugin) cbAntiflickerPlugin_Create( void* pPanel, int paneMask );
+TClass(cbAntiflickerPlugin) cbAntiflickerPlugin_CreateDefault(  );
+void       cbAntiflickerPlugin_Delete( TSelf(cbAntiflickerPlugin) _obj );
+
+/* cbBarDragPlugin */
+TClassDefExtend(cbBarDragPlugin,cbPluginBase)
+TClass(cbBarDragPlugin) cbBarDragPlugin_Create( void* pPanel, int paneMask );
+TClass(cbBarDragPlugin) cbBarDragPlugin_CreateDefault(  );
+void       cbBarDragPlugin_Delete( TSelf(cbBarDragPlugin) _obj );
+
+/* cbBarHintsPlugin */
+TClassDefExtend(cbBarHintsPlugin,cbPluginBase)
+TClass(cbBarHintsPlugin) cbBarHintsPlugin_Create( void* pPanel, int paneMask );
+TClass(cbBarHintsPlugin) cbBarHintsPlugin_CreateDefault(  );
+void       cbBarHintsPlugin_Delete( TSelf(cbBarHintsPlugin) _obj );
+void       cbBarHintsPlugin_SetGrooveCount( TSelf(cbBarHintsPlugin) _obj, int nGrooves );
+
+/* cbBarInfo */
+TClassDefExtend(cbBarInfo,wxObject)
+TClass(cbBarInfo) cbBarInfo_Create(  );
+void       cbBarInfo_Delete( TSelf(cbBarInfo) _obj );
+TBool      cbBarInfo_IsExpanded( TSelf(cbBarInfo) _obj );
+TBool      cbBarInfo_IsFixed( TSelf(cbBarInfo) _obj );
+
+/* cbBarSpy */
+TClassDefExtend(cbBarSpy,wxEvtHandler)
+TClass(cbBarSpy) cbBarSpy_Create( void* pPanel );
+TClass(cbBarSpy) cbBarSpy_CreateDefault(  );
+void       cbBarSpy_Delete( TSelf(cbBarSpy) _obj );
+int        cbBarSpy_ProcessEvent( TSelf(cbBarSpy) _obj, TClass(wxEvent) event );
+void       cbBarSpy_SetBarWindow( TSelf(cbBarSpy) _obj, void* pWnd );
+
+/* cbCloseBox */
+TClassDefExtend(cbCloseBox,cbMiniButton)
+TClass(cbCloseBox) cbCloseBox_Create(  );
+
+/* cbCollapseBox */
+TClassDefExtend(cbCollapseBox,cbMiniButton)
+TClass(cbCollapseBox) cbCollapseBox_Create(  );
+
+/* cbCommonPaneProperties */
+TClassDefExtend(cbCommonPaneProperties,wxObject)
+void       cbCommonPaneProperties_Assign( TSelf(cbCommonPaneProperties) _obj, void* _other );
+int        cbCommonPaneProperties_BarCollapseIconsOn( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_BarDragHintsOn( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_BarFloatingOn( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_ColProportionsOn( TSelf(cbCommonPaneProperties) _obj );
+TClass(cbCommonPaneProperties) cbCommonPaneProperties_CreateDefault(  );
+void       cbCommonPaneProperties_Delete( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_ExactDockPredictionOn( TSelf(cbCommonPaneProperties) _obj );
+void       cbCommonPaneProperties_MinCBarDim( TSelf(cbCommonPaneProperties) _obj, TSizeOutVoid(_w,_h) );
+int        cbCommonPaneProperties_NonDestructFrictionOn( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_OutOfPaneDragOn( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_RealTimeUpdatesOn( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_ResizeHandleSize( TSelf(cbCommonPaneProperties) _obj );
+int        cbCommonPaneProperties_RowProportionsOn( TSelf(cbCommonPaneProperties) _obj );
+void       cbCommonPaneProperties_SetBarCollapseIconsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetBarDragHintsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetBarFloatingOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetColProportionsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetExactDockPredictionOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetMinCBarDim( TSelf(cbCommonPaneProperties) _obj, TSize(_w,_h) );
+void       cbCommonPaneProperties_SetNonDestructFrictionOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetOutOfPaneDragOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetRealTimeUpdatesOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetResizeHandleSize( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetRowProportionsOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+void       cbCommonPaneProperties_SetShow3DPaneBorderOn( TSelf(cbCommonPaneProperties) _obj, int _val );
+int        cbCommonPaneProperties_Show3DPaneBorderOn( TSelf(cbCommonPaneProperties) _obj );
+
+/* cbCustomizeBarEvent */
+TClassDefExtend(cbCustomizeBarEvent,cbPluginEvent)
+void*      cbCustomizeBarEvent_Bar( TSelf(cbCustomizeBarEvent) _obj );
+void       cbCustomizeBarEvent_ClickPos( TSelf(cbCustomizeBarEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbCustomizeLayoutEvent */
+TClassDefExtend(cbCustomizeLayoutEvent,cbPluginEvent)
+void       cbCustomizeLayoutEvent_ClickPos( TSelf(cbCustomizeLayoutEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbDimHandlerBase */
+TClassDefExtend(cbDimHandlerBase,wxObject)
+
+/* cbDimInfo */
+TClassDefExtend(cbDimInfo,wxObject)
+void       cbDimInfo_Assign( TSelf(cbDimInfo) _obj, void* other );
+TClass(cbDimInfo) cbDimInfo_Create( TPoint(x,y), TBool isFixed, int gap, void* pDimHandler );
+TClass(cbDimInfo) cbDimInfo_CreateDefault(  );
+void*      cbDimInfo_CreateWithHandler( TSelf(cbDimInfo) pDimHandler, TBool isFixed );
+void*      cbDimInfo_CreateWithInfo( int dh_x, int dh_y, int dv_x, int dv_y, int f_x, int f_y, TBool isFixed, int horizGap, int vertGap, void* pDimHandler );
+void       cbDimInfo_Delete( TSelf(cbDimInfo) _obj );
+void*      cbDimInfo_GetDimHandler( TSelf(cbDimInfo) _obj );
+
+/* cbDockBox */
+TClassDefExtend(cbDockBox,cbMiniButton)
+TClass(cbDockBox) cbDockBox_Create(  );
+
+/* cbDockPane */
+TClassDefExtend(cbDockPane,wxObject)
+int        cbDockPane_BarPresent( TSelf(cbDockPane) _obj, void* pBar );
+TClass(cbDockPane) cbDockPane_Create( int alignment, void* pPanel );
+TClass(cbDockPane) cbDockPane_CreateDefault(  );
+void       cbDockPane_Delete( TSelf(cbDockPane) _obj );
+int        cbDockPane_GetAlignment( TSelf(cbDockPane) _obj );
+void*      cbDockPane_GetBarInfoByWindow( TSelf(cbDockPane) _obj, void* pBarWnd );
+void       cbDockPane_GetBarResizeRange( TSelf(cbDockPane) _obj, void* pBar, void* from, void* till, int forLeftHandle );
+int        cbDockPane_GetDockingState( TSelf(cbDockPane) _obj );
+void*      cbDockPane_GetFirstRow( TSelf(cbDockPane) _obj );
+int        cbDockPane_GetPaneHeight( TSelf(cbDockPane) _obj );
+void       cbDockPane_GetRealRect( TSelf(cbDockPane) _obj, TRectOutVoid(_x,_y,_w,_h) );
+int        cbDockPane_GetRowList( TSelf(cbDockPane) _obj, void* _ref );
+void       cbDockPane_GetRowResizeRange( TSelf(cbDockPane) _obj, void* pRow, void* from, void* till, int forUpperHandle );
+int        cbDockPane_HitTestPaneItems( TSelf(cbDockPane) _obj, TPoint(x,y), void* ppRow, void* ppBar );
+void       cbDockPane_InsertBarByCoord( TSelf(cbDockPane) _obj, void* pBar, TRect(x,y,w,h) );
+void       cbDockPane_InsertBarByInfo( TSelf(cbDockPane) _obj, void* pBarInfo );
+void       cbDockPane_InsertBarToRow( TSelf(cbDockPane) _obj, void* pBar, void* pIntoRow );
+void       cbDockPane_InsertRow( TSelf(cbDockPane) _obj, void* pRow, void* pBeforeRow );
+TBool      cbDockPane_IsHorizontal( TSelf(cbDockPane) _obj );
+int        cbDockPane_MatchesMask( TSelf(cbDockPane) _obj, int paneMask );
+void       cbDockPane_RemoveBar( TSelf(cbDockPane) _obj, void* pBar );
+void       cbDockPane_RemoveRow( TSelf(cbDockPane) _obj, void* pRow );
+void       cbDockPane_SetBoundsInParent( TSelf(cbDockPane) _obj, TRect(x,y,w,h));
+void       cbDockPane_SetMargins( TSelf(cbDockPane) _obj, int top, int bottom, int left, int right );
+void       cbDockPane_SetPaneWidth( TSelf(cbDockPane) _obj, int width );
+
+/* cbDrawBarDecorEvent */
+TClassDefExtend(cbDrawBarDecorEvent,cbPluginEvent)
+void*      cbDrawBarDecorEvent_Bar( TSelf(cbDrawBarDecorEvent) _obj );
+void       cbDrawBarDecorEvent_BoundsInParent( TSelf(cbDrawBarDecorEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
+void*      cbDrawBarDecorEvent_Dc( TSelf(cbDrawBarDecorEvent) _obj );
+
+/* cbDrawBarHandlesEvent */
+TClassDefExtend(cbDrawBarHandlesEvent,cbPluginEvent)
+void*      cbDrawBarHandlesEvent_Bar( TSelf(cbDrawBarHandlesEvent) _obj );
+void*      cbDrawBarHandlesEvent_Dc( TSelf(cbDrawBarHandlesEvent) _obj );
+
+/* cbDrawHintRectEvent */
+TClassDefExtend(cbDrawHintRectEvent,cbPluginEvent)
+int        cbDrawHintRectEvent_EraseRect( TSelf(cbDrawHintRectEvent) _obj );
+TBool      cbDrawHintRectEvent_IsInClient( TSelf(cbDrawHintRectEvent) _obj );
+int        cbDrawHintRectEvent_LastTime( TSelf(cbDrawHintRectEvent) _obj );
+void       cbDrawHintRectEvent_Rect( TSelf(cbDrawHintRectEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
+
+/* cbDrawPaneBkGroundEvent */
+TClassDefExtend(cbDrawPaneBkGroundEvent,cbPluginEvent)
+void*      cbDrawPaneBkGroundEvent_Dc( TSelf(cbDrawPaneBkGroundEvent) _obj );
+
+/* cbDrawPaneDecorEvent */
+TClassDefExtend(cbDrawPaneDecorEvent,cbPluginEvent)
+void*      cbDrawPaneDecorEvent_Dc( TSelf(cbDrawPaneDecorEvent) _obj );
+
+/* cbDrawRowBkGroundEvent */
+TClassDefExtend(cbDrawRowBkGroundEvent,cbPluginEvent)
+void*      cbDrawRowBkGroundEvent_Dc( TSelf(cbDrawRowBkGroundEvent) _obj );
+void*      cbDrawRowBkGroundEvent_Row( TSelf(cbDrawRowBkGroundEvent) _obj );
+
+/* cbDrawRowDecorEvent */
+TClassDefExtend(cbDrawRowDecorEvent,cbPluginEvent)
+void*      cbDrawRowDecorEvent_Dc( TSelf(cbDrawRowDecorEvent) _obj );
+void*      cbDrawRowDecorEvent_Row( TSelf(cbDrawRowDecorEvent) _obj );
+
+/* cbDrawRowHandlesEvent */
+TClassDefExtend(cbDrawRowHandlesEvent,cbPluginEvent)
+void*      cbDrawRowHandlesEvent_Dc( TSelf(cbDrawRowHandlesEvent) _obj );
+void*      cbDrawRowHandlesEvent_Row( TSelf(cbDrawRowHandlesEvent) _obj );
+
+/* cbDynToolBarDimHandler */
+TClassDefExtend(cbDynToolBarDimHandler,cbDimHandlerBase)
+TClass(cbDynToolBarDimHandler) cbDynToolBarDimHandler_Create(  );
+void       cbDynToolBarDimHandler_Delete( TSelf(cbDynToolBarDimHandler) _obj );
+
+/* cbFinishDrawInAreaEvent */
+TClassDefExtend(cbFinishDrawInAreaEvent,cbPluginEvent)
+void       cbFinishDrawInAreaEvent_Area( TSelf(cbFinishDrawInAreaEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
+
+/* cbFloatedBarWindow */
+TClassDefExtend(cbFloatedBarWindow,wxToolWindow)
+TClass(cbFloatedBarWindow) cbFloatedBarWindow_Create( void* _obj );
+void*      cbFloatedBarWindow_GetBar( TSelf(cbFloatedBarWindow) _obj );
+void       cbFloatedBarWindow_PositionFloatedWnd( TSelf(cbFloatedBarWindow) _obj, TRect(_x,_y,_w,_h) );
+void       cbFloatedBarWindow_SetBar( TSelf(cbFloatedBarWindow) _obj, void* _bar );
+void       cbFloatedBarWindow_SetLayout( TSelf(cbFloatedBarWindow) _obj, void* _layout );
+
+/* cbGCUpdatesMgr */
+TClassDefExtend(cbGCUpdatesMgr,cbSimpleUpdatesMgr)
+TClass(cbGCUpdatesMgr) cbGCUpdatesMgr_Create( void* pPanel );
+TClass(cbGCUpdatesMgr) cbGCUpdatesMgr_CreateDefault(  );
+void       cbGCUpdatesMgr_Delete( TSelf(cbGCUpdatesMgr) _obj );
+void       cbGCUpdatesMgr_UpdateNow( TSelf(cbGCUpdatesMgr) _obj );
+
+/* cbHintAnimationPlugin */
+TClassDefExtend(cbHintAnimationPlugin,cbPluginBase)
+TClass(cbHintAnimationPlugin) cbHintAnimationPlugin_Create( void* pPanel, int paneMask );
+TClass(cbHintAnimationPlugin) cbHintAnimationPlugin_CreateDefault(  );
+void       cbHintAnimationPlugin_Delete( TSelf(cbHintAnimationPlugin) _obj );
+
+/* cbInsertBarEvent */
+TClassDefExtend(cbInsertBarEvent,cbPluginEvent)
+void*      cbInsertBarEvent_Bar( TSelf(cbInsertBarEvent) _obj );
+void*      cbInsertBarEvent_Row( TSelf(cbInsertBarEvent) _obj );
+
+/* cbLayoutRowEvent */
+TClassDefExtend(cbLayoutRowEvent,cbPluginEvent)
+void*      cbLayoutRowEvent_Row( TSelf(cbLayoutRowEvent) _obj );
+
+/* cbLeftDClickEvent */
+TClassDefExtend(cbLeftDClickEvent,cbPluginEvent)
+void       cbLeftDClickEvent_Pos( TSelf(cbLeftDClickEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbLeftDownEvent */
+TClassDefExtend(cbLeftDownEvent,cbPluginEvent)
+void       cbLeftDownEvent_Pos( TSelf(cbLeftDownEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbLeftUpEvent */
+TClassDefExtend(cbLeftUpEvent,cbPluginEvent)
+void       cbLeftUpEvent_Pos( TSelf(cbLeftUpEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbMiniButton */
+TClassDefExtend(cbMiniButton,wxObject)
+TClass(cbMiniButton) cbMiniButton_Create(  );
+void       cbMiniButton_Delete( TSelf(cbMiniButton) _obj );
+void       cbMiniButton_Dim( TSelf(cbMiniButton) _obj, TSizeOutVoid(_w,_h) );
+int        cbMiniButton_DragStarted( TSelf(cbMiniButton) _obj );
+void       cbMiniButton_Enable( TSelf(cbMiniButton) _obj, TBool enable );
+int        cbMiniButton_Enabled( TSelf(cbMiniButton) _obj );
+int        cbMiniButton_HitTest( TSelf(cbMiniButton) _obj, TPoint(x,y) );
+TBool      cbMiniButton_IsPressed( TSelf(cbMiniButton) _obj );
+void*      cbMiniButton_Layout( TSelf(cbMiniButton) _obj );
+void*      cbMiniButton_Pane( TSelf(cbMiniButton) _obj );
+void*      cbMiniButton_Plugin( TSelf(cbMiniButton) _obj );
+void       cbMiniButton_Pos( TSelf(cbMiniButton) _obj, TPointOutVoid(_x,_y) );
+int        cbMiniButton_Pressed( TSelf(cbMiniButton) _obj );
+void       cbMiniButton_Refresh( TSelf(cbMiniButton) _obj );
+void       cbMiniButton_Reset( TSelf(cbMiniButton) _obj );
+void       cbMiniButton_SetPos( TSelf(cbMiniButton) _obj, TPoint(x,y) );
+int        cbMiniButton_Visible( TSelf(cbMiniButton) _obj );
+int        cbMiniButton_WasClicked( TSelf(cbMiniButton) _obj );
+void*      cbMiniButton_Wnd( TSelf(cbMiniButton) _obj );
+
+/* cbMotionEvent */
+TClassDefExtend(cbMotionEvent,cbPluginEvent)
+void       cbMotionEvent_Pos( TSelf(cbMotionEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbPaneDrawPlugin */
+TClassDefExtend(cbPaneDrawPlugin,cbPluginBase)
+TClass(cbPaneDrawPlugin) cbPaneDrawPlugin_Create( void* pPanel, int paneMask );
+TClass(cbPaneDrawPlugin) cbPaneDrawPlugin_CreateDefault(  );
+void       cbPaneDrawPlugin_Delete( TSelf(cbPaneDrawPlugin) _obj );
+
+/* cbPluginBase */
+TClassDefExtend(cbPluginBase,wxEvtHandler)
+void       cbPluginBase_Delete( TSelf(cbPluginBase) _obj );
+int        cbPluginBase_GetPaneMask( TSelf(cbPluginBase) _obj );
+TBool      cbPluginBase_IsReady( TSelf(cbPluginBase) _obj );
+void*      cbPluginBase_Plugin( int _swt );
+int        cbPluginBase_ProcessEvent( TSelf(cbPluginBase) _obj, TClass(wxEvent) event );
+
+/* cbPluginEvent */
+TClassDefExtend(cbPluginEvent,wxEvent)
+void*      cbPluginEvent_Pane( TSelf(cbPluginEvent) _obj );
+
+/* cbRemoveBarEvent */
+TClassDefExtend(cbRemoveBarEvent,cbPluginEvent)
+void*      cbRemoveBarEvent_Bar( TSelf(cbRemoveBarEvent) _obj );
+
+/* cbResizeBarEvent */
+TClassDefExtend(cbResizeBarEvent,cbPluginEvent)
+void*      cbResizeBarEvent_Bar( TSelf(cbResizeBarEvent) _obj );
+void*      cbResizeBarEvent_Row( TSelf(cbResizeBarEvent) _obj );
+
+/* cbResizeRowEvent */
+TClassDefExtend(cbResizeRowEvent,cbPluginEvent)
+int        cbResizeRowEvent_ForUpperHandle( TSelf(cbResizeRowEvent) _obj );
+int        cbResizeRowEvent_HandleOfs( TSelf(cbResizeRowEvent) _obj );
+void*      cbResizeRowEvent_Row( TSelf(cbResizeRowEvent) _obj );
+
+/* cbRightDownEvent */
+TClassDefExtend(cbRightDownEvent,cbPluginEvent)
+void       cbRightDownEvent_Pos( TSelf(cbRightDownEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbRightUpEvent */
+TClassDefExtend(cbRightUpEvent,cbPluginEvent)
+void       cbRightUpEvent_Pos( TSelf(cbRightUpEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbRowDragPlugin */
+TClassDefExtend(cbRowDragPlugin,cbPluginBase)
+TClass(cbRowDragPlugin) cbRowDragPlugin_Create( void* pPanel, int paneMask );
+TClass(cbRowDragPlugin) cbRowDragPlugin_CreateDefault(  );
+void       cbRowDragPlugin_Delete( TSelf(cbRowDragPlugin) _obj );
+
+/* cbRowInfo */
+TClassDefExtend(cbRowInfo,wxObject)
+TClass(cbRowInfo) cbRowInfo_Create(  );
+void       cbRowInfo_Delete( TSelf(cbRowInfo) _obj );
+void*      cbRowInfo_GetFirstBar( TSelf(cbRowInfo) _obj );
+
+/* cbRowLayoutPlugin */
+TClassDefExtend(cbRowLayoutPlugin,cbPluginBase)
+TClass(cbRowLayoutPlugin) cbRowLayoutPlugin_Create( void* pPanel, int paneMask );
+TClass(cbRowLayoutPlugin) cbRowLayoutPlugin_CreateDefault(  );
+void       cbRowLayoutPlugin_Delete( TSelf(cbRowLayoutPlugin) _obj );
+
+/* cbSimpleCustomizationPlugin */
+TClassDefExtend(cbSimpleCustomizationPlugin,cbPluginBase)
+TClass(cbSimpleCustomizationPlugin) cbSimpleCustomizationPlugin_Create( void* pPanel, int paneMask );
+TClass(cbSimpleCustomizationPlugin) cbSimpleCustomizationPlugin_CreateDefault(  );
+void       cbSimpleCustomizationPlugin_Delete( TSelf(cbSimpleCustomizationPlugin) _obj );
+
+/* cbSimpleUpdatesMgr */
+TClassDefExtend(cbSimpleUpdatesMgr,cbUpdatesManagerBase)
+
+/* cbSizeBarWndEvent */
+TClassDefExtend(cbSizeBarWndEvent,cbPluginEvent)
+void*      cbSizeBarWndEvent_Bar( TSelf(cbSizeBarWndEvent) _obj );
+void       cbSizeBarWndEvent_BoundsInParent( TSelf(cbSizeBarWndEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
+
+/* cbStartBarDraggingEvent */
+TClassDefExtend(cbStartBarDraggingEvent,cbPluginEvent)
+void*      cbStartBarDraggingEvent_Bar( TSelf(cbStartBarDraggingEvent) _obj );
+void       cbStartBarDraggingEvent_Pos( TSelf(cbStartBarDraggingEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* cbStartDrawInAreaEvent */
+TClassDefExtend(cbStartDrawInAreaEvent,cbPluginEvent)
+void       cbStartDrawInAreaEvent_Area( TSelf(cbStartDrawInAreaEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
+
+/* cbUpdatesManagerBase */
+TClassDefExtend(cbUpdatesManagerBase,wxObject)
+
+/* wxAcceleratorEntry */
+TClassDef(wxAcceleratorEntry)
+TClass(wxAcceleratorEntry) wxAcceleratorEntry_Create( int flags, int keyCode, int cmd );
+void       wxAcceleratorEntry_Delete( TSelf(wxAcceleratorEntry) _obj );
+int        wxAcceleratorEntry_GetCommand( TSelf(wxAcceleratorEntry) _obj );
+int        wxAcceleratorEntry_GetFlags( TSelf(wxAcceleratorEntry) _obj );
+int        wxAcceleratorEntry_GetKeyCode( TSelf(wxAcceleratorEntry) _obj );
+void       wxAcceleratorEntry_Set( TSelf(wxAcceleratorEntry) _obj, int flags, int keyCode, int cmd );
+
+/* wxAcceleratorTable */
+TClassDef(wxAcceleratorTable)
+TClass(wxAcceleratorTable) wxAcceleratorTable_Create( int n, void* entries );
+void       wxAcceleratorTable_Delete( TSelf(wxAcceleratorTable) _obj );
+
+/* wxActivateEvent */
+TClassDefExtend(wxActivateEvent,wxEvent)
+void       wxActivateEvent_CopyObject( TSelf(wxActivateEvent) _obj, void* obj );
+int        wxActivateEvent_GetActive( TSelf(wxActivateEvent) _obj );
+
+/* wxApp */
+TClassDefExtend(wxApp,wxEvtHandler)
+
+/* wxArray */
+TClassDef(wxArray)
+
+/* wxArrayString */
+TClassDefExtend(wxArrayString,wxArray)
+
+/* wxArtProvider */
+TClassDefExtend(wxArtProvider,wxObject)
+int        PopProvider(  );
+void       PushProvider( TClass(wxArtProvider) provider );
+TBool      RemoveProvider( TClass(wxArtProvider) provider );
+
+/* wxAutomationObject */
+TClassDefExtend(wxAutomationObject,wxObject)
+
+/* wxBitmap */
+TClassDefExtend(wxBitmap,wxGDIObject)
+void       wxBitmap_AddHandler( TClass(wxEvtHandler) handler );
+void       wxBitmap_CleanUpHandlers(  );
+TClass(wxBitmap) wxBitmap_Create( void* _data, int _type, TSize(_width,_height), int _depth );
+TClass(wxBitmap) wxBitmap_CreateDefault(  );
+TClass(wxBitmap) wxBitmap_CreateEmpty( TSize(_width,_height), int _depth );
+TClass(wxBitmap) wxBitmap_CreateFromXPM( TSelf(wxBitmap) data );
+TClass(wxBitmap) wxBitmap_CreateLoad( TStringVoid name, int type );
+void       wxBitmap_Delete( TSelf(wxBitmap) _obj );
+void*      wxBitmap_FindHandlerByExtension( TSelf(wxBitmap) extension, int type );
+void*      wxBitmap_FindHandlerByName( TStringVoid name );
+void*      wxBitmap_FindHandlerByType( int type );
+int        wxBitmap_GetDepth( TSelf(wxBitmap) _obj );
+int        wxBitmap_GetHeight( TSelf(wxBitmap) _obj );
+TClass(wxMask) wxBitmap_GetMask( TSelf(wxBitmap) _obj );
+void       wxBitmap_GetSubBitmap( TSelf(wxBitmap) _obj, TRect(x,y,w,h), TClassRef(wxBitmap) _ref );
+int        wxBitmap_GetWidth( TSelf(wxBitmap) _obj );
+void       wxBitmap_InitStandardHandlers(  );
+void       wxBitmap_InsertHandler( TClass(wxEvtHandler) handler );
+int        wxBitmap_LoadFile( TSelf(wxBitmap) _obj, TStringVoid name, int type );
+TBool      wxBitmap_Ok( TSelf(wxBitmap) _obj );
+int        wxBitmap_RemoveHandler( TStringVoid name );
+int        wxBitmap_SaveFile( TSelf(wxBitmap) _obj, TStringVoid name, int type, TClass(wxPalette) cmap );
+void       wxBitmap_SetDepth( TSelf(wxBitmap) _obj, int d );
+void       wxBitmap_SetHeight( TSelf(wxBitmap) _obj, int h );
+void       wxBitmap_SetMask( TSelf(wxBitmap) _obj, TClass(wxMask) mask );
+void       wxBitmap_SetWidth( TSelf(wxBitmap) _obj, int w );
+
+/* wxBitmapButton */
+TClassDefExtend(wxBitmapButton,wxButton)
+TClass(wxBitmapButton) wxBitmapButton_Create( TClass(wxWindow) _prt, int _id, TClass(wxBitmap) _bmp, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxBitmapButton_GetBitmapDisabled( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
+void       wxBitmapButton_GetBitmapFocus( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
+void       wxBitmapButton_GetBitmapLabel( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
+void       wxBitmapButton_GetBitmapSelected( TSelf(wxBitmapButton) _obj, TClassRef(wxBitmap) _ref );
+int        wxBitmapButton_GetMarginX( TSelf(wxBitmapButton) _obj );
+int        wxBitmapButton_GetMarginY( TSelf(wxBitmapButton) _obj );
+void       wxBitmapButton_SetBitmapDisabled( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) disabled );
+void       wxBitmapButton_SetBitmapFocus( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) focus );
+void       wxBitmapButton_SetBitmapLabel( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) bitmap );
+void       wxBitmapButton_SetBitmapSelected( TSelf(wxBitmapButton) _obj, TClass(wxBitmap) sel );
+void       wxBitmapButton_SetMargins( TSelf(wxBitmapButton) _obj, TPoint(x,y) );
+
+/* wxBitmapDataObject */
+TClassDefExtend(wxBitmapDataObject,wxDataObjectSimple)
+TClass(wxBitmapDataObject) BitmapDataObject_Create( TClass(wxBitmap) _bmp );
+TClass(wxBitmapDataObject) BitmapDataObject_CreateEmpty(  );
+void       BitmapDataObject_Delete( TSelf(wxBitmapDataObject) _obj );
+void       BitmapDataObject_GetBitmap( TSelf(wxBitmapDataObject) _obj, TClassRef(wxBitmap) _bmp );
+void       BitmapDataObject_SetBitmap( TSelf(wxBitmapDataObject) _obj, TClass(wxBitmap) _bmp );
+
+/* wxBitmapHandler */
+TClassDefExtend(wxBitmapHandler,wxObject)
+
+/* wxBoxSizer */
+TClassDefExtend(wxBoxSizer,wxSizer)
+void       wxBoxSizer_CalcMin( TSelf(wxBoxSizer) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxBoxSizer) wxBoxSizer_Create( int orient );
+int        wxBoxSizer_GetOrientation( TSelf(wxBoxSizer) _obj );
+void       wxBoxSizer_RecalcSizes( TSelf(wxBoxSizer) _obj );
+
+/* wxBrush */
+TClassDefExtend(wxBrush,wxGDIObject)
+void       wxBrush_Assign( TSelf(wxBrush) _obj, TClass(wxBrush) brush );
+TClass(wxBrush) wxBrush_CreateDefault(  );
+TClass(wxBrush) wxBrush_CreateFromBitmap( TClass(wxBitmap) bitmap );
+TClass(wxBrush) wxBrush_CreateFromColour( TClass(wxColour) col, int style );
+TClass(wxBrush) wxBrush_CreateFromStock( int id );
+void       wxBrush_Delete( TSelf(wxBrush) _obj );
+void       wxBrush_GetColour( TSelf(wxBrush) _obj, TClassRef(wxColour) _ref );
+void       wxBrush_GetStipple( TSelf(wxBrush) _obj, TClassRef(wxBitmap) _ref );
+int        wxBrush_GetStyle( TSelf(wxBrush) _obj );
+TBool      wxBrush_IsEqual( TSelf(wxBrush) _obj, TClass(wxBrush) brush );
+TBool      wxBrush_Ok( TSelf(wxBrush) _obj );
+void       wxBrush_SetColour( TSelf(wxBrush) _obj, TClass(wxColour) col );
+void       wxBrush_SetColourSingle( TSelf(wxBrush) _obj, TChar r, TChar g, TChar b );
+void       wxBrush_SetStipple( TSelf(wxBrush) _obj, TClass(wxBitmap) stipple );
+void       wxBrush_SetStyle( TSelf(wxBrush) _obj, int style );
+
+/* wxBrushList */
+TClassDefExtend(wxBrushList,wxList)
+
+/* wxBufferedInputStream */
+TClassDefExtend(wxBufferedInputStream,wxFilterInputStream)
+
+/* wxBufferedOutputStream */
+TClassDefExtend(wxBufferedOutputStream,wxFilterOutputStream)
+
+/* wxBusyCursor */
+TClassDef(wxBusyCursor)
+TClass(wxBusyCursor) wxBusyCursor_Create(  );
+void*      wxBusyCursor_CreateWithCursor( TSelf(wxBusyCursor) _cur );
+void       wxBusyCursor_Delete( TSelf(wxBusyCursor) _obj );
+
+/* wxBusyInfo */
+TClassDef(wxBusyInfo)
+TClass(wxBusyInfo) wxBusyInfo_Create( TStringVoid _txt );
+void       wxBusyInfo_Delete( TSelf(wxBusyInfo) _obj );
+
+/* wxButton */
+TClassDefExtend(wxButton,wxControl)
+TClass(wxButton) wxButton_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxButton_SetBackgroundColour( TSelf(wxButton) _obj, TClass(wxColour) colour );
+void       wxButton_SetDefault( TSelf(wxButton) _obj );
+
+/* wxCSConv */
+TClassDefExtend(wxCSConv,wxMBConv)
+
+/* wxCalculateLayoutEvent */
+TClassDefExtend(wxCalculateLayoutEvent,wxEvent)
+TClass(wxCalculateLayoutEvent) wxCalculateLayoutEvent_Create( int id );
+int        wxCalculateLayoutEvent_GetFlags( TSelf(wxCalculateLayoutEvent) _obj );
+void       wxCalculateLayoutEvent_GetRect( TSelf(wxCalculateLayoutEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
+void       wxCalculateLayoutEvent_SetFlags( TSelf(wxCalculateLayoutEvent) _obj, int flags );
+void       wxCalculateLayoutEvent_SetRect( TSelf(wxCalculateLayoutEvent) _obj, TRect(x,y,w,h) );
+
+/* wxCalendarCtrl */
+TClassDefExtend(wxCalendarCtrl,wxControl)
+TClass(wxCalendarCtrl) wxCalendarCtrl_Create( TClass(wxWindow) _prt, int _id, void* _dat, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxCalendarCtrl_EnableHolidayDisplay( TSelf(wxCalendarCtrl) _obj, int display );
+void       wxCalendarCtrl_EnableMonthChange( TSelf(wxCalendarCtrl) _obj, TBool enable );
+void       wxCalendarCtrl_EnableYearChange( TSelf(wxCalendarCtrl) _obj, TBool enable );
+void*      wxCalendarCtrl_GetAttr( TSelf(wxCalendarCtrl) _obj, int day );
+void       wxCalendarCtrl_GetDate( TSelf(wxCalendarCtrl) _obj, void* date );
+void       wxCalendarCtrl_GetHeaderColourBg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
+void       wxCalendarCtrl_GetHeaderColourFg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
+void       wxCalendarCtrl_GetHighlightColourBg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
+void       wxCalendarCtrl_GetHighlightColourFg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
+void       wxCalendarCtrl_GetHolidayColourBg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
+void       wxCalendarCtrl_GetHolidayColourFg( TSelf(wxCalendarCtrl) _obj, TClassRef(wxColour) _ref );
+int        wxCalendarCtrl_HitTest( TSelf(wxCalendarCtrl) _obj, TPoint(x,y), void* date, void* wd );
+void       wxCalendarCtrl_ResetAttr( TSelf(wxCalendarCtrl) _obj, int day );
+void       wxCalendarCtrl_SetAttr( TSelf(wxCalendarCtrl) _obj, int day, void* attr );
+void       wxCalendarCtrl_SetDate( TSelf(wxCalendarCtrl) _obj, void* date );
+void       wxCalendarCtrl_SetHeaderColours( TSelf(wxCalendarCtrl) _obj, void* colFg, void* colBg );
+void       wxCalendarCtrl_SetHighlightColours( TSelf(wxCalendarCtrl) _obj, void* colFg, void* colBg );
+void       wxCalendarCtrl_SetHoliday( TSelf(wxCalendarCtrl) _obj, int day );
+void       wxCalendarCtrl_SetHolidayColours( TSelf(wxCalendarCtrl) _obj, void* colFg, void* colBg );
+
+/* wxCalendarDateAttr */
+TClassDef(wxCalendarDateAttr)
+TClass(wxCalendarDateAttr) wxCalendarDateAttr_Create( void* _ctxt, void* _cbck, void* _cbrd, void* _fnt, int _brd );
+TClass(wxCalendarDateAttr) wxCalendarDateAttr_CreateDefault(  );
+void       wxCalendarDateAttr_Delete( TSelf(wxCalendarDateAttr) _obj );
+void       wxCalendarDateAttr_GetBackgroundColour( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxColour) _ref );
+int        wxCalendarDateAttr_GetBorder( TSelf(wxCalendarDateAttr) _obj );
+void       wxCalendarDateAttr_GetBorderColour( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxColour) _ref );
+void       wxCalendarDateAttr_GetFont( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxFont) _ref );
+void       wxCalendarDateAttr_GetTextColour( TSelf(wxCalendarDateAttr) _obj, TClassRef(wxColour) _ref );
+TBool      wxCalendarDateAttr_HasBackgroundColour( TSelf(wxCalendarDateAttr) _obj );
+TBool      wxCalendarDateAttr_HasBorder( TSelf(wxCalendarDateAttr) _obj );
+TBool      wxCalendarDateAttr_HasBorderColour( TSelf(wxCalendarDateAttr) _obj );
+TBool      wxCalendarDateAttr_HasFont( TSelf(wxCalendarDateAttr) _obj );
+TBool      wxCalendarDateAttr_HasTextColour( TSelf(wxCalendarDateAttr) _obj );
+TBool      wxCalendarDateAttr_IsHoliday( TSelf(wxCalendarDateAttr) _obj );
+void       wxCalendarDateAttr_SetBackgroundColour( TSelf(wxCalendarDateAttr) _obj, TClass(wxColour) col );
+void       wxCalendarDateAttr_SetBorder( TSelf(wxCalendarDateAttr) _obj, int border );
+void       wxCalendarDateAttr_SetBorderColour( TSelf(wxCalendarDateAttr) _obj, TClass(wxColour) col );
+void       wxCalendarDateAttr_SetFont( TSelf(wxCalendarDateAttr) _obj, TClass(wxFont) font );
+void       wxCalendarDateAttr_SetHoliday( TSelf(wxCalendarDateAttr) _obj, int holiday );
+void       wxCalendarDateAttr_SetTextColour( TSelf(wxCalendarDateAttr) _obj, TClass(wxColour) col );
+
+/* wxCalendarEvent */
+TClassDefExtend(wxCalendarEvent,wxCommandEvent)
+void       wxCalendarEvent_GetDate( TSelf(wxCalendarEvent) _obj, void* _dte );
+int        wxCalendarEvent_GetWeekDay( TSelf(wxCalendarEvent) _obj );
+
+/* wxCaret */
+TClassDef(wxCaret)
+TClass(wxCaret) wxCaret_Create( TClass(wxWindow) _wnd, int _wth, int _hgt );
+int        wxCaret_GetBlinkTime(  );
+void       wxCaret_GetPosition( TSelf(wxCaret) _obj, TPointOutVoid(_x,_y) );
+void       wxCaret_GetSize( TSelf(wxCaret) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxWindow) wxCaret_GetWindow( TSelf(wxCaret) _obj );
+void       wxCaret_Hide( TSelf(wxCaret) _obj );
+TBool      wxCaret_IsOk( TSelf(wxCaret) _obj );
+TBool      wxCaret_IsVisible( TSelf(wxCaret) _obj );
+void       wxCaret_Move( TSelf(wxCaret) _obj, TPoint(x,y) );
+void       wxCaret_SetBlinkTime( int milliseconds );
+void       wxCaret_SetSize( TSelf(wxCaret) _obj, TSize(width,height) );
+void       wxCaret_Show( TSelf(wxCaret) _obj );
+
+/* wxCheckBox */
+TClassDefExtend(wxCheckBox,wxControl)
+TClass(wxCheckBox) wxCheckBox_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+TBoolInt   wxCheckBox_GetValue( TSelf(wxCheckBox) _obj );
+void       wxCheckBox_SetValue( TSelf(wxCheckBox) _obj, TBoolInt value );
+
+/* wxCheckListBox */
+TClassDefExtend(wxCheckListBox,wxListBox)
+void       wxCheckListBox_Check( TSelf(wxCheckListBox) _obj, int item, TBool check );
+TClass(wxCheckListBox) wxCheckListBox_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
+TBool      wxCheckListBox_IsChecked( TSelf(wxCheckListBox) _obj, int item );
+
+/* wxChoice */
+TClassDefExtend(wxChoice,wxControl)
+void       wxChoice_Append( TSelf(wxChoice) _obj, TString item );
+void       wxChoice_Clear( TSelf(wxChoice) _obj );
+TClass(wxChoice) wxChoice_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
+void       wxChoice_Delete( TSelf(wxChoice) _obj, int n );
+int        wxChoice_FindString( TSelf(wxChoice) _obj, TString s );
+int        wxChoice_GetCount( TSelf(wxChoice) _obj );
+int        wxChoice_GetSelection( TSelf(wxChoice) _obj );
+TStringLen wxChoice_GetString( TSelf(wxChoice) _obj, int n, TStringOutVoid _buf );
+void       wxChoice_SetSelection( TSelf(wxChoice) _obj, int n );
+void       wxChoice_SetString( TSelf(wxChoice) _obj, int n, TString s );
+
+/* wxClassInfo */
+TClassDef(wxClassInfo)
+void*      wxClassInfo_CreateClassByName( TSelf(wxClassInfo) _inf );
+void*      wxClassInfo_GetClassName( TSelf(wxClassInfo) _inf );
+TBool      wxClassInfo_IsKindOf( TSelf(wxClassInfo) _obj, TStringVoid _name );
+
+/* wxClient */
+TClassDefExtend(wxClient,wxClientBase)
+
+/* wxClientBase */
+TClassDefExtend(wxClientBase,wxObject)
+
+/* wxClientDC */
+TClassDefExtend(wxClientDC,wxWindowDC)
+TClass(wxClientDC) wxClientDC_Create( TClass(wxWindow) win );
+void       wxClientDC_Delete( TSelf(wxClientDC) _obj );
+
+/* wxClientData */
+TClassDef(wxClientData)
+
+/* wxClientDataContainer */
+TClassDef(wxClientDataContainer)
+
+/* wxClipboard */
+TClassDefExtend(wxClipboard,wxObject)
+int        wxClipboard_AddData( TSelf(wxClipboard) _obj, TClass(wxDataObject) data );
+void       wxClipboard_Clear( TSelf(wxClipboard) _obj );
+void       wxClipboard_Close( TSelf(wxClipboard) _obj );
+TClass(wxClipboard) wxClipboard_Create(  );
+int        wxClipboard_Flush( TSelf(wxClipboard) _obj );
+int        wxClipboard_GetData( TSelf(wxClipboard) _obj, TClass(wxDataObject) data );
+TBool      wxClipboard_IsOpened( TSelf(wxClipboard) _obj );
+TBool      wxClipboard_IsSupported( TSelf(wxClipboard) _obj, TClass(wxDataFormat) format );
+int        wxClipboard_Open( TSelf(wxClipboard) _obj );
+int        wxClipboard_SetData( TSelf(wxClipboard) _obj, TClass(wxDataObject) data );
+void       wxClipboard_UsePrimarySelection( TSelf(wxClipboard) _obj, int primary );
+
+/* wxCloseEvent */
+TClassDefExtend(wxCloseEvent,wxEvent)
+TBool      wxCloseEvent_CanVeto( TSelf(wxCloseEvent) _obj );
+void       wxCloseEvent_CopyObject( TSelf(wxCloseEvent) _obj, void* obj );
+int        wxCloseEvent_GetLoggingOff( TSelf(wxCloseEvent) _obj );
+int        wxCloseEvent_GetVeto( TSelf(wxCloseEvent) _obj );
+void       wxCloseEvent_SetCanVeto( TSelf(wxCloseEvent) _obj, int canVeto );
+void       wxCloseEvent_SetLoggingOff( TSelf(wxCloseEvent) _obj, int logOff );
+void       wxCloseEvent_Veto( TSelf(wxCloseEvent) _obj, int veto );
+
+/* wxClosure */
+TClassDefExtend(wxClosure,wxObject)
+
+/* wxColour */
+TClassDefExtend(wxColour,wxObject)
+void       wxColour_Assign( TSelf(wxColour) _obj, void* other );
+TChar      wxColour_Blue( TSelf(wxColour) _obj );
+void       wxColour_Copy( TSelf(wxColour) _obj, void* _other );
+void*      wxColour_CreateByName( TStringVoid _name );
+TClass(wxColour) wxColour_CreateEmpty(  );
+TClass(wxColour) wxColour_CreateFromStock( int id );
+void*      wxColour_CreateRGB( TChar _red, TChar _green, TChar _blue );
+void       wxColour_Delete( TSelf(wxColour) _obj );
+//WXCOLORREF wxColour_GetPixel( TSelf(wxColour) _obj );
+TChar      wxColour_Green( TSelf(wxColour) _obj );
+TBool      wxColour_Ok( TSelf(wxColour) _obj );
+TChar      wxColour_Red( TSelf(wxColour) _obj );
+void       wxColour_Set( TSelf(wxColour) _obj, TChar _red, TChar _green, TChar _blue );
+void       wxColour_SetByName( TSelf(wxColour) _obj, TStringVoid _name );
+TBoolInt   wxColour_ValidName( TStringVoid _name );
+
+/* wxColourData */
+TClassDefExtend(wxColourData,wxObject)
+TClass(wxColourData) wxColourData_Create(  );
+void       wxColourData_Delete( TSelf(wxColourData) _obj );
+int        wxColourData_GetChooseFull( TSelf(wxColourData) _obj );
+void       wxColourData_GetColour( TSelf(wxColourData) _obj, TClassRef(wxColour) _ref );
+void       wxColourData_GetCustomColour( TSelf(wxColourData) _obj, int i, TClassRef(wxColour) _ref );
+void       wxColourData_SetChooseFull( TSelf(wxColourData) _obj, int flag );
+void       wxColourData_SetColour( TSelf(wxColourData) _obj, TClass(wxColour) colour );
+void       wxColourData_SetCustomColour( TSelf(wxColourData) _obj, int i, TClass(wxColour) colour );
+
+/* wxColourDatabase */
+TClassDefExtend(wxColourDatabase,wxList)
+
+/* wxColourDialog */
+TClassDefExtend(wxColourDialog,wxDialog)
+TClass(wxColourDialog) wxColourDialog_Create( TClass(wxWindow) _prt, TClass(wxColour) col );
+void       wxColourDialog_GetColourData( TSelf(wxColourDialog) _obj, TClassRef(wxColour) _ref );
+
+/* wxComboBox */
+TClassDefExtend(wxComboBox,wxChoice)
+void       wxComboBox_Append( TSelf(wxComboBox) _obj, TString item );
+void       wxComboBox_AppendData( TSelf(wxComboBox) _obj, TString item, void* d );
+void       wxComboBox_Clear( TSelf(wxComboBox) _obj );
+void       wxComboBox_Copy( TSelf(wxComboBox) _obj );
+TClass(wxComboBox) wxComboBox_Create( TClass(wxWindow) _prt, int _id, TStringVoid _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
+void       wxComboBox_Cut( TSelf(wxComboBox) _obj );
+void       wxComboBox_Delete( TSelf(wxComboBox) _obj, int n );
+int        wxComboBox_FindString( TSelf(wxComboBox) _obj, TString s );
+TClass(wxClientData) wxComboBox_GetClientData( TSelf(wxComboBox) _obj, int n );
+int        wxComboBox_GetCount( TSelf(wxComboBox) _obj );
+int        wxComboBox_GetInsertionPoint( TSelf(wxComboBox) _obj );
+int        wxComboBox_GetLastPosition( TSelf(wxComboBox) _obj );
+int        wxComboBox_GetSelection( TSelf(wxComboBox) _obj );
+TStringLen wxComboBox_GetString( TSelf(wxComboBox) _obj, int n, TStringOutVoid _buf );
+TStringLen wxComboBox_GetStringSelection( TSelf(wxComboBox) _obj, TStringOutVoid _buf );
+TStringLen wxComboBox_GetValue( TSelf(wxComboBox) _obj, TStringOutVoid _buf );
+void       wxComboBox_Paste( TSelf(wxComboBox) _obj );
+void       wxComboBox_Remove( TSelf(wxComboBox) _obj, int from, int to );
+void       wxComboBox_Replace( TSelf(wxComboBox) _obj, int from, int to, TString value );
+void       wxComboBox_SetClientData( TSelf(wxComboBox) _obj, int n, TClass(wxClientData) clientData );
+void       wxComboBox_SetEditable( TSelf(wxComboBox) _obj, TBool editable );
+void       wxComboBox_SetInsertionPoint( TSelf(wxComboBox) _obj, int pos );
+void       wxComboBox_SetInsertionPointEnd( TSelf(wxComboBox) _obj );
+void       wxComboBox_SetSelection( TSelf(wxComboBox) _obj, int n );
+void       wxComboBox_SetTextSelection( TSelf(wxComboBox) _obj, int from, int to );
+
+/* wxCommand */
+TClassDefExtend(wxCommand,wxObject)
+
+/* wxCommandEvent */
+TClassDefExtend(wxCommandEvent,wxEvent)
+void       wxCommandEvent_CopyObject( TSelf(wxCommandEvent) _obj, void* object_dest );
+TClass(wxCommandEvent) wxCommandEvent_Create( int _typ, int _id );
+void       wxCommandEvent_Delete( TSelf(wxCommandEvent) _obj );
+TClass(wxClientData) wxCommandEvent_GetClientData( TSelf(wxCommandEvent) _obj );
+TClass(wxClientData) wxCommandEvent_GetClientObject( TSelf(wxCommandEvent) _obj );
+long       wxCommandEvent_GetExtraLong( TSelf(wxCommandEvent) _obj );
+long       wxCommandEvent_GetInt( TSelf(wxCommandEvent) _obj );
+int        wxCommandEvent_GetSelection( TSelf(wxCommandEvent) _obj );
+TStringLen wxCommandEvent_GetString( TSelf(wxCommandEvent) _obj, TStringOutVoid _buf );
+TBool      wxCommandEvent_IsChecked( TSelf(wxCommandEvent) _obj );
+TBool      wxCommandEvent_IsSelection( TSelf(wxCommandEvent) _obj );
+void       wxCommandEvent_SetClientData( TSelf(wxCommandEvent) _obj, TClass(wxClientData) clientData );
+void       wxCommandEvent_SetClientObject( TSelf(wxCommandEvent) _obj, TClass(wxClientData) clientObject );
+void       wxCommandEvent_SetExtraLong( TSelf(wxCommandEvent) _obj, long extraLong );
+void       wxCommandEvent_SetInt( TSelf(wxCommandEvent) _obj, int i );
+void       wxCommandEvent_SetString( TSelf(wxCommandEvent) _obj, TString s );
+
+/* wxCommandLineParser */
+TClassDef(wxCommandLineParser)
+
+/* wxCommandProcessor */
+TClassDefExtend(wxCommandProcessor,wxObject)
+TBool      wxCommandProcessor_CanRedo( TSelf(wxCommandProcessor) _obj );
+TBool      wxCommandProcessor_CanUndo( TSelf(wxCommandProcessor) _obj );
+void       wxCommandProcessor_ClearCommands( TSelf(wxCommandProcessor) _obj );
+void       wxCommandProcessor_Delete( TSelf(wxCommandProcessor) _obj );
+int        wxCommandProcessor_GetCommands( TSelf(wxCommandProcessor) _obj, void* _ref );
+void*      wxCommandProcessor_GetEditMenu( TSelf(wxCommandProcessor) _obj );
+int        wxCommandProcessor_GetMaxCommands( TSelf(wxCommandProcessor) _obj );
+void       wxCommandProcessor_Initialize( TSelf(wxCommandProcessor) _obj );
+int        wxCommandProcessor_Redo( TSelf(wxCommandProcessor) _obj );
+void       wxCommandProcessor_SetEditMenu( TSelf(wxCommandProcessor) _obj, TClass(wxMenu) menu );
+void       wxCommandProcessor_SetMenuStrings( TSelf(wxCommandProcessor) _obj );
+int        wxCommandProcessor_Submit( TSelf(wxCommandProcessor) _obj, TClass(wxCommand) command, int storeIt );
+int        wxCommandProcessor_Undo( TSelf(wxCommandProcessor) _obj );
+void*      wxCommandProcessor_wxCommandProcessor( int maxCommands );
+
+/* wxCondition */
+TClassDef(wxCondition)
+void       wxCondition_Broadcast( TSelf(wxCondition) _obj );
+TClass(wxCondition) wxCondition_Create( void* _mut );
+void       wxCondition_Delete( TSelf(wxCondition) _obj );
+void       wxCondition_Signal( TSelf(wxCondition) _obj );
+void       wxCondition_Wait( TSelf(wxCondition) _obj );
+int        wxCondition_WaitFor( TSelf(wxCondition) _obj, int sec, int nsec );
+
+/* wxConfigBase */
+TClassDef(wxConfigBase)
+TClass(wxConfigBase) wxConfigBase_Create(  );
+void       wxConfigBase_Delete( TSelf(wxConfigBase) _obj );
+TBool      wxConfigBase_DeleteAll( TSelf(wxConfigBase) _obj );
+TBool      wxConfigBase_DeleteEntry( TSelf(wxConfigBase) _obj, TStringVoid key, TBoolInt bDeleteGroupIfEmpty );
+TBool      wxConfigBase_DeleteGroup( TSelf(wxConfigBase) _obj, TStringVoid key );
+TBool      wxConfigBase_Exists( TSelf(wxConfigBase) _obj, TStringVoid strName );
+TStringLen wxConfigBase_ExpandEnvVars( TSelf(wxConfigBase) _obj, TStringVoid str, TStringOutVoid _buf );
+TBool      wxConfigBase_Flush( TSelf(wxConfigBase) _obj, TBool bCurrentOnly );
+TStringLen wxConfigBase_GetAppName( TSelf(wxConfigBase) _obj, TStringOutVoid _buf );
+int        wxConfigBase_GetEntryType( TSelf(wxConfigBase) _obj, TStringVoid name );
+TClass(wxString) wxConfigBase_GetFirstEntry( TSelf(wxConfigBase) _obj, void* lIndex );
+TClass(wxString) wxConfigBase_GetFirstGroup( TSelf(wxConfigBase) _obj, void* lIndex );
+TClass(wxString) wxConfigBase_GetNextEntry( TSelf(wxConfigBase) _obj, void* lIndex);
+TClass(wxString) wxConfigBase_GetNextGroup( TSelf(wxConfigBase) _obj, void* lIndex);
+int        wxConfigBase_GetNumberOfEntries( TSelf(wxConfigBase) _obj, TBoolInt bRecursive );
+int        wxConfigBase_GetNumberOfGroups( TSelf(wxConfigBase) _obj, TBoolInt bRecursive );
+TStringLen wxConfigBase_GetPath( TSelf(wxConfigBase) _obj, TStringOutVoid _buf );
+int        wxConfigBase_GetStyle( TSelf(wxConfigBase) _obj );
+TStringLen wxConfigBase_GetVendorName( TSelf(wxConfigBase) _obj, TStringOutVoid _buf );
+TBool      wxConfigBase_HasEntry( TSelf(wxConfigBase) _obj, TStringVoid strName );
+TBool      wxConfigBase_HasGroup( TSelf(wxConfigBase) _obj, TStringVoid strName );
+TBool      wxConfigBase_IsExpandingEnvVars( TSelf(wxConfigBase) _obj );
+TBool      wxConfigBase_IsRecordingDefaults( TSelf(wxConfigBase) _obj );
+TBoolInt   wxConfigBase_ReadBool( TSelf(wxConfigBase) _obj, TStringVoid key, TBoolInt defVal );
+double     wxConfigBase_ReadDouble( TSelf(wxConfigBase) _obj, TStringVoid key, double defVal );
+int        wxConfigBase_ReadInteger( TSelf(wxConfigBase) _obj, TStringVoid key, int defVal );
+TClass(wxString) wxConfigBase_ReadString( TSelf(wxConfigBase) _obj, TStringVoid key, TStringVoid defVal );
+TBoolInt   wxConfigBase_RenameEntry( TSelf(wxConfigBase) _obj, TStringVoid oldName, TStringVoid newName );
+TBoolInt   wxConfigBase_RenameGroup( TSelf(wxConfigBase) _obj, TStringVoid oldName, TStringVoid newName );
+void       wxConfigBase_SetAppName( TSelf(wxConfigBase) _obj, TStringVoid appName );
+void       wxConfigBase_SetExpandEnvVars( TSelf(wxConfigBase) _obj, TBoolInt bDoIt );
+void       wxConfigBase_SetPath( TSelf(wxConfigBase) _obj, TStringVoid strPath );
+void       wxConfigBase_SetRecordDefaults( TSelf(wxConfigBase) _obj, TBoolInt bDoIt );
+void       wxConfigBase_SetStyle( TSelf(wxConfigBase) _obj, int style );
+void       wxConfigBase_SetVendorName( TSelf(wxConfigBase) _obj, TStringVoid vendorName );
+TBoolInt   wxConfigBase_WriteBool( TSelf(wxConfigBase) _obj, TStringVoid key, TBoolInt value );
+TBoolInt   wxConfigBase_WriteDouble( TSelf(wxConfigBase) _obj, TStringVoid key, double value );
+TBoolInt   wxConfigBase_WriteInteger( TSelf(wxConfigBase) _obj, TStringVoid key, int value );
+TBoolInt   wxConfigBase_WriteString( TSelf(wxConfigBase) _obj, TStringVoid key, TStringVoid value );
+
+/* wxConnection */
+TClassDefExtend(wxConnection,wxConnectionBase)
+
+/* wxConnectionBase */
+TClassDefExtend(wxConnectionBase,wxObject)
+
+/* wxContextHelp */
+TClassDefExtend(wxContextHelp,wxObject)
+int        wxContextHelp_BeginContextHelp( TSelf(wxContextHelp) _obj, TClass(wxWindow) win );
+TClass(wxContextHelp) wxContextHelp_Create( TClass(wxWindow) win, int beginHelp );
+void       wxContextHelp_Delete( TSelf(wxContextHelp) _obj );
+int        wxContextHelp_EndContextHelp( TSelf(wxContextHelp) _obj );
+
+/* wxContextHelpButton */
+TClassDefExtend(wxContextHelpButton,wxBitmapButton)
+TClass(wxContextHelpButton) wxContextHelpButton_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), long style );
+
+/* wxControl */
+TClassDefExtend(wxControl,wxWindow)
+void       wxControl_Command( TSelf(wxControl) _obj, TClass(wxEvent) event );
+TStringLen wxControl_GetLabel( TSelf(wxControl) _obj, TStringOutVoid _buf );
+void       wxControl_SetLabel( TSelf(wxControl) _obj, TString text );
+
+/* wxCountingOutputStream */
+TClassDefExtend(wxCountingOutputStream,wxOutputStream)
+
+/* wxCriticalSection */
+TClassDef(wxCriticalSection)
+TClass(wxCriticalSection) wxCriticalSection_Create(  );
+void       wxCriticalSection_Delete( TSelf(wxCriticalSection) _obj );
+void       wxCriticalSection_Enter( TSelf(wxCriticalSection) _obj );
+void       wxCriticalSection_Leave( TSelf(wxCriticalSection) _obj );
+
+/* wxCriticalSectionLocker */
+TClassDef(wxCriticalSectionLocker)
+
+/* wxCursor */
+TClassDefExtend(wxCursor,wxBitmap)
+TClass(wxCursor)  Cursor_CreateFromStock( int _id );
+TClass(wxCursor)  Cursor_CreateFromImage( TClass(wxImage) image );
+TClass(wxCursor)  Cursor_CreateLoad( TStringVoid name, long type, TSize(width,height) );
+
+/* wxCustomDataObject */
+TClassDefExtend(wxCustomDataObject,wxDataObjectSimple)
+
+/* wxDC */
+TClassDefExtend(wxDC,wxObject)
+void       wxDC_BeginDrawing( TSelf(wxDC) _obj );
+int        wxDC_Blit( TSelf(wxDC) _obj, TRect(xdest,ydest,width,height), TClass(wxDC) source, TPoint(xsrc,ysrc), int rop, TBool useMask );
+void       wxDC_CalcBoundingBox( TSelf(wxDC) _obj, TPoint(x,y) );
+TBool      wxDC_CanDrawBitmap( TSelf(wxDC) _obj );
+TBool      wxDC_CanGetTextExtent( TSelf(wxDC) _obj );
+void       wxDC_Clear( TSelf(wxDC) _obj );
+void       wxDC_CrossHair( TSelf(wxDC) _obj, TPoint(x,y) );
+void       wxDC_Delete( TSelf(wxDC) _obj );
+void       wxDC_DestroyClippingRegion( TSelf(wxDC) _obj );
+int        wxDC_DeviceToLogicalX( TSelf(wxDC) _obj, int x );
+int        wxDC_DeviceToLogicalXRel( TSelf(wxDC) _obj, int x );
+int        wxDC_DeviceToLogicalY( TSelf(wxDC) _obj, int y );
+int        wxDC_DeviceToLogicalYRel( TSelf(wxDC) _obj, int y );
+void       wxDC_DrawArc( TSelf(wxDC) _obj, TPoint(x1,y1), TPoint(x2,y2), TPoint(xc,yc) );
+void       wxDC_DrawBitmap( TSelf(wxDC) _obj, TClass(wxBitmap) bmp, TPoint(x,y), TBool useMask );
+void       wxDC_DrawCheckMark( TSelf(wxDC) _obj, TRect(x,y,width,height) );
+void       wxDC_DrawCircle( TSelf(wxDC) _obj, TPoint(x,y), int radius );
+void       wxDC_DrawEllipse( TSelf(wxDC) _obj, TRect(x,y,width,height) );
+void       wxDC_DrawEllipticArc( TSelf(wxDC) _obj, TRect(x,y,w,h), double sa, double ea );
+void       wxDC_DrawIcon( TSelf(wxDC) _obj, TClass(wxIcon) icon, TPoint(x,y) );
+void       wxDC_DrawLine( TSelf(wxDC) _obj, TPoint(x1,y1), TPoint(x2,y2) );
+void       wxDC_DrawLines( TSelf(wxDC) _obj, int n, void* x, void* y, TPoint(xoffset,yoffset) );
+void       wxDC_DrawPoint( TSelf(wxDC) _obj, TPoint(x,y) );
+void       wxDC_DrawPolygon( TSelf(wxDC) _obj, int n, void* x, void* y, TPoint(xoffset,yoffset), int fillStyle );
+void       wxDC_DrawRectangle( TSelf(wxDC) _obj, TRect(x,y,width,height) );
+void       wxDC_DrawRotatedText( TSelf(wxDC) _obj, TStringVoid text, TPoint(x,y), double angle );
+void       wxDC_DrawRoundedRectangle( TSelf(wxDC) _obj, TRect(x,y,width,height), double radius );
+void       wxDC_DrawText( TSelf(wxDC) _obj, TStringVoid text, TPoint(x,y) );
+void       wxDC_EndDoc( TSelf(wxDC) _obj );
+void       wxDC_EndDrawing( TSelf(wxDC) _obj );
+void       wxDC_EndPage( TSelf(wxDC) _obj );
+void       wxDC_FloodFill( TSelf(wxDC) _obj, TPoint(x,y), TClass(wxColour) col, int style );
+void       wxDC_GetBackground( TSelf(wxDC) _obj, TClassRef(wxBrush) _ref );
+int        wxDC_GetBackgroundMode( TSelf(wxDC) _obj );
+void       wxDC_GetBrush( TSelf(wxDC) _obj, TClassRef(wxBrush) _ref );
+int        wxDC_GetCharHeight( TSelf(wxDC) _obj );
+int        wxDC_GetCharWidth( TSelf(wxDC) _obj );
+void       wxDC_GetClippingBox( TSelf(wxDC) _obj, TRectOutVoid(_x,_y,_w,_h) );
+int        wxDC_GetDepth( TSelf(wxDC) _obj );
+void       wxDC_GetDeviceOrigin( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) );
+void       wxDC_GetFont( TSelf(wxDC) _obj, TClassRef(wxFont) _ref );
+int        wxDC_GetLogicalFunction( TSelf(wxDC) _obj );
+void       wxDC_GetLogicalOrigin( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) );
+void       wxDC_GetLogicalScale( TSelf(wxDC) _obj, TPointOutVoid(_x,_y) );
+int        wxDC_GetMapMode( TSelf(wxDC) _obj );
+void       wxDC_GetPPI( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );
+void       wxDC_GetPen( TSelf(wxDC) _obj, TClassRef(wxPen) _ref );
+TBoolInt   wxDC_GetPixel( TSelf(wxDC) _obj, TPoint(x,y), TClass(wxColour) col );
+void       wxDC_GetSize( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );
+void       wxDC_GetSizeMM( TSelf(wxDC) _obj, TSizeOutVoid(_w,_h) );
+void       wxDC_GetTextBackground( TSelf(wxDC) _obj, TClassRef(wxColour) _ref );
+void       wxDC_GetTextExtent( TSelf(wxDC) _obj, TStringVoid string, void* x, void* y, void* descent, void* externalLeading, TClass(wxFont) theFont );
+void       wxDC_GetTextForeground( TSelf(wxDC) _obj, TClassRef(wxColour) _ref );
+void       wxDC_GetUserScale( TSelf(wxDC) _obj, void* x, void* y );
+int        wxDC_LogicalToDeviceX( TSelf(wxDC) _obj, int x );
+int        wxDC_LogicalToDeviceXRel( TSelf(wxDC) _obj, int x );
+int        wxDC_LogicalToDeviceY( TSelf(wxDC) _obj, int y );
+int        wxDC_LogicalToDeviceYRel( TSelf(wxDC) _obj, int y );
+int        wxDC_MaxX( TSelf(wxDC) _obj );
+int        wxDC_MaxY( TSelf(wxDC) _obj );
+int        wxDC_MinX( TSelf(wxDC) _obj );
+int        wxDC_MinY( TSelf(wxDC) _obj );
+TBool      wxDC_Ok( TSelf(wxDC) _obj );
+void       wxDC_ResetBoundingBox( TSelf(wxDC) _obj );
+void       wxDC_SetAxisOrientation( TSelf(wxDC) _obj, TBoolInt xLeftRight, TBoolInt yBottomUp );
+void       wxDC_SetBackground( TSelf(wxDC) _obj, TClass(wxBrush) brush );
+void       wxDC_SetBackgroundMode( TSelf(wxDC) _obj, int mode );
+void       wxDC_SetBrush( TSelf(wxDC) _obj, TClass(wxBrush) brush );
+void       wxDC_SetClippingRegion( TSelf(wxDC) _obj, TRect(x,y,width,height) );
+void       wxDC_SetClippingRegionFromRegion( TSelf(wxDC) _obj, TClass(wxRegion) region );
+void       wxDC_SetDeviceOrigin( TSelf(wxDC) _obj, TPoint(x,y) );
+void       wxDC_SetFont( TSelf(wxDC) _obj, TClass(wxFont) font );
+void       wxDC_SetLogicalFunction( TSelf(wxDC) _obj, int function );
+void       wxDC_SetLogicalOrigin( TSelf(wxDC) _obj, TPoint(x,y) );
+void       wxDC_SetLogicalScale( TSelf(wxDC) _obj, double x, double y );
+void       wxDC_SetMapMode( TSelf(wxDC) _obj, int mode );
+void       wxDC_SetPalette( TSelf(wxDC) _obj, TClass(wxPalette) palette );
+void       wxDC_SetPen( TSelf(wxDC) _obj, TClass(wxPen) pen );
+void       wxDC_SetTextBackground( TSelf(wxDC) _obj, TClass(wxColour) colour );
+void       wxDC_SetTextForeground( TSelf(wxDC) _obj, TClass(wxColour) colour );
+void       wxDC_SetUserScale( TSelf(wxDC) _obj, double x, double y );
+int        wxDC_StartDoc( TSelf(wxDC) _obj, TStringVoid msg );
+void       wxDC_StartPage( TSelf(wxDC) _obj );
+
+/* wxDCClipper */
+TClassDef(wxDCClipper)
+
+/* wxDDEClient */
+TClassDefExtend(wxDDEClient,wxClientBase)
+
+/* wxDDEConnection */
+TClassDefExtend(wxDDEConnection,wxConnectionBase)
+
+/* wxDDEServer */
+TClassDefExtend(wxDDEServer,wxServerBase)
+
+/* wxDataFormat */
+TClassDef(wxDataFormat)
+TClass(wxDataFormat) wxDataFormat_CreateFromId( TStringVoid name );
+TClass(wxDataFormat) wxDataFormat_CreateFromType( int typ );
+void       wxDataFormat_Delete( TSelf(wxDataFormat) _obj );
+TStringLen wxDataFormat_GetId( TSelf(wxDataFormat) _obj, TStringOutVoid _buf );
+int        wxDataFormat_GetType( TSelf(wxDataFormat) _obj );
+TBool      wxDataFormat_IsEqual( TSelf(wxDataFormat) _obj, void* other );
+void       wxDataFormat_SetId( TSelf(wxDataFormat) _obj, void* id );
+void       wxDataFormat_SetType( TSelf(wxDataFormat) _obj, int typ );
+
+/* wxDataInputStream */
+TClassDef(wxDataInputStream)
+
+/* wxDataObject */
+TClassDef(wxDataObject)
+
+/* wxDataObjectComposite */
+TClassDefExtend(wxDataObjectComposite,wxDataObject)
+void       wxDataObjectComposite_Add( TSelf(wxDataObjectComposite) _obj, void* _dat, int _preferred );
+TClass(wxDataObjectComposite) wxDataObjectComposite_Create(  );
+void       wxDataObjectComposite_Delete( TSelf(wxDataObjectComposite) _obj );
+
+/* wxDataObjectSimple */
+TClassDefExtend(wxDataObjectSimple,wxDataObject)
+
+/* wxDataOutputStream */
+TClassDef(wxDataOutputStream)
+
+/* wxDatabase */
+TClassDefExtend(wxDatabase,wxObject)
+
+/* wxDateTime */
+TClassDef(wxDateTime)
+void       wxDateTime_AddDate( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
+void       wxDateTime_AddDateValues( TSelf(wxDateTime) _obj, int _yrs, int _mnt, int _wek, int _day );
+void       wxDateTime_AddTime( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
+void       wxDateTime_AddTimeValues( TSelf(wxDateTime) _obj, int _hrs, int _min, int _sec, int _mls );
+int        wxDateTime_ConvertYearToBC( int year );
+TClass(wxDateTime) wxDateTime_Create(  );
+TStringLen wxDateTime_Format( TSelf(wxDateTime) _obj, void* format, int tz, TStringOutVoid _buf );
+TStringLen wxDateTime_FormatDate( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
+TStringLen wxDateTime_FormatISODate( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
+TStringLen wxDateTime_FormatISOTime( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
+TStringLen wxDateTime_FormatTime( TSelf(wxDateTime) _obj, TStringOutVoid _buf );
+TStringLen wxDateTime_GetAmString( TStringOutVoid _buf );
+void       wxDateTime_GetBeginDST( int year, int country, TClass(wxDateTime) dt );
+int        wxDateTime_GetCentury( int year );
+int        wxDateTime_GetCountry(  );
+int        wxDateTime_GetCurrentMonth( int cal );
+int        wxDateTime_GetCurrentYear( int cal );
+int        wxDateTime_GetDay( TSelf(wxDateTime) _obj, int tz );
+int        wxDateTime_GetDayOfYear( TSelf(wxDateTime) _obj, int tz );
+void       wxDateTime_GetEndDST( int year, int country, TClass(wxDateTime) dt );
+int        wxDateTime_GetHour( TSelf(wxDateTime) _obj, int tz );
+void       wxDateTime_GetLastMonthDay( TSelf(wxDateTime) _obj, int month, int year, TClassRef(wxDateTime) _ref );
+void       wxDateTime_GetLastWeekDay( TSelf(wxDateTime) _obj, int weekday, int month, int year, TClassRef(wxDateTime) _ref );
+int        wxDateTime_GetMillisecond( TSelf(wxDateTime) _obj, int tz );
+int        wxDateTime_GetMinute( TSelf(wxDateTime) _obj, int tz );
+int        wxDateTime_GetMonth( TSelf(wxDateTime) _obj, int tz );
+TStringLen wxDateTime_GetMonthName( int month, int flags, TStringOutVoid _buf );
+void       wxDateTime_GetNextWeekDay( TSelf(wxDateTime) _obj, int weekday, TClassRef(wxDateTime) _ref );
+int        wxDateTime_GetNumberOfDays( int year, int cal );
+int        wxDateTime_GetNumberOfDaysMonth( int month, int year, int cal );
+TStringLen wxDateTime_GetPmString( TStringOutVoid _buf );
+void       wxDateTime_GetPrevWeekDay( TSelf(wxDateTime) _obj, int weekday, TClassRef(wxDateTime) _ref );
+int        wxDateTime_GetSecond( TSelf(wxDateTime) _obj, int tz );
+time_t     wxDateTime_GetTicks( TSelf(wxDateTime) _obj );
+int        wxDateTime_GetTimeNow(  );
+void       wxDateTime_GetValue( TSelf(wxDateTime) _obj, void* hi_long, void* lo_long );
+void       wxDateTime_GetWeekDay( TSelf(wxDateTime) _obj, int weekday, int n, int month, int year, TClassRef(wxDateTime) _ref );
+void       wxDateTime_GetWeekDayInSameWeek( TSelf(wxDateTime) _obj, int weekday, TClassRef(wxDateTime) _ref );
+TStringLen wxDateTime_GetWeekDayName( int weekday, int flags, TStringOutVoid _buf );
+int        wxDateTime_GetWeekDayTZ( TSelf(wxDateTime) _obj, int tz );
+int        wxDateTime_GetWeekOfMonth( TSelf(wxDateTime) _obj, int flags, int tz );
+int        wxDateTime_GetWeekOfYear( TSelf(wxDateTime) _obj, int flags, int tz );
+int        wxDateTime_GetYear( TSelf(wxDateTime) _obj, int tz );
+TBool      wxDateTime_IsBetween( TSelf(wxDateTime) _obj, TClass(wxDateTime) t1, TClass(wxDateTime) t2 );
+TBool      wxDateTime_IsDST( TSelf(wxDateTime) _obj, int country );
+TBool      wxDateTime_IsDSTApplicable( int year, int country );
+TBool      wxDateTime_IsEarlierThan( TSelf(wxDateTime) _obj, void* datetime );
+TBool      wxDateTime_IsEqualTo( TSelf(wxDateTime) _obj, void* datetime );
+TBool      wxDateTime_IsEqualUpTo( TSelf(wxDateTime) _obj, TClass(wxDateTime) dt, void* ts );
+TBool      wxDateTime_IsGregorianDate( TSelf(wxDateTime) _obj, int country );
+TBool      wxDateTime_IsLaterThan( TSelf(wxDateTime) _obj, void* datetime );
+TBool      wxDateTime_IsLeapYear( int year, int cal );
+TBool      wxDateTime_IsSameDate( TSelf(wxDateTime) _obj, TClass(wxDateTime) dt );
+TBool      wxDateTime_IsSameTime( TSelf(wxDateTime) _obj, TClass(wxDateTime) dt );
+TBool      wxDateTime_IsStrictlyBetween( TSelf(wxDateTime) _obj, TClass(wxDateTime) t1, TClass(wxDateTime) t2 );
+TBool      wxDateTime_IsValid( TSelf(wxDateTime) _obj );
+TBool      wxDateTime_IsWestEuropeanCountry( int country );
+TBool      wxDateTime_IsWorkDay( TSelf(wxDateTime) _obj, int country );
+void       wxDateTime_MakeGMT( TSelf(wxDateTime) _obj, int noDST );
+void       wxDateTime_MakeTimezone( TSelf(wxDateTime) _obj, int tz, int noDST );
+void       wxDateTime_Now( TSelf(wxDateTime) dt );
+void*      wxDateTime_ParseDate( TSelf(wxDateTime) _obj, void* date );
+void*      wxDateTime_ParseDateTime( TSelf(wxDateTime) _obj, void* datetime );
+void*      wxDateTime_ParseFormat( TSelf(wxDateTime) _obj, void* date, void* format, void* dateDef );
+void*      wxDateTime_ParseRfc822Date( TSelf(wxDateTime) _obj, void* date );
+void*      wxDateTime_ParseTime( TSelf(wxDateTime) _obj, TClass(wxTime) time );
+void       wxDateTime_ResetTime( TSelf(wxDateTime) _obj );
+void       wxDateTime_Set( TSelf(wxDateTime) _obj, int day, int month, int year, int hour, int minute, int second, int millisec );
+void       wxDateTime_SetCountry( int country );
+void       wxDateTime_SetDay( TSelf(wxDateTime) _obj, int day );
+void       wxDateTime_SetHour( TSelf(wxDateTime) _obj, int hour );
+void       wxDateTime_SetMillisecond( TSelf(wxDateTime) _obj, int millisecond );
+void       wxDateTime_SetMinute( TSelf(wxDateTime) _obj, int minute );
+void       wxDateTime_SetMonth( TSelf(wxDateTime) _obj, int month );
+void       wxDateTime_SetSecond( TSelf(wxDateTime) _obj, int second );
+void       wxDateTime_SetTime( TSelf(wxDateTime) _obj, int hour, int minute, int second, int millisec );
+void       wxDateTime_SetToCurrent( TSelf(wxDateTime) _obj );
+void       wxDateTime_SetToLastMonthDay( TSelf(wxDateTime) _obj, int month, int year );
+int        wxDateTime_SetToLastWeekDay( TSelf(wxDateTime) _obj, int weekday, int month, int year );
+void       wxDateTime_SetToNextWeekDay( TSelf(wxDateTime) _obj, int weekday );
+void       wxDateTime_SetToPrevWeekDay( TSelf(wxDateTime) _obj, int weekday );
+int        wxDateTime_SetToWeekDay( TSelf(wxDateTime) _obj, int weekday, int n, int month, int year );
+void       wxDateTime_SetToWeekDayInSameWeek( TSelf(wxDateTime) _obj, int weekday );
+void       wxDateTime_SetYear( TSelf(wxDateTime) _obj, int year );
+void       wxDateTime_SubtractDate( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
+void       wxDateTime_SubtractTime( TSelf(wxDateTime) _obj, void* diff, TClassRef(wxDateTime) _ref );
+void       wxDateTime_ToGMT( TSelf(wxDateTime) _obj, int noDST );
+void       wxDateTime_ToTimezone( TSelf(wxDateTime) _obj, int tz, int noDST );
+void       wxDateTime_Today( TSelf(wxDateTime) dt );
+void       wxDateTime_UNow( TSelf(wxDateTime) dt );
+void*      wxDateTime_wxDateTime( int hi_long, int lo_long );
+
+/* wxDb */
+TClassDef(wxDb)
+
+/* wxDbColDef */
+TClassDef(wxDbColDef)
+
+/* wxDbColFor */
+TClassDef(wxDbColFor)
+
+/* wxDbColInf */
+TClassDef(wxDbColInf)
+
+/* wxDbConnectInf */
+TClassDef(wxDbConnectInf)
+
+/* wxDbInf */
+TClassDef(wxDbInf)
+
+/* wxDbSqlTypeInfo */
+TClassDef(wxDbSqlTypeInfo)
+
+/* wxDbTable */
+TClassDef(wxDbTable)
+
+/* wxDbTableInfo */
+TClassDef(wxDbTableInfo)
+
+/* wxDebugContext */
+TClassDef(wxDebugContext)
+
+/* wxDialUpEvent */
+TClassDefExtend(wxDialUpEvent,wxEvent)
+TBool      wxDialUpEvent_IsConnectedEvent( TSelf(wxDialUpEvent) _obj );
+TBool      wxDialUpEvent_IsOwnEvent( TSelf(wxDialUpEvent) _obj );
+
+/* wxDialUpManager */
+TClassDef(wxDialUpManager)
+TBool      wxDialUpManager_CancelDialing( TSelf(wxDialUpManager) _obj );
+TClass(wxDialUpManager) wxDialUpManager_Create(  );
+void       wxDialUpManager_Delete( TSelf(wxDialUpManager) _obj );
+int        wxDialUpManager_Dial( TSelf(wxDialUpManager) _obj, void* nameOfISP, void* username, void* password, int async );
+void       wxDialUpManager_DisableAutoCheckOnlineStatus( TSelf(wxDialUpManager) _obj );
+int        wxDialUpManager_EnableAutoCheckOnlineStatus( TSelf(wxDialUpManager) _obj, int nSeconds );
+int        wxDialUpManager_GetISPNames( TSelf(wxDialUpManager) _obj, TClass(wxList) _lst );
+int        wxDialUpManager_HangUp( TSelf(wxDialUpManager) _obj );
+TBool      wxDialUpManager_IsAlwaysOnline( TSelf(wxDialUpManager) _obj );
+TBool      wxDialUpManager_IsDialing( TSelf(wxDialUpManager) _obj );
+TBool      wxDialUpManager_IsOk( TSelf(wxDialUpManager) _obj );
+TBool      wxDialUpManager_IsOnline( TSelf(wxDialUpManager) _obj );
+void       wxDialUpManager_SetConnectCommand( TSelf(wxDialUpManager) _obj, void* commandDial, void* commandHangup );
+void       wxDialUpManager_SetOnlineStatus( TSelf(wxDialUpManager) _obj, TBool isOnline );
+void       wxDialUpManager_SetWellKnownHost( TSelf(wxDialUpManager) _obj, void* hostname, int portno );
+
+/* wxDialog */
+TClassDefExtend(wxDialog,wxWindow)
+TClass(wxDialog) wxDialog_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxDialog_EndModal( TSelf(wxDialog) _obj, int retCode );
+int        wxDialog_GetReturnCode( TSelf(wxDialog) _obj );
+TBool      wxDialog_IsModal( TSelf(wxDialog) _obj );
+void       wxDialog_SetIcons( TSelf(wxDialog) _obj, void* _icons );
+void       wxDialog_SetReturnCode( TSelf(wxDialog) _obj, int returnCode );
+int        wxDialog_ShowModal( TSelf(wxDialog) _obj );
+
+/* wxDirDialog */
+TClassDefExtend(wxDirDialog,wxDialog)
+TClass(wxDirDialog) wxDirDialog_Create( TClass(wxWindow) _prt, TStringVoid _msg, TStringVoid _dir, TPoint(_lft,_top), int _stl );
+TStringLen wxDirDialog_GetMessage( TSelf(wxDirDialog) _obj, TStringOutVoid _buf );
+TStringLen wxDirDialog_GetPath( TSelf(wxDirDialog) _obj, TStringOutVoid _buf );
+int        wxDirDialog_GetStyle( TSelf(wxDirDialog) _obj );
+void       wxDirDialog_SetMessage( TSelf(wxDirDialog) _obj, TStringVoid msg );
+void       wxDirDialog_SetPath( TSelf(wxDirDialog) _obj, TStringVoid pth );
+void       wxDirDialog_SetStyle( TSelf(wxDirDialog) _obj, int style );
+
+/* wxDirTraverser */
+TClassDef(wxDirTraverser)
+
+/* wxDllLoader */
+TClassDef(wxDllLoader)
+/*
+void*      wxDllLoader_GetSymbol( int _handle, TStringVoid _name );
+int        wxDllLoader_LoadLibrary( TStringVoid _name, void* _success );
+void       wxDllLoader_UnloadLibrary( int _handle );
+*/
+
+/* wxDocChildFrame */
+TClassDefExtend(wxDocChildFrame,wxFrame)
+
+/* wxDocMDIChildFrame */
+TClassDefExtend(wxDocMDIChildFrame,wxMDIChildFrame)
+
+/* wxDocMDIParentFrame */
+TClassDefExtend(wxDocMDIParentFrame,wxMDIParentFrame)
+
+/* wxDocManager */
+TClassDefExtend(wxDocManager,wxEvtHandler)
+
+/* wxDocParentFrame */
+TClassDefExtend(wxDocParentFrame,wxFrame)
+
+/* wxDocTemplate */
+TClassDefExtend(wxDocTemplate,wxObject)
+
+/* wxDocument */
+TClassDefExtend(wxDocument,wxEvtHandler)
+
+/* wxDragImage */
+TClassDefExtend(wxDragImage,wxObject)
+
+/* wxDrawControl */
+TClassDefExtend(wxDrawControl,wxControl)
+TClass(wxDrawControl) wxDrawControl_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+
+/* wxDrawWindow */
+TClassDefExtend(wxDrawWindow,wxWindow)
+TClass(wxDrawWindow) wxDrawWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+
+/* wxDropFilesEvent */
+TClassDefExtend(wxDropFilesEvent,wxEvent)
+
+/* wxDropSource */
+TClassDef(wxDropSource)
+TClass(wxDropSource) DropSource_Create( TClass(wxDataObject) data, TClass(wxWindow) win, void* copy, void* move, void* none );
+void       DropSource_Delete( TSelf(wxDropSource) _obj );
+int        DropSource_DoDragDrop( TSelf(wxDropSource) _obj, int _move );
+
+/* wxDropTarget */
+TClassDef(wxDropTarget)
+void       wxDropTarget_GetData( TSelf(wxDropTarget) _obj );
+void       wxDropTarget_SetDataObject( TSelf(wxDropTarget) _obj, TClass(wxDataObject) _dat );
+
+/* wxDynToolInfo */
+TClassDefExtend(wxDynToolInfo,wxToolLayoutItem)
+int        wxDynToolInfo_Index( TSelf(wxDynToolInfo) _obj );
+void       wxDynToolInfo_RealSize( TSelf(wxDynToolInfo) _obj, TSizeOutVoid(_w,_h) );
+void*      wxDynToolInfo_pToolWnd( TSelf(wxDynToolInfo) _obj );
+
+/* wxDynamicLibrary */
+TClassDef(wxDynamicLibrary)
+
+/* wxDynamicSashWindow */
+TClassDefExtend(wxDynamicSashWindow,wxWindow)
+TClass(wxDynamicSashWindow) wxDynamicSashWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
+void       wxDynamicSashWindow_Delete( TSelf(wxDynamicSashWindow) _obj );
+void*      wxDynamicSashWindow_GetHScrollBar( TSelf(wxDynamicSashWindow) _obj, TClass(wxWindow) child );
+void*      wxDynamicSashWindow_GetVScrollBar( TSelf(wxDynamicSashWindow) _obj, TClass(wxWindow) child );
+
+/* wxDynamicToolBar */
+TClassDefExtend(wxDynamicToolBar,wxToolBarBase)
+void       wxDynamicToolBar_AddSeparator( TSelf(wxDynamicToolBar) _obj, void* pSepartorWnd );
+void       wxDynamicToolBar_AddTool( TSelf(wxDynamicToolBar) _obj, int toolIndex, void* pToolWindow, TSize(w,h) );
+void*      wxDynamicToolBar_AddToolBitmap( TSelf(wxDynamicToolBar) _obj, int toolIndex, TClass(wxBitmap) bitmap, void* pushedBitmap, int toggle, TPoint(x,y), TClass(wxClientData) clientData, void* helpString1, void* helpString2 );
+void       wxDynamicToolBar_AddToolImage( TSelf(wxDynamicToolBar) _obj, int toolIndex, void* imageFileName, int imageFileType, void* labelText, int alignTextRight, TBool isFlat );
+void       wxDynamicToolBar_AddToolLabel( TSelf(wxDynamicToolBar) _obj, int toolIndex, void* labelBmp, void* labelText, int alignTextRight, TBool isFlat );
+TClass(wxDynamicToolBar) wxDynamicToolBar_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style, int orientation, int RowsOrColumns );
+TClass(wxDynamicToolBar) wxDynamicToolBar_CreateDefault(  );
+void*      wxDynamicToolBar_CreateDefaultLayout( TSelf(wxDynamicToolBar) _obj );
+int        wxDynamicToolBar_CreateParams( TSelf(wxDynamicToolBar) _obj, TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style, int orientation, int RowsOrColumns );
+void*      wxDynamicToolBar_CreateTool( TSelf(wxDynamicToolBar) _obj, int id, void* label, void* bmpNormal, void* bmpDisabled, int kind, TClass(wxClientData) clientData, void* shortHelp, void* longHelp );
+void*      wxDynamicToolBar_CreateToolControl( TSelf(wxDynamicToolBar) _obj, TClass(wxControl) control );
+void       wxDynamicToolBar_Delete( TSelf(wxDynamicToolBar) _obj );
+int        wxDynamicToolBar_DoDeleteTool( TSelf(wxDynamicToolBar) _obj, int pos, void* tool );
+void       wxDynamicToolBar_DoEnableTool( TSelf(wxDynamicToolBar) _obj, void* tool, TBool enable );
+int        wxDynamicToolBar_DoInsertTool( TSelf(wxDynamicToolBar) _obj, int pos, void* tool );
+void       wxDynamicToolBar_DoSetToggle( TSelf(wxDynamicToolBar) _obj, void* tool, int toggle );
+void       wxDynamicToolBar_DoToggleTool( TSelf(wxDynamicToolBar) _obj, void* tool, int toggle );
+void       wxDynamicToolBar_DrawSeparator( TSelf(wxDynamicToolBar) _obj, void* info, TClass(wxDC) dc );
+void       wxDynamicToolBar_EnableTool( TSelf(wxDynamicToolBar) _obj, int toolIndex, TBool enable );
+void*      wxDynamicToolBar_FindToolForPosition( TSelf(wxDynamicToolBar) _obj, TPoint(x,y) );
+void       wxDynamicToolBar_GetPreferredDim( TSelf(wxDynamicToolBar) _obj, int gw, int gh, void* pw, void* ph );
+void*      wxDynamicToolBar_GetToolInfo( TSelf(wxDynamicToolBar) _obj, int toolIndex );
+int        wxDynamicToolBar_Layout( TSelf(wxDynamicToolBar) _obj );
+void       wxDynamicToolBar_RemoveTool( TSelf(wxDynamicToolBar) _obj, int toolIndex );
+void       wxDynamicToolBar_SetLayout( TSelf(wxDynamicToolBar) _obj, void* pLayout );
+
+/* wxEditableListBox */
+TClassDefExtend(wxEditableListBox,wxPanel)
+TClass(wxEditableListBox) wxEditableListBox_Create( TClass(wxWindow) parent, int id, TStringVoid label, TRect(x,y,w,h), int style );
+void*      wxEditableListBox_GetDelButton( TSelf(wxEditableListBox) _obj );
+void*      wxEditableListBox_GetDownButton( TSelf(wxEditableListBox) _obj );
+void*      wxEditableListBox_GetEditButton( TSelf(wxEditableListBox) _obj );
+TClass(wxListCtrl) wxEditableListBox_GetListCtrl( TSelf(wxEditableListBox) _obj );
+void*      wxEditableListBox_GetNewButton( TSelf(wxEditableListBox) _obj );
+TArrayLen  wxEditableListBox_GetStrings( TSelf(wxEditableListBox) _obj, TArrayStringOutVoid _ref );
+void*      wxEditableListBox_GetUpButton( TSelf(wxEditableListBox) _obj );
+void       wxEditableListBox_SetStrings( TSelf(wxEditableListBox) _obj, void* strings, int _n );
+
+/* wxEncodingConverter */
+TClassDefExtend(wxEncodingConverter,wxObject)
+void       wxEncodingConverter_Convert( TSelf(wxEncodingConverter) _obj, void* input, void* output );
+TClass(wxEncodingConverter) wxEncodingConverter_Create(  );
+void       wxEncodingConverter_Delete( TSelf(wxEncodingConverter) _obj );
+int        wxEncodingConverter_GetAllEquivalents( TSelf(wxEncodingConverter) _obj, int enc, TClass(wxList) _lst );
+int        wxEncodingConverter_GetPlatformEquivalents( TSelf(wxEncodingConverter) _obj, int enc, int platform, TClass(wxList) _lst );
+int        wxEncodingConverter_Init( TSelf(wxEncodingConverter) _obj, int input_enc, int output_enc, int method );
+
+/* wxEraseEvent */
+TClassDefExtend(wxEraseEvent,wxEvent)
+void       wxEraseEvent_CopyObject( TSelf(wxEraseEvent) _obj, void* obj );
+TClass(wxDC) wxEraseEvent_GetDC( TSelf(wxEraseEvent) _obj );
+
+/* wxEvent */
+TClassDefExtend(wxEvent,wxObject)
+void       wxEvent_CopyObject( TSelf(wxEvent) _obj, void* object_dest );
+TClass(wxObject) wxEvent_GetEventObject( TSelf(wxEvent) _obj );
+int        wxEvent_GetEventType( TSelf(wxEvent) _obj );
+int        wxEvent_GetId( TSelf(wxEvent) _obj );
+TBool      wxEvent_GetSkipped( TSelf(wxEvent) _obj );
+int        wxEvent_GetTimestamp( TSelf(wxEvent) _obj );
+TBool      wxEvent_IsCommandEvent( TSelf(wxEvent) _obj );
+int        wxEvent_NewEventType(  );
+void       wxEvent_SetEventObject( TSelf(wxEvent) _obj, TClass(wxObject) obj );
+void       wxEvent_SetEventType( TSelf(wxEvent) _obj, int typ );
+void       wxEvent_SetId( TSelf(wxEvent) _obj, int Id );
+void       wxEvent_SetTimestamp( TSelf(wxEvent) _obj, int ts );
+void       wxEvent_Skip( TSelf(wxEvent) _obj );
+
+/* wxEvtHandler */
+TClassDefExtend(wxEvtHandler,wxObject)
+void       wxEvtHandler_AddPendingEvent( TSelf(wxEvtHandler) _obj, TClass(wxEvent) event );
+int        wxEvtHandler_Connect( TSelf(wxEvtHandler) _obj, int first, int last, int type, void* data );
+TClass(wxEvtHandler) wxEvtHandler_Create(  );
+void       wxEvtHandler_Delete( TSelf(wxEvtHandler) _obj );
+int        wxEvtHandler_Disconnect( TSelf(wxEvtHandler) _obj, int first, int last, int type, int id );
+TBool      wxEvtHandler_GetEvtHandlerEnabled( TSelf(wxEvtHandler) _obj );
+TClass(wxEvtHandler) wxEvtHandler_GetNextHandler( TSelf(wxEvtHandler) _obj );
+TClass(wxEvtHandler) wxEvtHandler_GetPreviousHandler( TSelf(wxEvtHandler) _obj );
+int        wxEvtHandler_ProcessEvent( TSelf(wxEvtHandler) _obj, TClass(wxEvent) event );
+void       wxEvtHandler_ProcessPendingEvents( TSelf(wxEvtHandler) _obj );
+void       wxEvtHandler_SetEvtHandlerEnabled( TSelf(wxEvtHandler) _obj, TBool enabled );
+void       wxEvtHandler_SetNextHandler( TSelf(wxEvtHandler) _obj, TClass(wxEvtHandler) handler );
+void       wxEvtHandler_SetPreviousHandler( TSelf(wxEvtHandler) _obj, TClass(wxEvtHandler) handler );
+
+/* wxExpr */
+TClassDef(wxExpr)
+
+/* wxExprDatabase */
+TClassDefExtend(wxExprDatabase,wxList)
+
+/* wxFFile */
+TClassDef(wxFFile)
+
+/* wxFFileInputStream */
+TClassDefExtend(wxFFileInputStream,wxInputStream)
+
+/* wxFFileOutputStream */
+TClassDefExtend(wxFFileOutputStream,wxOutputStream)
+
+/* wxFSFile */
+TClassDefExtend(wxFSFile,wxObject)
+
+/* wxFTP */
+TClassDefExtend(wxFTP,wxProtocol)
+
+/* wxFileDataObject */
+TClassDefExtend(wxFileDataObject,wxDataObjectSimple)
+void       FileDataObject_AddFile( TSelf(wxFileDataObject) _obj, TStringVoid _fle );
+TClass(wxFileDataObject) FileDataObject_Create( TArrayString(_cnt, _lst) );
+void       FileDataObject_Delete( TSelf(wxFileDataObject) _obj );
+TArrayLen        FileDataObject_GetFilenames( TSelf(wxFileDataObject) _obj, TArrayStringOutVoid _lst );
+
+/* wxFileDialog */
+TClassDefExtend(wxFileDialog,wxDialog)
+TClass(wxFileDialog) wxFileDialog_Create( TClass(wxWindow) _prt, TStringVoid _msg, TStringVoid _dir, TStringVoid _fle, TStringVoid _wcd, TPoint(_lft,_top), int _stl );
+TStringLen wxFileDialog_GetDirectory( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
+TStringLen wxFileDialog_GetFilename( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
+TArrayLen  wxFileDialog_GetFilenames( TSelf(wxFileDialog) _obj, TArrayStringOutVoid paths );
+int        wxFileDialog_GetFilterIndex( TSelf(wxFileDialog) _obj );
+TStringLen wxFileDialog_GetMessage( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
+TStringLen wxFileDialog_GetPath( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
+TArrayLen  wxFileDialog_GetPaths( TSelf(wxFileDialog) _obj, TArrayStringOutVoid paths );
+int        wxFileDialog_GetStyle( TSelf(wxFileDialog) _obj );
+TStringLen wxFileDialog_GetWildcard( TSelf(wxFileDialog) _obj, TStringOutVoid _buf );
+void       wxFileDialog_SetDirectory( TSelf(wxFileDialog) _obj, TStringVoid dir );
+void       wxFileDialog_SetFilename( TSelf(wxFileDialog) _obj, TStringVoid name );
+void       wxFileDialog_SetFilterIndex( TSelf(wxFileDialog) _obj, int filterIndex );
+void       wxFileDialog_SetMessage( TSelf(wxFileDialog) _obj, TStringVoid message );
+void       wxFileDialog_SetPath( TSelf(wxFileDialog) _obj, TStringVoid path );
+void       wxFileDialog_SetStyle( TSelf(wxFileDialog) _obj, int style );
+void       wxFileDialog_SetWildcard( TSelf(wxFileDialog) _obj, TStringVoid wildCard );
+
+/* wxFileDropTarget */
+TClassDefExtend(wxFileDropTarget,wxDropTarget)
+
+/* wxFileHistory */
+TClassDefExtend(wxFileHistory,wxObject)
+void       wxFileHistory_AddFileToHistory( TSelf(wxFileHistory) _obj, TStringVoid file );
+void       wxFileHistory_AddFilesToMenu( TSelf(wxFileHistory) _obj, TClass(wxMenu) menu );
+TClass(wxFileHistory) wxFileHistory_Create( int maxFiles );
+void       wxFileHistory_Delete( TSelf(wxFileHistory) _obj );
+int        wxFileHistory_GetCount( TSelf(wxFileHistory) _obj );
+TStringLen wxFileHistory_GetHistoryFile( TSelf(wxFileHistory) _obj, int i, TStringOutVoid _buf );
+int        wxFileHistory_GetMaxFiles( TSelf(wxFileHistory) _obj );
+TArrayLen  wxFileHistory_GetMenus( TSelf(wxFileHistory) _obj, TArrayObjectOutVoid(wxMenu) _ref );
+void       wxFileHistory_Load( TSelf(wxFileHistory) _obj, TClass(wxConfigBase) config );
+void       wxFileHistory_RemoveFileFromHistory( TSelf(wxFileHistory) _obj, int i );
+void       wxFileHistory_RemoveMenu( TSelf(wxFileHistory) _obj, TClass(wxMenu) menu );
+void       wxFileHistory_Save( TSelf(wxFileHistory) _obj, TClass(wxConfigBase) config );
+void       wxFileHistory_UseMenu( TSelf(wxFileHistory) _obj, TClass(wxMenu) menu );
+
+/* wxFileInputStream */
+TClassDefExtend(wxFileInputStream,wxInputStream)
+
+/* wxFileName */
+TClassDef(wxFileName)
+
+/* wxFileOutputStream */
+TClassDefExtend(wxFileOutputStream,wxOutputStream)
+
+/* wxFileSystem */
+TClassDefExtend(wxFileSystem,wxObject)
+
+/* wxFileSystemHandler */
+TClassDefExtend(wxFileSystemHandler,wxObject)
+
+/* wxFileType */
+TClassDef(wxFileType)
+void       wxFileType_Delete( TSelf(wxFileType) _obj );
+TStringLen wxFileType_ExpandCommand( TSelf(wxFileType) _obj, void* _cmd, void* _params, TStringOutVoid _buf );
+TStringLen wxFileType_GetDescription( TSelf(wxFileType) _obj, TStringOutVoid _buf );
+int        wxFileType_GetExtensions( TSelf(wxFileType) _obj, TClass(wxList) _lst );
+int        wxFileType_GetIcon( TSelf(wxFileType) _obj, TClass(wxIcon) icon );
+TStringLen wxFileType_GetMimeType( TSelf(wxFileType) _obj, TStringOutVoid _buf );
+int        wxFileType_GetMimeTypes( TSelf(wxFileType) _obj, TClass(wxList) _lst );
+int        wxFileType_GetOpenCommand( TSelf(wxFileType) _obj, void* _buf, void* _params );
+int        wxFileType_GetPrintCommand( TSelf(wxFileType) _obj, void* _buf, void* _params );
+
+/* wxFilterInputStream */
+TClassDefExtend(wxFilterInputStream,wxInputStream)
+
+/* wxFilterOutputStream */
+TClassDefExtend(wxFilterOutputStream,wxOutputStream)
+
+/* wxFindDialogEvent */
+TClassDefExtend(wxFindDialogEvent,wxCommandEvent)
+int        wxFindDialogEvent_GetFindString( TSelf(wxFindDialogEvent) _obj, void* _ref );
+int        wxFindDialogEvent_GetFlags( TSelf(wxFindDialogEvent) _obj );
+int        wxFindDialogEvent_GetReplaceString( TSelf(wxFindDialogEvent) _obj, void* _ref );
+
+/* wxFindReplaceData */
+TClassDefExtend(wxFindReplaceData,wxObject)
+TClass(wxFindReplaceData) wxFindReplaceData_Create( int flags );
+TClass(wxFindReplaceData) wxFindReplaceData_CreateDefault(  );
+void       wxFindReplaceData_Delete( TSelf(wxFindReplaceData) _obj );
+TStringLen wxFindReplaceData_GetFindString( TSelf(wxFindReplaceData) _obj, TStringOutVoid _ref );
+int        wxFindReplaceData_GetFlags( TSelf(wxFindReplaceData) _obj );
+TStringLen wxFindReplaceData_GetReplaceString( TSelf(wxFindReplaceData) _obj, TStringOutVoid _ref );
+void       wxFindReplaceData_SetFindString( TSelf(wxFindReplaceData) _obj, TStringVoid str );
+void       wxFindReplaceData_SetFlags( TSelf(wxFindReplaceData) _obj, int flags );
+void       wxFindReplaceData_SetReplaceString( TSelf(wxFindReplaceData) _obj, TStringVoid str );
+
+/* wxFindReplaceDialog */
+TClassDefExtend(wxFindReplaceDialog,wxDialog)
+TClass(wxFindReplaceDialog) wxFindReplaceDialog_Create( TClass(wxWindow) parent, TClass(wxFindReplaceData) data, TStringVoid title, int style );
+TClass(wxFindReplaceData)   wxFindReplaceDialog_GetData( TSelf(wxFindReplaceDialog) _obj );
+void       wxFindReplaceDialog_SetData( TSelf(wxFindReplaceDialog) _obj, TClass(wxFindReplaceData) data );
+
+/* wxFlexGridSizer */
+TClassDefExtend(wxFlexGridSizer,wxGridSizer)
+void       wxFlexGridSizer_AddGrowableCol( TSelf(wxFlexGridSizer) _obj, size_t idx );
+void       wxFlexGridSizer_AddGrowableRow( TSelf(wxFlexGridSizer) _obj, size_t idx );
+void       wxFlexGridSizer_CalcMin( TSelf(wxFlexGridSizer) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxFlexGridSizer) wxFlexGridSizer_Create( int rows, int cols, int vgap, int hgap );
+void       wxFlexGridSizer_RecalcSizes( TSelf(wxFlexGridSizer) _obj );
+void       wxFlexGridSizer_RemoveGrowableCol( TSelf(wxFlexGridSizer) _obj, size_t idx );
+void       wxFlexGridSizer_RemoveGrowableRow( TSelf(wxFlexGridSizer) _obj, size_t idx );
+
+/* wxFocusEvent */
+TClassDefExtend(wxFocusEvent,wxEvent)
+
+/* wxFont */
+TClassDefExtend(wxFont,wxGDIObject)
+TClass(wxFont) wxFont_Create( int pointSize, int family, int style, int weight, int underlined, TString face, int enc );
+TClass(wxFont) wxFont_CreateDefault(  );
+void       wxFont_Delete( TSelf(wxFont) _obj );
+int        wxFont_GetDefaultEncoding( TSelf(wxFont) _obj );
+int        wxFont_GetEncoding( TSelf(wxFont) _obj );
+TStringLen wxFont_GetFaceName( TSelf(wxFont) _obj, TStringOutVoid _buf );
+int        wxFont_GetFamily( TSelf(wxFont) _obj );
+TStringLen wxFont_GetFamilyString( TSelf(wxFont) _obj, TStringOutVoid _buf );
+int        wxFont_GetPointSize( TSelf(wxFont) _obj );
+int        wxFont_GetStyle( TSelf(wxFont) _obj );
+TStringLen wxFont_GetStyleString( TSelf(wxFont) _obj, TStringOutVoid _buf );
+int        wxFont_GetUnderlined( TSelf(wxFont) _obj );
+int        wxFont_GetWeight( TSelf(wxFont) _obj );
+TStringLen wxFont_GetWeightString( TSelf(wxFont) _obj, TStringOutVoid _buf );
+TBool      wxFont_Ok( TSelf(wxFont) _obj );
+void       wxFont_SetDefaultEncoding( TSelf(wxFont) _obj, int encoding );
+void       wxFont_SetEncoding( TSelf(wxFont) _obj, int encoding );
+void       wxFont_SetFaceName( TSelf(wxFont) _obj, TString faceName );
+void       wxFont_SetFamily( TSelf(wxFont) _obj, int family );
+void       wxFont_SetPointSize( TSelf(wxFont) _obj, int pointSize );
+void       wxFont_SetStyle( TSelf(wxFont) _obj, int style );
+void       wxFont_SetUnderlined( TSelf(wxFont) _obj, int underlined );
+void       wxFont_SetWeight( TSelf(wxFont) _obj, int weight );
+
+/* wxFontData */
+TClassDefExtend(wxFontData,wxObject)
+TClass(wxFontData) wxFontData_Create(  );
+void       wxFontData_Delete( TSelf(wxFontData) _obj );
+void       wxFontData_EnableEffects( TSelf(wxFontData) _obj, TBool flag );
+TBool      wxFontData_GetAllowSymbols( TSelf(wxFontData) _obj );
+void       wxFontData_GetChosenFont( TSelf(wxFontData) _obj, TClassRef(wxFont) ref );
+void       wxFontData_GetColour( TSelf(wxFontData) _obj, TClassRef(wxColour) _ref );
+TBool      wxFontData_GetEnableEffects( TSelf(wxFontData) _obj );
+int        wxFontData_GetEncoding( TSelf(wxFontData) _obj );
+void       wxFontData_GetInitialFont( TSelf(wxFontData) _obj, TClassRef(wxFont) ref );
+int        wxFontData_GetShowHelp( TSelf(wxFontData) _obj );
+void       wxFontData_SetAllowSymbols( TSelf(wxFontData) _obj, TBool flag );
+void       wxFontData_SetChosenFont( TSelf(wxFontData) _obj, TClass(wxFont) font );
+void       wxFontData_SetColour( TSelf(wxFontData) _obj, TClass(wxColour) colour );
+void       wxFontData_SetEncoding( TSelf(wxFontData) _obj, int encoding );
+void       wxFontData_SetInitialFont( TSelf(wxFontData) _obj, TClass(wxFont) font );
+void       wxFontData_SetRange( TSelf(wxFontData) _obj, int minRange, int maxRange );
+void       wxFontData_SetShowHelp( TSelf(wxFontData) _obj, TBool flag );
+
+/* wxFontDialog */
+TClassDefExtend(wxFontDialog,wxDialog)
+TClass(wxFontDialog) wxFontDialog_Create( TClass(wxWindow) _prt, TClass(wxFontData) fnt );
+void       wxFontDialog_GetFontData( TSelf(wxFontDialog) _obj, TClassRef(wxFontData) _ref );
+
+/* wxFontEnumerator */
+TClassDef(wxFontEnumerator)
+TClass(wxFontEnumerator) wxFontEnumerator_Create( void* _obj, void* _fnc );
+void       wxFontEnumerator_Delete( TSelf(wxFontEnumerator) _obj );
+int        wxFontEnumerator_EnumerateEncodings( TSelf(wxFontEnumerator) _obj, TStringVoid facename );
+int        wxFontEnumerator_EnumerateFacenames( TSelf(wxFontEnumerator) _obj, int encoding, int fixedWidthOnly );
+
+/* wxFontList */
+TClassDefExtend(wxFontList,wxList)
+
+/* wxFontMapper */
+TClassDef(wxFontMapper)
+TClass(wxFontMapper) wxFontMapper_Create(  );
+TStringLen wxFontMapper_GetAltForEncoding( TSelf(wxFontMapper) _obj, int encoding, void* alt_encoding, TStringOutVoid _buf );
+TStringLen wxFontMapper_IsEncodingAvailable( TSelf(wxFontMapper) _obj, int encoding, TStringOutVoid _buf );
+
+/* wxFrame */
+TClassDefExtend(wxFrame,wxWindow)
+TClass(wxFrame) wxFrame_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+TClass(wxStatusBar) wxFrame_CreateStatusBar( TSelf(wxFrame) _obj, int number, int style );
+TClass(wxToolBar)   wxFrame_CreateToolBar( TSelf(wxFrame) _obj, long style );
+int        wxFrame_GetClientAreaOrigin_left( TSelf(wxFrame) _obj );
+int        wxFrame_GetClientAreaOrigin_top( TSelf(wxFrame) _obj );
+TClass(wxIcon) wxFrame_GetIcon( TSelf(wxFrame) _obj );
+TClass(wxMenuBar) wxFrame_GetMenuBar( TSelf(wxFrame) _obj );
+TClass(wxStatusBar) wxFrame_GetStatusBar( TSelf(wxFrame) _obj );
+TClass(wxToolBar) wxFrame_GetToolBar( TSelf(wxFrame) _obj );
+void       wxFrame_Iconize( TSelf(wxFrame) _obj );
+TBool      wxFrame_IsIconized( TSelf(wxFrame) _obj );
+TBool      wxFrame_IsMaximized( TSelf(wxFrame) _obj );
+void       wxFrame_Maximize( TSelf(wxFrame) _obj );
+void       wxFrame_Restore( TSelf(wxFrame) _obj );
+void       wxFrame_SetIcon( TSelf(wxFrame) _obj, TClass(wxIcon) _icon );
+void       wxFrame_SetIcons( TSelf(wxFrame) _obj, void* _icons );
+void       wxFrame_SetMenuBar( TSelf(wxFrame) _obj, TClass(wxMenuBar) menubar );
+void       wxFrame_SetStatusBar( TSelf(wxFrame) _obj, TClass(wxStatusBar) statBar );
+void       wxFrame_SetStatusText( TSelf(wxFrame) _obj, TString _txt, int _number );
+void       wxFrame_SetStatusWidths( TSelf(wxFrame) _obj, int _n, void* _widths_field );
+void       wxFrame_SetToolBar( TSelf(wxFrame) _obj, TClass(wxToolBar) _toolbar );
+
+/* wxFrameLayout */
+TClassDefExtend(wxFrameLayout,wxEvtHandler)
+void       wxFrameLayout_Activate( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_AddBar( TSelf(wxFrameLayout) _obj, void* pBarWnd, void* dimInfo, int alignment, int rowNo, int columnPos, TStringVoid name, int spyEvents, int state );
+void       wxFrameLayout_AddPlugin( TSelf(wxFrameLayout) _obj, void* pPlInfo, int paneMask );
+void       wxFrameLayout_AddPluginBefore( TSelf(wxFrameLayout) _obj, void* pNextPlInfo, void* pPlInfo, int paneMask );
+void       wxFrameLayout_ApplyBarProperties( TSelf(wxFrameLayout) _obj, void* pBar );
+void       wxFrameLayout_CaptureEventsForPane( TSelf(wxFrameLayout) _obj, void* toPane );
+void       wxFrameLayout_CaptureEventsForPlugin( TSelf(wxFrameLayout) _obj, void* pPlugin );
+TClass(wxFrameLayout) wxFrameLayout_Create( void* pParentFrame, void* pFrameClient, int activateNow );
+void       wxFrameLayout_Deactivate( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_Delete( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_DestroyBarWindows( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_EnableFloating( TSelf(wxFrameLayout) _obj, TBool enable );
+void*      wxFrameLayout_FindBarByName( TSelf(wxFrameLayout) _obj, TStringVoid name );
+void*      wxFrameLayout_FindBarByWindow( TSelf(wxFrameLayout) _obj, void* pWnd );
+void*      wxFrameLayout_FindPlugin( TSelf(wxFrameLayout) _obj, void* pPlInfo );
+void       wxFrameLayout_FirePluginEvent( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+int        wxFrameLayout_GetBars( TSelf(wxFrameLayout) _obj, void* _ref );
+int        wxFrameLayout_GetClientHeight( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_GetClientRect( TSelf(wxFrameLayout) _obj, TRectOutVoid(_x,_y,_w,_h) );
+int        wxFrameLayout_GetClientWidth( TSelf(wxFrameLayout) _obj );
+void*      wxFrameLayout_GetFrameClient( TSelf(wxFrameLayout) _obj );
+void*      wxFrameLayout_GetPane( TSelf(wxFrameLayout) _obj, int alignment );
+void       wxFrameLayout_GetPaneProperties( TSelf(wxFrameLayout) _obj, void* props, int alignment );
+void*      wxFrameLayout_GetParentFrame( TSelf(wxFrameLayout) _obj );
+void*      wxFrameLayout_GetTopPlugin( TSelf(wxFrameLayout) _obj );
+void*      wxFrameLayout_GetUpdatesManager( TSelf(wxFrameLayout) _obj );
+TBool      wxFrameLayout_HasTopPlugin( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_HideBarWindows( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_InverseVisibility( TSelf(wxFrameLayout) _obj, void* pBar );
+void       wxFrameLayout_OnLButtonDown( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+void       wxFrameLayout_OnLButtonUp( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+void       wxFrameLayout_OnLDblClick( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+void       wxFrameLayout_OnMouseMove( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+void       wxFrameLayout_OnRButtonDown( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+void       wxFrameLayout_OnRButtonUp( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+void       wxFrameLayout_OnSize( TSelf(wxFrameLayout) _obj, TClass(wxEvent) event );
+void       wxFrameLayout_PopAllPlugins( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_PopPlugin( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_PushDefaultPlugins( TSelf(wxFrameLayout) _obj );
+void       wxFrameLayout_PushPlugin( TSelf(wxFrameLayout) _obj, void* pPugin );
+void       wxFrameLayout_RecalcLayout( TSelf(wxFrameLayout) _obj, int repositionBarsNow );
+int        wxFrameLayout_RedockBar( TSelf(wxFrameLayout) _obj, void* pBar, TRect(x,y,w,h), void* pToPane, int updateNow );
+void       wxFrameLayout_RefreshNow( TSelf(wxFrameLayout) _obj, int recalcLayout );
+void       wxFrameLayout_ReleaseEventsFromPane( TSelf(wxFrameLayout) _obj, void* fromPane );
+void       wxFrameLayout_ReleaseEventsFromPlugin( TSelf(wxFrameLayout) _obj, void* pPlugin );
+void       wxFrameLayout_RemoveBar( TSelf(wxFrameLayout) _obj, void* pBar );
+void       wxFrameLayout_RemovePlugin( TSelf(wxFrameLayout) _obj, void* pPlInfo );
+void       wxFrameLayout_SetBarState( TSelf(wxFrameLayout) _obj, void* pBar, int newStatem, int updateNow );
+void       wxFrameLayout_SetFrameClient( TSelf(wxFrameLayout) _obj, void* pFrameClient );
+void       wxFrameLayout_SetMargins( TSelf(wxFrameLayout) _obj, int top, int bottom, int left, int right, int paneMask );
+void       wxFrameLayout_SetPaneBackground( TSelf(wxFrameLayout) _obj, TClass(wxColour) colour );
+void       wxFrameLayout_SetPaneProperties( TSelf(wxFrameLayout) _obj, void* props, int paneMask );
+void       wxFrameLayout_SetTopPlugin( TSelf(wxFrameLayout) _obj, void* pPlugin );
+void       wxFrameLayout_SetUpdatesManager( TSelf(wxFrameLayout) _obj, void* pUMgr );
+
+/* wxGDIObject */
+TClassDefExtend(wxGDIObject,wxObject)
+
+/* wxGLCanvas */
+TClassDefExtend(wxGLCanvas,wxScrolledWindow)
+
+/* wxGauge */
+TClassDefExtend(wxGauge,wxControl)
+TClass(wxGauge) wxGauge_Create( TClass(wxWindow) _prt, int _id, int _rng, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxGauge_GetBezelFace( TSelf(wxGauge) _obj );
+int        wxGauge_GetRange( TSelf(wxGauge) _obj );
+int        wxGauge_GetShadowWidth( TSelf(wxGauge) _obj );
+int        wxGauge_GetValue( TSelf(wxGauge) _obj );
+void       wxGauge_SetBezelFace( TSelf(wxGauge) _obj, int w );
+void       wxGauge_SetRange( TSelf(wxGauge) _obj, int r );
+void       wxGauge_SetShadowWidth( TSelf(wxGauge) _obj, int w );
+void       wxGauge_SetValue( TSelf(wxGauge) _obj, int pos );
+
+/* wxGenericDirCtrl */
+TClassDefExtend(wxGenericDirCtrl,wxControl)
+
+/* wxGenericValidator */
+TClassDefExtend(wxGenericValidator,wxValidator)
+
+/* wxGrid */
+TClassDefExtend(wxGrid,wxScrolledWindow)
+TBoolInt   wxGrid_AppendCols( TSelf(wxGrid) _obj, int numCols, TBoolInt updateLabels );
+TBoolInt   wxGrid_AppendRows( TSelf(wxGrid) _obj, int numRows, TBoolInt updateLabels );
+void       wxGrid_AutoSize( TSelf(wxGrid) _obj );
+void       wxGrid_AutoSizeColumn( TSelf(wxGrid) _obj, int col, TBoolInt setAsMin );
+void       wxGrid_AutoSizeColumns( TSelf(wxGrid) _obj, TBoolInt setAsMin );
+void       wxGrid_AutoSizeRow( TSelf(wxGrid) _obj, int row, TBoolInt setAsMin );
+void       wxGrid_AutoSizeRows( TSelf(wxGrid) _obj, TBoolInt setAsMin );
+void       wxGrid_BeginBatch( TSelf(wxGrid) _obj );
+void       wxGrid_BlockToDeviceRect( TSelf(wxGrid) _obj, int top, int left, int bottom, int right, TRectOut(_x,_y,_w,_h) );
+void       wxGrid_CalcCellsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg );
+void       wxGrid_CalcColLabelsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg );
+void       wxGrid_CalcRowLabelsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg );
+TBool      wxGrid_CanDragColSize( TSelf(wxGrid) _obj );
+TBool      wxGrid_CanDragGridSize( TSelf(wxGrid) _obj );
+TBool      wxGrid_CanDragRowSize( TSelf(wxGrid) _obj );
+TBool      wxGrid_CanEnableCellControl( TSelf(wxGrid) _obj );
+void       wxGrid_CellToRect( TSelf(wxGrid) _obj, int row, int col, TRectOut(_x,_y,_w,_h) );
+void       wxGrid_ClearGrid( TSelf(wxGrid) _obj );
+void       wxGrid_ClearSelection( TSelf(wxGrid) _obj );
+TClass(wxGrid) wxGrid_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxGrid_CreateGrid( TSelf(wxGrid) _obj, int rows, int cols, int selmode );
+TBoolInt   wxGrid_DeleteCols( TSelf(wxGrid) _obj, int pos, int numCols, TBoolInt updateLabels );
+TBoolInt   wxGrid_DeleteRows( TSelf(wxGrid) _obj, int pos, int numRows, TBoolInt updateLabels );
+void       wxGrid_DisableCellEditControl( TSelf(wxGrid) _obj );
+void       wxGrid_DisableDragColSize( TSelf(wxGrid) _obj );
+void       wxGrid_DisableDragGridSize( TSelf(wxGrid) _obj );
+void       wxGrid_DisableDragRowSize( TSelf(wxGrid) _obj );
+void       wxGrid_DoEndDragResizeCol( TSelf(wxGrid) _obj );
+void       wxGrid_DoEndDragResizeRow( TSelf(wxGrid) _obj );
+void       wxGrid_DrawAllGridLines( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxRegion) reg );
+void       wxGrid_DrawCell( TSelf(wxGrid) _obj, TClass(wxDC) dc, int _row, int _col );
+void       wxGrid_DrawCellBorder( TSelf(wxGrid) _obj, TClass(wxDC) dc, int _row, int _col );
+void       wxGrid_DrawCellHighlight( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxGridCellAttr) attr );
+void       wxGrid_DrawColLabel( TSelf(wxGrid) _obj, TClass(wxDC) dc, int col );
+void       wxGrid_DrawColLabels( TSelf(wxGrid) _obj, TClass(wxDC) dc );
+void       wxGrid_DrawGridCellArea( TSelf(wxGrid) _obj, TClass(wxDC) dc );
+void       wxGrid_DrawGridSpace( TSelf(wxGrid) _obj, TClass(wxDC) dc );
+void       wxGrid_DrawHighlight( TSelf(wxGrid) _obj, TClass(wxDC) dc );
+void       wxGrid_DrawRowLabel( TSelf(wxGrid) _obj, TClass(wxDC) dc, int row );
+void       wxGrid_DrawRowLabels( TSelf(wxGrid) _obj, TClass(wxDC) dc );
+void       wxGrid_DrawTextRectangle( TSelf(wxGrid) _obj, TClass(wxDC) dc, TString txt, TRect(x,y,w,h), int horizontalAlignment, int verticalAlignment );
+void       wxGrid_EnableCellEditControl( TSelf(wxGrid) _obj, TBool enable );
+void       wxGrid_EnableDragColSize( TSelf(wxGrid) _obj, TBool enable );
+void       wxGrid_EnableDragGridSize( TSelf(wxGrid) _obj, TBool enable );
+void       wxGrid_EnableDragRowSize( TSelf(wxGrid) _obj, TBool enable );
+void       wxGrid_EnableEditing( TSelf(wxGrid) _obj, TBoolInt edit );
+void       wxGrid_EnableGridLines( TSelf(wxGrid) _obj, TBool enable );
+void       wxGrid_EndBatch( TSelf(wxGrid) _obj );
+int        wxGrid_GetBatchCount( TSelf(wxGrid) _obj );
+void       wxGrid_GetCellAlignment( TSelf(wxGrid) _obj, int row, int col, TSizeOut(horiz, vert) );
+void       wxGrid_GetCellBackgroundColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
+TClass(wxGridCellEditor) wxGrid_GetCellEditor( TSelf(wxGrid) _obj, int row, int col );
+void       wxGrid_GetCellFont( TSelf(wxGrid) _obj, int row, int col, TClass(wxFont) font );
+void       wxGrid_GetCellHighlightColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+TClass(wxGridCellRenderer) wxGrid_GetCellRenderer( TSelf(wxGrid) _obj, int row, int col );
+void       wxGrid_GetCellTextColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
+TStringLen wxGrid_GetCellValue( TSelf(wxGrid) _obj, int row, int col, TStringOutVoid _buf );
+void       wxGrid_GetColLabelAlignment( TSelf(wxGrid) _obj, TSizeOut(horiz, vert)  );
+int        wxGrid_GetColLabelSize( TSelf(wxGrid) _obj );
+TStringLen wxGrid_GetColLabelValue( TSelf(wxGrid) _obj, int col, TStringOutVoid _buf );
+int        wxGrid_GetColSize( TSelf(wxGrid) _obj, int col );
+void       wxGrid_GetDefaultCellAlignment( TSelf(wxGrid) _obj, TSizeOut(horiz, vert)  );
+void       wxGrid_GetDefaultCellBackgroundColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+void       wxGrid_GetDefaultCellFont( TSelf(wxGrid) _obj, TClassRef(wxFont) _ref );
+void       wxGrid_GetDefaultCellTextColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+int        wxGrid_GetDefaultColLabelSize( TSelf(wxGrid) _obj );
+int        wxGrid_GetDefaultColSize( TSelf(wxGrid) _obj );
+TClass(wxGridCellEditor) wxGrid_GetDefaultEditor( TSelf(wxGrid) _obj );
+TClass(wxGridCellEditor) wxGrid_GetDefaultEditorForCell( TSelf(wxGrid) _obj, int row, int col );
+TClass(wxGridCellEditor) wxGrid_GetDefaultEditorForType( TSelf(wxGrid) _obj, TString typeName );
+TClass(wxGridCellRenderer) wxGrid_GetDefaultRenderer( TSelf(wxGrid) _obj );
+TClass(wxGridCellRenderer) wxGrid_GetDefaultRendererForCell( TSelf(wxGrid) _obj, int row, int col );
+TClass(wxGridCellRenderer) wxGrid_GetDefaultRendererForType( TSelf(wxGrid) _obj, TString typeName );
+int        wxGrid_GetDefaultRowLabelSize( TSelf(wxGrid) _obj );
+int        wxGrid_GetDefaultRowSize( TSelf(wxGrid) _obj );
+int        wxGrid_GetGridCursorCol( TSelf(wxGrid) _obj );
+int        wxGrid_GetGridCursorRow( TSelf(wxGrid) _obj );
+void       wxGrid_GetGridLineColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+void       wxGrid_GetLabelBackgroundColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+void       wxGrid_GetLabelFont( TSelf(wxGrid) _obj, TClassRef(wxFont) _ref );
+void       wxGrid_GetLabelTextColour( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+int        wxGrid_GetNumberCols( TSelf(wxGrid) _obj );
+int        wxGrid_GetNumberRows( TSelf(wxGrid) _obj );
+void       wxGrid_GetRowLabelAlignment( TSelf(wxGrid) _obj, TSizeOut(horiz,vert) );
+int        wxGrid_GetRowLabelSize( TSelf(wxGrid) _obj );
+TStringLen wxGrid_GetRowLabelValue( TSelf(wxGrid) _obj, int row, TStringOutVoid _buf );
+int        wxGrid_GetRowSize( TSelf(wxGrid) _obj, int row );
+void       wxGrid_GetSelectionBackground( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+void       wxGrid_GetSelectionForeground( TSelf(wxGrid) _obj, TClassRef(wxColour) _ref );
+TClass(wxGridTableBase) wxGrid_GetTable( TSelf(wxGrid) _obj );
+void       wxGrid_GetTextBoxSize( TSelf(wxGrid) _obj, TClass(wxDC) dc, TArrayString(count,lines), TSizeOutVoid(_w,_h) );
+int        wxGrid_GridLinesEnabled( TSelf(wxGrid) _obj );
+void       wxGrid_HideCellEditControl( TSelf(wxGrid) _obj );
+TBoolInt   wxGrid_InsertCols( TSelf(wxGrid) _obj, int pos, int numCols, TBoolInt updateLabels );
+TBoolInt   wxGrid_InsertRows( TSelf(wxGrid) _obj, int pos, int numRows, TBoolInt updateLabels );
+TBool      wxGrid_IsCellEditControlEnabled( TSelf(wxGrid) _obj );
+TBool      wxGrid_IsCellEditControlShown( TSelf(wxGrid) _obj );
+TBool      wxGrid_IsCurrentCellReadOnly( TSelf(wxGrid) _obj );
+TBool      wxGrid_IsEditable( TSelf(wxGrid) _obj );
+TBool      wxGrid_IsInSelection( TSelf(wxGrid) _obj, int row, int col );
+TBool      wxGrid_IsReadOnly( TSelf(wxGrid) _obj, int row, int col );
+TBool      wxGrid_IsSelection( TSelf(wxGrid) _obj );
+TBool      wxGrid_IsVisible( TSelf(wxGrid) _obj, int row, int col, TBoolInt wholeCellVisible );
+void       wxGrid_MakeCellVisible( TSelf(wxGrid) _obj, int row, int col );
+TBoolInt   wxGrid_MoveCursorDown( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MoveCursorDownBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MoveCursorLeft( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MoveCursorLeftBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MoveCursorRight( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MoveCursorRightBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MoveCursorUp( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MoveCursorUpBlock( TSelf(wxGrid) _obj, TBoolInt expandSelection );
+TBoolInt   wxGrid_MovePageDown( TSelf(wxGrid) _obj );
+TBoolInt   wxGrid_MovePageUp( TSelf(wxGrid) _obj );
+void       wxGrid_ProcessColLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
+void       wxGrid_ProcessCornerLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
+void       wxGrid_ProcessGridCellMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
+void       wxGrid_ProcessRowLabelMouseEvent( TSelf(wxGrid) _obj, TClass(wxMouseEvent) event );
+int        wxGrid_ProcessTableMessage( TSelf(wxGrid) _obj, TClass(wxEvent) evt );
+void       wxGrid_RegisterDataType( TSelf(wxGrid) _obj, TString typeName, TClass(wxGridCellRenderer) renderer, TClass(wxGridCellEditor) editor );
+void       wxGrid_SaveEditControlValue( TSelf(wxGrid) _obj );
+void       wxGrid_SelectAll( TSelf(wxGrid) _obj );
+void       wxGrid_SelectBlock( TSelf(wxGrid) _obj, int topRow, int leftCol, int bottomRow, int rightCol, TBoolInt addToSelected );
+void       wxGrid_SelectCol( TSelf(wxGrid) _obj, int col, TBoolInt addToSelected );
+void       wxGrid_SelectRow( TSelf(wxGrid) _obj, int row, TBoolInt addToSelected );
+void       wxGrid_SetCellAlignment( TSelf(wxGrid) _obj, int row, int col, int horiz, int vert );
+void       wxGrid_SetCellBackgroundColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
+void       wxGrid_SetCellEditor( TSelf(wxGrid) _obj, int row, int col, TClass(wxGridCellEditor) editor );
+void       wxGrid_SetCellFont( TSelf(wxGrid) _obj, int row, int col, TClass(wxFont) font );
+void       wxGrid_SetCellHighlightColour( TSelf(wxGrid) _obj, TClass(wxColour) col );
+void       wxGrid_SetCellRenderer( TSelf(wxGrid) _obj, int row, int col, TClass(wxGridCellRenderer) renderer );
+void       wxGrid_SetCellTextColour( TSelf(wxGrid) _obj, int row, int col, TClass(wxColour) colour );
+void       wxGrid_SetCellValue( TSelf(wxGrid) _obj, int row, int col, TString s );
+void       wxGrid_SetColAttr( TSelf(wxGrid) _obj, int col, TClass(wxGridCellAttr) attr );
+void       wxGrid_SetColFormatBool( TSelf(wxGrid) _obj, int col );
+void       wxGrid_SetColFormatCustom( TSelf(wxGrid) _obj, int col, TString typeName );
+void       wxGrid_SetColFormatFloat( TSelf(wxGrid) _obj, int col, int width, int precision );
+void       wxGrid_SetColFormatNumber( TSelf(wxGrid) _obj, int col );
+void       wxGrid_SetColLabelAlignment( TSelf(wxGrid) _obj, int horiz, int vert );
+void       wxGrid_SetColLabelSize( TSelf(wxGrid) _obj, int height );
+void       wxGrid_SetColLabelValue( TSelf(wxGrid) _obj, int col, TString label );
+void       wxGrid_SetColMinimalWidth( TSelf(wxGrid) _obj, int col, int width );
+void       wxGrid_SetColSize( TSelf(wxGrid) _obj, int col, int width );
+void       wxGrid_SetDefaultCellAlignment( TSelf(wxGrid) _obj, int horiz, int vert );
+void       wxGrid_SetDefaultCellBackgroundColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
+void       wxGrid_SetDefaultCellFont( TSelf(wxGrid) _obj, TClass(wxFont) font );
+void       wxGrid_SetDefaultCellTextColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
+void       wxGrid_SetDefaultColSize( TSelf(wxGrid) _obj, int width, TBoolInt resizeExistingCols );
+void       wxGrid_SetDefaultEditor( TSelf(wxGrid) _obj, TClass(wxGridCellEditor) editor );
+void       wxGrid_SetDefaultRenderer( TSelf(wxGrid) _obj, TClass(wxGridCellRenderer) renderer );
+void       wxGrid_SetDefaultRowSize( TSelf(wxGrid) _obj, int height, TBoolInt resizeExistingRows );
+void       wxGrid_SetGridCursor( TSelf(wxGrid) _obj, int row, int col );
+void       wxGrid_SetGridLineColour( TSelf(wxGrid) _obj, TClass(wxColour) col );
+void       wxGrid_SetLabelBackgroundColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
+void       wxGrid_SetLabelFont( TSelf(wxGrid) _obj, TClass(wxFont) font );
+void       wxGrid_SetLabelTextColour( TSelf(wxGrid) _obj, TClass(wxColour) colour );
+void       wxGrid_SetMargins( TSelf(wxGrid) _obj, int extraWidth, int extraHeight );
+void       wxGrid_SetReadOnly( TSelf(wxGrid) _obj, int row, int col, TBool isReadOnly );
+void       wxGrid_SetRowAttr( TSelf(wxGrid) _obj, int row, TClass(wxGridCellAttr) attr );
+void       wxGrid_SetRowLabelAlignment( TSelf(wxGrid) _obj, int horiz, int vert );
+void       wxGrid_SetRowLabelSize( TSelf(wxGrid) _obj, int width );
+void       wxGrid_SetRowLabelValue( TSelf(wxGrid) _obj, int row, TString label );
+void       wxGrid_SetRowMinimalHeight( TSelf(wxGrid) _obj, int row, int width );
+void       wxGrid_SetRowSize( TSelf(wxGrid) _obj, int row, int height );
+void       wxGrid_SetSelectionBackground( TSelf(wxGrid) _obj, TClass(wxColour) c );
+void       wxGrid_SetSelectionForeground( TSelf(wxGrid) _obj, TClass(wxColour) c );
+void       wxGrid_SetSelectionMode( TSelf(wxGrid) _obj, int selmode );
+TBoolInt   wxGrid_SetTable( TSelf(wxGrid) _obj, TClass(wxGridTableBase) table, TBoolInt takeOwnership, int selmode );
+void       wxGrid_ShowCellEditControl( TSelf(wxGrid) _obj );
+int        wxGrid_StringToLines( TSelf(wxGrid) _obj, TStringVoid value, void* lines );
+int        wxGrid_XToCol( TSelf(wxGrid) _obj, int x );
+int        wxGrid_XToEdgeOfCol( TSelf(wxGrid) _obj, int x );
+void       wxGrid_XYToCell( TSelf(wxGrid) _obj, TPoint(x,y), TPointOut(row,col) );
+int        wxGrid_YToEdgeOfRow( TSelf(wxGrid) _obj, int y );
+int        wxGrid_YToRow( TSelf(wxGrid) _obj, int y );
+void       wxGrid_NewCalcCellsExposed( TSelf(wxGrid) _obj, TClass(wxRegion) reg, TClassRef(wxGridCellCoordsArray) arr );
+void       wxGrid_NewDrawGridCellArea( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxGridCellCoordsArray) arr );
+void       wxGrid_NewDrawHighlight( TSelf(wxGrid) _obj, TClass(wxDC) dc, TClass(wxGridCellCoordsArray) arr );
+void       wxGrid_GetSelectedCells(TSelf(wxGrid) _obj, TClassRef(wxGridCellCoordsArray) _arr);
+void       wxGrid_GetSelectionBlockTopLeft(TSelf(wxGrid) _obj, TClassRef(wxGridCellCoordsArray) _arr);
+void       wxGrid_GetSelectionBlockBottomRight(TSelf(wxGrid) _obj, TClassRef(wxGridCellCoordsArray) _arr);
+TArrayLen  wxGrid_GetSelectedRows(TSelf(wxGrid) _obj, TArrayIntOutVoid _arr);
+TArrayLen  wxGrid_GetSelectedCols(TSelf(wxGrid) _obj, TArrayIntOutVoid _arr);
+
+/* wxGridCellAttr */
+TClassDef(wxGridCellAttr)
+TClass(wxGridCellAttr)    wxGridCellAttr_Ctor(  );
+void       wxGridCellAttr_DecRef( TSelf(wxGridCellAttr) _obj );
+void       wxGridCellAttr_GetAlignment( TSelf(wxGridCellAttr) _obj, TSizeOut(hAlign, vAlign) );
+void       wxGridCellAttr_GetBackgroundColour( TSelf(wxGridCellAttr) _obj, TClassRef(wxColour) _ref );
+TClass(wxGridCellEditor) wxGridCellAttr_GetEditor( TSelf(wxGridCellAttr) _obj, TClass(wxGrid) grid, int row, int col );
+void       wxGridCellAttr_GetFont( TSelf(wxGridCellAttr) _obj, TClassRef(wxFont) _ref );
+TClass(wxGridCellRenderer)  wxGridCellAttr_GetRenderer( TSelf(wxGridCellAttr) _obj, TClass(wxGrid) grid, int row, int col );
+void       wxGridCellAttr_GetTextColour( TSelf(wxGridCellAttr) _obj, TClassRef(wxColour) _ref );
+TBool      wxGridCellAttr_HasAlignment( TSelf(wxGridCellAttr) _obj );
+TBool      wxGridCellAttr_HasBackgroundColour( TSelf(wxGridCellAttr) _obj );
+TBool      wxGridCellAttr_HasEditor( TSelf(wxGridCellAttr) _obj );
+TBool      wxGridCellAttr_HasFont( TSelf(wxGridCellAttr) _obj );
+TBool      wxGridCellAttr_HasRenderer( TSelf(wxGridCellAttr) _obj );
+TBool      wxGridCellAttr_HasTextColour( TSelf(wxGridCellAttr) _obj );
+void       wxGridCellAttr_IncRef( TSelf(wxGridCellAttr) _obj );
+TBool      wxGridCellAttr_IsReadOnly( TSelf(wxGridCellAttr) _obj );
+void       wxGridCellAttr_SetAlignment( TSelf(wxGridCellAttr) _obj, int hAlign, int vAlign );
+void       wxGridCellAttr_SetBackgroundColour( TSelf(wxGridCellAttr) _obj, TClass(wxColour) colBack );
+void       wxGridCellAttr_SetDefAttr( TSelf(wxGridCellAttr) _obj, TClass(wxGridCellAttr) defAttr );
+void       wxGridCellAttr_SetEditor( TSelf(wxGridCellAttr) _obj, TClass(wxGridCellEditor) editor );
+void       wxGridCellAttr_SetFont( TSelf(wxGridCellAttr) _obj, TClass(wxFont) font );
+void       wxGridCellAttr_SetReadOnly( TSelf(wxGridCellAttr) _obj, TBool isReadOnly );
+void       wxGridCellAttr_SetRenderer( TSelf(wxGridCellAttr) _obj, TClass(wxGridCellRenderer) renderer );
+void       wxGridCellAttr_SetTextColour( TSelf(wxGridCellAttr) _obj, TClass(wxColour) colText );
+
+/* wxGridCellBoolEditor */
+TClassDefExtend(wxGridCellBoolEditor,wxGridCellEditor)
+TClass(wxGridCellBoolEditor)   wxGridCellBoolEditor_Ctor(  );
+
+/* wxGridCellBoolRenderer */
+TClassDefExtend(wxGridCellBoolRenderer,wxGridCellRenderer)
+
+/* wxGridCellChoiceEditor */
+TClassDefExtend(wxGridCellChoiceEditor,wxGridCellEditor)
+TClass(wxGridCellChoiceEditor) wxGridCellChoiceEditor_Ctor( TArrayString(count,choices), TBoolInt allowOthers );
+
+/* wxGridCellCoordsArray */
+TClassDef(wxGridCellCoordsArray)
+TClass(wxGridCellCoordsArray) wxGridCellCoordsArray_Create();
+void       wxGridCellCoordsArray_Delete(TSelf(wxGridCellCoordsArray) _obj);
+int        wxGridCellCoordsArray_GetCount(TSelf(wxGridCellCoordsArray) _obj);
+void       wxGridCellCoordsArray_Item(TSelf(wxGridCellCoordsArray) _obj, int _idx, TPointOut(_c,_r));
+
+/* wxGridCellEditor */
+TClassDefExtend(wxGridCellEditor,wxGridCellWorker)
+void       wxGridCellEditor_BeginEdit( TSelf(wxGridCellEditor) _obj, int row, int col, TClass(wxGrid) grid );
+void       wxGridCellEditor_Create( TSelf(wxGridCellEditor) _obj, TClass(wxWindow) parent, int id, TClass(wxEvtHandler) evtHandler );
+void       wxGridCellEditor_Destroy( TSelf(wxGridCellEditor) _obj );
+int        wxGridCellEditor_EndEdit( TSelf(wxGridCellEditor) _obj, int row, int col, TClass(wxGrid) grid );
+TClass(wxControl) wxGridCellEditor_GetControl( TSelf(wxGridCellEditor) _obj );
+void       wxGridCellEditor_HandleReturn( TSelf(wxGridCellEditor) _obj, TClass(wxEvent) event );
+TBool      wxGridCellEditor_IsAcceptedKey( TSelf(wxGridCellEditor) _obj, TClass(wxEvent) event );
+TBool      wxGridCellEditor_IsCreated( TSelf(wxGridCellEditor) _obj );
+void       wxGridCellEditor_PaintBackground( TSelf(wxGridCellEditor) _obj, TRect(x,y,w,h), TClass(wxGridCellAttr) attr );
+void       wxGridCellEditor_Reset( TSelf(wxGridCellEditor) _obj );
+void       wxGridCellEditor_SetControl( TSelf(wxGridCellEditor) _obj, TClass(wxControl) control );
+void       wxGridCellEditor_SetParameters( TSelf(wxGridCellEditor) _obj, TString params );
+void       wxGridCellEditor_SetSize( TSelf(wxGridCellEditor) _obj, TRect(x,y,w,h) );
+void       wxGridCellEditor_Show( TSelf(wxGridCellEditor) _obj, TBoolInt show, TClass(wxGridCellAttr) attr );
+void       wxGridCellEditor_StartingClick( TSelf(wxGridCellEditor) _obj );
+void       wxGridCellEditor_StartingKey( TSelf(wxGridCellEditor) _obj, TClass(wxEvent) event );
+
+/* wxGridCellFloatEditor */
+TClassDefExtend(wxGridCellFloatEditor,wxGridCellTextEditor)
+TClass(wxGridCellFloatEditor) wxGridCellFloatEditor_Ctor( int width, int precision );
+
+/* wxGridCellFloatRenderer */
+TClassDefExtend(wxGridCellFloatRenderer,wxGridCellStringRenderer)
+
+/* wxGridCellNumberEditor */
+TClassDefExtend(wxGridCellNumberEditor,wxGridCellTextEditor)
+TClass(wxGridCellNumberEditor)  wxGridCellNumberEditor_Ctor( int min, int max );
+
+/* wxGridCellNumberRenderer */
+TClassDefExtend(wxGridCellNumberRenderer,wxGridCellStringRenderer)
+
+/* wxGridCellRenderer */
+TClassDefExtend(wxGridCellRenderer,wxGridCellWorker)
+
+/* wxGridCellStringRenderer */
+TClassDefExtend(wxGridCellStringRenderer,wxGridCellRenderer)
+
+/* wxGridCellTextEditor */
+TClassDefExtend(wxGridCellTextEditor,wxGridCellEditor)
+TClass(wxGridCellTextEditor) wxGridCellTextEditor_Ctor(  );
+
+/* wxGridCellWorker */
+TClassDef(wxGridCellWorker)
+
+/* wxGridEditorCreatedEvent */
+TClassDefExtend(wxGridEditorCreatedEvent,wxCommandEvent)
+int        wxGridEditorCreatedEvent_GetCol (TSelf(wxGridEditorCreatedEvent) _obj);
+TClass(wxControl) wxGridEditorCreatedEvent_GetControl (TSelf(wxGridEditorCreatedEvent) _obj);
+int        wxGridEditorCreatedEvent_GetRow (TSelf(wxGridEditorCreatedEvent) _obj);
+void       wxGridEditorCreatedEvent_SetCol (TSelf(wxGridEditorCreatedEvent) _obj, int col);
+void       wxGridEditorCreatedEvent_SetControl (TSelf(wxGridEditorCreatedEvent) _obj, TClass(wxControl) ctrl);
+void       wxGridEditorCreatedEvent_SetRow (TSelf(wxGridEditorCreatedEvent) _obj, int row);
+
+/* wxGridEvent */
+TClassDefExtend(wxGridEvent,wxNotifyEvent)
+TBool      wxGridEvent_AltDown (TSelf(wxGridEvent) _obj);
+TBool      wxGridEvent_ControlDown (TSelf(wxGridEvent) _obj);
+int        wxGridEvent_GetCol (TSelf(wxGridEvent) _obj);
+void       wxGridEvent_GetPosition (TSelf(wxGridEvent) _obj, TPointOutVoid(x,y));
+int        wxGridEvent_GetRow (TSelf(wxGridEvent) _obj);
+TBool      wxGridEvent_MetaDown (TSelf(wxGridEvent) _obj);
+TBool      wxGridEvent_Selecting (TSelf(wxGridEvent) _obj);
+TBool      wxGridEvent_ShiftDown (TSelf(wxGridEvent) _obj);
+
+/* wxGridRangeSelectEvent */
+TClassDefExtend(wxGridRangeSelectEvent,wxNotifyEvent)
+void       wxGridRangeSelectEvent_GetTopLeftCoords (TSelf(wxGridRangeSelectEvent) _obj, TPointOutVoid(col,row));
+void       wxGridRangeSelectEvent_GetBottomRightCoords (TSelf(wxGridRangeSelectEvent) _obj, TPointOutVoid(col,row));
+int        wxGridRangeSelectEvent_GetTopRow (TSelf(wxGridRangeSelectEvent) _obj);
+int        wxGridRangeSelectEvent_GetBottomRow (TSelf(wxGridRangeSelectEvent) _obj);
+int        wxGridRangeSelectEvent_GetLeftCol (TSelf(wxGridRangeSelectEvent) _obj);
+int        wxGridRangeSelectEvent_GetRightCol (TSelf(wxGridRangeSelectEvent) _obj);
+TBool      wxGridRangeSelectEvent_Selecting (TSelf(wxGridRangeSelectEvent) _obj);
+TBool      wxGridRangeSelectEvent_ControlDown (TSelf(wxGridRangeSelectEvent) _obj);
+TBool      wxGridRangeSelectEvent_MetaDown (TSelf(wxGridRangeSelectEvent) _obj);
+TBool      wxGridRangeSelectEvent_ShiftDown (TSelf(wxGridRangeSelectEvent) _obj);
+TBool      wxGridRangeSelectEvent_AltDown (TSelf(wxGridRangeSelectEvent) _obj);
+
+/* wxGridSizeEvent */
+TClassDefExtend(wxGridSizeEvent,wxNotifyEvent)
+int        wxGridSizeEvent_GetRowOrCol (TSelf(wxGridSizeEvent) _obj);
+void       wxGridSizeEvent_GetPosition (TSelf(wxGridSizeEvent) _obj, TPointOutVoid(x,y));
+TBool      wxGridSizeEvent_ControlDown (TSelf(wxGridSizeEvent) _obj);
+TBool      wxGridSizeEvent_MetaDown (TSelf(wxGridSizeEvent) _obj);
+TBool      wxGridSizeEvent_ShiftDown (TSelf(wxGridSizeEvent) _obj);
+TBool      wxGridSizeEvent_AltDown (TSelf(wxGridSizeEvent) _obj);
+
+
+/* wxGridSizer */
+TClassDefExtend(wxGridSizer,wxSizer)
+void       wxGridSizer_CalcMin( TSelf(wxGridSizer) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxGridSizer) wxGridSizer_Create( int rows, int cols, int vgap, int hgap );
+int        wxGridSizer_GetCols( TSelf(wxGridSizer) _obj );
+int        wxGridSizer_GetHGap( TSelf(wxGridSizer) _obj );
+int        wxGridSizer_GetRows( TSelf(wxGridSizer) _obj );
+int        wxGridSizer_GetVGap( TSelf(wxGridSizer) _obj );
+void       wxGridSizer_RecalcSizes( TSelf(wxGridSizer) _obj );
+void       wxGridSizer_SetCols( TSelf(wxGridSizer) _obj, int cols );
+void       wxGridSizer_SetHGap( TSelf(wxGridSizer) _obj, int gap );
+void       wxGridSizer_SetRows( TSelf(wxGridSizer) _obj, int rows );
+void       wxGridSizer_SetVGap( TSelf(wxGridSizer) _obj, int gap );
+
+/* wxGridTableBase */
+TClassDefExtend(wxGridTableBase,wxObject)
+
+/* wxHTTP */
+TClassDefExtend(wxHTTP,wxProtocol)
+
+/* wxHashMap */
+TClassDef(wxHashMap)
+
+/* wxHelpController */
+TClassDefExtend(wxHelpController,wxHelpControllerBase)
+
+/* wxHelpControllerBase */
+TClassDefExtend(wxHelpControllerBase,wxObject)
+
+/* wxHelpControllerHelpProvider */
+TClassDefExtend(wxHelpControllerHelpProvider,wxSimpleHelpProvider)
+TClass(wxHelpControllerHelpProvider) wxHelpControllerHelpProvider_Create( void* ctr );
+TClass(wxHelpController) wxHelpControllerHelpProvider_GetHelpController( TSelf(wxHelpControllerHelpProvider) _obj );
+void       wxHelpControllerHelpProvider_SetHelpController( TSelf(wxHelpControllerHelpProvider) _obj, TClass(wxHelpController) hc );
+
+/* wxHelpEvent */
+TClassDefExtend(wxHelpEvent,wxCommandEvent)
+int        wxHelpEvent_GetLink( TSelf(wxHelpEvent) _obj, void* _ref );
+void       wxHelpEvent_GetPosition( TSelf(wxHelpEvent) _obj, TPointOutVoid(_x,_y) );
+int        wxHelpEvent_GetTarget( TSelf(wxHelpEvent) _obj, void* _ref );
+int        wxHelpEvent_SetLink( TSelf(wxHelpEvent) _obj, void* link );
+void       wxHelpEvent_SetPosition( TSelf(wxHelpEvent) _obj, TPoint(x,y) );
+void       wxHelpEvent_SetTarget( TSelf(wxHelpEvent) _obj, void* target );
+
+/* wxHelpProvider */
+TClassDef(wxHelpProvider)
+void       wxHelpProvider_AddHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window, TStringVoid text );
+void       wxHelpProvider_AddHelpById( TSelf(wxHelpProvider) _obj, int id, TStringVoid text );
+void       wxHelpProvider_Delete( TSelf(wxHelpProvider) _obj );
+void*      wxHelpProvider_Get(  );
+int        wxHelpProvider_GetHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window, void* _ref );
+void       wxHelpProvider_RemoveHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window );
+void*      wxHelpProvider_Set( TSelf(wxHelpProvider) helpProvider );
+int        wxHelpProvider_ShowHelp( TSelf(wxHelpProvider) _obj, TClass(wxWindow) window );
+
+/* wxHtmlCell */
+TClassDefExtend(wxHtmlCell,wxObject)
+
+/* wxHtmlColourCell */
+TClassDefExtend(wxHtmlColourCell,wxHtmlCell)
+
+/* wxHtmlContainerCell */
+TClassDefExtend(wxHtmlContainerCell,wxHtmlCell)
+
+/* wxHtmlDCRenderer */
+TClassDefExtend(wxHtmlDCRenderer,wxObject)
+
+/* wxHtmlEasyPrinting */
+TClassDefExtend(wxHtmlEasyPrinting,wxObject)
+
+/* wxHtmlFilter */
+TClassDefExtend(wxHtmlFilter,wxObject)
+
+/* wxHtmlHelpController */
+TClassDefExtend(wxHtmlHelpController,wxHelpControllerBase)
+int        wxHtmlHelpController_AddBook( TSelf(wxHtmlHelpController) _obj, void* book, int show_wait_msg );
+TClass(wxHtmlHelpController) wxHtmlHelpController_Create( int _style );
+void       wxHtmlHelpController_Delete( TSelf(wxHtmlHelpController) _obj );
+int        wxHtmlHelpController_Display( TSelf(wxHtmlHelpController) _obj, void* x );
+int        wxHtmlHelpController_DisplayBlock( TSelf(wxHtmlHelpController) _obj, int blockNo );
+int        wxHtmlHelpController_DisplayContents( TSelf(wxHtmlHelpController) _obj );
+int        wxHtmlHelpController_DisplayIndex( TSelf(wxHtmlHelpController) _obj );
+int        wxHtmlHelpController_DisplayNumber( TSelf(wxHtmlHelpController) _obj, int id );
+int        wxHtmlHelpController_DisplaySection( TSelf(wxHtmlHelpController) _obj, TStringVoid section );
+int        wxHtmlHelpController_DisplaySectionNumber( TSelf(wxHtmlHelpController) _obj, int sectionNo );
+TClass(wxFrame) wxHtmlHelpController_GetFrame( TSelf(wxHtmlHelpController) _obj );
+void*      wxHtmlHelpController_GetFrameParameters( TSelf(wxHtmlHelpController) _obj, void* title, int* width, int* height, int* pos_x, int* pos_y, int* newFrameEachTime );
+int        wxHtmlHelpController_Initialize( TSelf(wxHtmlHelpController) _obj, TStringVoid file );
+int        wxHtmlHelpController_KeywordSearch( TSelf(wxHtmlHelpController) _obj, TStringVoid keyword );
+int        wxHtmlHelpController_LoadFile( TSelf(wxHtmlHelpController) _obj, TStringVoid file );
+int        wxHtmlHelpController_Quit( TSelf(wxHtmlHelpController) _obj );
+void       wxHtmlHelpController_ReadCustomization( TSelf(wxHtmlHelpController) _obj, TClass(wxConfigBase) cfg, TStringVoid path );
+void       wxHtmlHelpController_SetFrameParameters( TSelf(wxHtmlHelpController) _obj, void* title, TSize(width,height), int pos_x, int pos_y, int newFrameEachTime );
+void       wxHtmlHelpController_SetTempDir( TSelf(wxHtmlHelpController) _obj, TStringVoid path );
+void       wxHtmlHelpController_SetTitleFormat( TSelf(wxHtmlHelpController) _obj, void* format );
+void       wxHtmlHelpController_SetViewer( TSelf(wxHtmlHelpController) _obj, TStringVoid viewer, int flags );
+void       wxHtmlHelpController_UseConfig( TSelf(wxHtmlHelpController) _obj, TClass(wxConfigBase) config, TStringVoid rootpath );
+void       wxHtmlHelpController_WriteCustomization( TSelf(wxHtmlHelpController) _obj, TClass(wxConfigBase) cfg, TStringVoid path );
+
+/* wxHtmlHelpData */
+TClassDefExtend(wxHtmlHelpData,wxObject)
+
+/* wxHtmlHelpFrame */
+TClassDefExtend(wxHtmlHelpFrame,wxFrame)
+
+/* wxHtmlLinkInfo */
+TClassDefExtend(wxHtmlLinkInfo,wxObject)
+
+/* wxHtmlParser */
+TClassDefExtend(wxHtmlParser,wxObject)
+
+/* wxHtmlPrintout */
+TClassDefExtend(wxHtmlPrintout,wxPrintout)
+
+/* wxHtmlTag */
+TClassDefExtend(wxHtmlTag,wxObject)
+
+/* wxHtmlTagHandler */
+TClassDefExtend(wxHtmlTagHandler,wxObject)
+
+/* wxHtmlTagsModule */
+TClassDefExtend(wxHtmlTagsModule,wxModule)
+
+/* wxHtmlWidgetCell */
+TClassDefExtend(wxHtmlWidgetCell,wxHtmlCell)
+
+/* wxHtmlWinParser */
+TClassDefExtend(wxHtmlWinParser,wxHtmlParser)
+
+/* wxHtmlWinTagHandler */
+TClassDefExtend(wxHtmlWinTagHandler,wxHtmlTagHandler)
+
+/* wxHtmlWindow */
+TClassDefExtend(wxHtmlWindow,wxScrolledWindow)
+
+/* wxIPV4address */
+TClassDefExtend(wxIPV4address,wxSockAddress)
+
+/* wxIcon */
+TClassDefExtend(wxIcon,wxBitmap)
+void       wxIcon_Assign( TSelf(wxIcon) _obj, void* other );
+void       wxIcon_CopyFromBitmap( TSelf(wxIcon) _obj, TClass(wxBitmap) bmp );
+TClass(wxIcon) wxIcon_CreateDefault(  );
+TClass(wxIcon) wxIcon_CreateLoad( TStringVoid name, long type, TSize(width,height) );
+void       wxIcon_Delete( TSelf(wxIcon) _obj );
+TClass(wxIcon) wxIcon_FromRaw( TSelf(wxIcon) data, TSize(width,height) );
+TClass(wxIcon) wxIcon_FromXPM( TSelf(wxIcon) data );
+int        wxIcon_GetDepth( TSelf(wxIcon) _obj );
+int        wxIcon_GetHeight( TSelf(wxIcon) _obj );
+int        wxIcon_GetWidth( TSelf(wxIcon) _obj );
+TBool      wxIcon_IsEqual( TSelf(wxIcon) _obj, void* other );
+int        wxIcon_Load( TSelf(wxIcon) _obj, TStringVoid name, long type, TSize(width,height) );
+TBool      wxIcon_Ok( TSelf(wxIcon) _obj );
+
+/* wxIconBundle */
+TClassDef(wxIconBundle)
+void       wxIconBundle_AddIcon( TSelf(wxIconBundle) _obj, TClass(wxIcon) icon );
+void       wxIconBundle_AddIconFromFile( TSelf(wxIconBundle) _obj, TStringVoid file, int type );
+void       wxIconBundle_Assign( TSelf(wxIconBundle) _obj, TClassRef(wxIconBundle) _ref );
+TClass(wxIconBundle) wxIconBundle_CreateDefault(  );
+TClass(wxIconBundle) wxIconBundle_CreateFromFile( TStringVoid file, int type );
+TClass(wxIconBundle) wxIconBundle_CreateFromIcon( TClass(wxIcon) icon );
+void       wxIconBundle_Delete( TSelf(wxIconBundle) _obj );
+void       wxIconBundle_GetIcon( TSelf(wxIconBundle) _obj, TSize(w,h), TClassRef(wxIcon) _ref );
+
+/* wxIconizeEvent */
+TClassDefExtend(wxIconizeEvent,wxEvent)
+
+/* wxIdleEvent */
+TClassDefExtend(wxIdleEvent,wxEvent)
+void       wxIdleEvent_CopyObject( TSelf(wxIdleEvent) _obj, void* object_dest );
+TBool      wxIdleEvent_MoreRequested( TSelf(wxIdleEvent) _obj );
+void       wxIdleEvent_RequestMore( TSelf(wxIdleEvent) _obj, TBool needMore );
+
+/* wxImage */
+TClassDefExtend(wxImage,wxObject)
+TBool      wxImage_CanRead( TStringVoid name );
+void       wxImage_ConvertToBitmap( TSelf(wxImage) _obj, TClassRef(wxBitmap) bitmap );
+int        wxImage_CountColours( TSelf(wxImage) _obj, int stopafter );
+TClass(wxImage) wxImage_CreateDefault(  );
+TClass(wxImage) wxImage_CreateFromBitmap( TClass(wxBitmap) bitmap );
+TClass(wxImage) wxImage_CreateFromData( TSize(width,height), void* data );
+TClass(wxImage) wxImage_CreateFromFile( TStringVoid name );
+TClass(wxImage) wxImage_CreateSized( TSize(width,height) );
+void       wxImage_Destroy( TSelf(wxImage) _obj );
+TChar      wxImage_GetBlue( TSelf(wxImage) _obj, TPoint(x,y) );
+void*      wxImage_GetData( TSelf(wxImage) _obj );
+TChar      wxImage_GetGreen( TSelf(wxImage) _obj, TPoint(x,y) );
+int        wxImage_GetHeight( TSelf(wxImage) _obj );
+TChar      wxImage_GetMaskBlue( TSelf(wxImage) _obj );
+TChar      wxImage_GetMaskGreen( TSelf(wxImage) _obj );
+TChar      wxImage_GetMaskRed( TSelf(wxImage) _obj );
+TChar      wxImage_GetRed( TSelf(wxImage) _obj, TPoint(x,y) );
+void       wxImage_GetSubImage( TSelf(wxImage) _obj, TRect(x,y,w,h), TClassRef(wxImage) image );
+int        wxImage_GetWidth( TSelf(wxImage) _obj );
+TBool      wxImage_HasMask( TSelf(wxImage) _obj );
+void       wxImage_Initialize( TSelf(wxImage) _obj, TSize(width,height) );
+void       wxImage_InitializeFromData( TSelf(wxImage) _obj, TSize(width,height), void* data );
+TBoolInt   wxImage_LoadFile( TSelf(wxImage) _obj, TStringVoid name, int type );
+void       wxImage_Mirror( TSelf(wxImage) _obj, TBoolInt horizontally, TClassRef(wxImage) image );
+TBool      wxImage_Ok( TSelf(wxImage) _obj );
+void       wxImage_Paste( TSelf(wxImage) _obj, TClass(wxImage) image, TPoint(x,y) );
+void       wxImage_Replace( TSelf(wxImage) _obj, TColorRGB(r1,g1,b1), TColorRGB(r2,g2,b2) );
+void       wxImage_Rescale( TSelf(wxImage) _obj, TSize(width,height) );
+void       wxImage_Rotate( TSelf(wxImage) _obj, double angle, TPoint(c_x,c_y), TBoolInt interpolating, void* offset_after_rotation, TClassRef(wxImage) image );
+void       wxImage_Rotate90( TSelf(wxImage) _obj, TBoolInt clockwise, TClassRef(wxImage) image );
+TBoolInt   wxImage_SaveFile( TSelf(wxImage) _obj, TStringVoid name, int type );
+void       wxImage_Scale( TSelf(wxImage) _obj, TSize(width,height), TClassRef(wxImage) image );
+void       wxImage_SetData( TSelf(wxImage) _obj, void* data );
+void       wxImage_SetDataAndSize( TSelf(wxImage) _obj, void* data, TSize(new_width,new_height) );
+void       wxImage_SetMask( TSelf(wxImage) _obj, int mask );
+void       wxImage_SetMaskColour( TSelf(wxImage) _obj, TColorRGB(r,g,b) );
+void       wxImage_SetRGB( TSelf(wxImage) _obj, TPoint(x,y), TColorRGB(r,g,b) );
+
+/* wxImageHandler */
+TClassDefExtend(wxImageHandler,wxObject)
+
+/* wxImageList */
+TClassDefExtend(wxImageList,wxObject)
+int        wxImageList_AddBitmap( TSelf(wxImageList) _obj, TClass(wxBitmap) bitmap, TClass(wxBitmap) mask );
+int        wxImageList_AddIcon( TSelf(wxImageList) _obj, TClass(wxIcon) icon );
+int        wxImageList_AddMasked( TSelf(wxImageList) _obj, TClass(wxBitmap) bitmap, TClass(wxColour) maskColour );
+TClass(wxImageList) wxImageList_Create( TSize(width,height), TBoolInt mask, int initialCount );
+void       wxImageList_Delete( TSelf(wxImageList) _obj );
+TBoolInt   wxImageList_Draw( TSelf(wxImageList) _obj, int index, TClass(wxDC) dc, TPoint(x,y), int flags, TBoolInt solidBackground );
+int        wxImageList_GetImageCount( TSelf(wxImageList) _obj );
+void       wxImageList_GetSize( TSelf(wxImageList) _obj, int index, TSizeOut(width,height) );
+TBoolInt   wxImageList_Remove( TSelf(wxImageList) _obj, int index );
+TBoolInt   wxImageList_RemoveAll( TSelf(wxImageList) _obj );
+TBoolInt   wxImageList_Replace( TSelf(wxImageList) _obj, int index, TClass(wxBitmap) bitmap, TClass(wxBitmap) mask );
+TBoolInt   wxImageList_ReplaceIcon( TSelf(wxImageList) _obj, int index, TClass(wxIcon) icon );
+
+/* wxIndividualLayoutConstraint */
+TClassDefExtend(wxIndividualLayoutConstraint,wxObject)
+void       wxIndividualLayoutConstraint_Above( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
+void       wxIndividualLayoutConstraint_Absolute( TSelf(wxIndividualLayoutConstraint) _obj, int val );
+void       wxIndividualLayoutConstraint_AsIs( TSelf(wxIndividualLayoutConstraint) _obj );
+void       wxIndividualLayoutConstraint_Below( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
+int        wxIndividualLayoutConstraint_GetDone( TSelf(wxIndividualLayoutConstraint) _obj );
+int        wxIndividualLayoutConstraint_GetEdge( TSelf(wxIndividualLayoutConstraint) _obj, int which, void* thisWin, void* other );
+int        wxIndividualLayoutConstraint_GetMargin( TSelf(wxIndividualLayoutConstraint) _obj );
+int        wxIndividualLayoutConstraint_GetMyEdge( TSelf(wxIndividualLayoutConstraint) _obj );
+int        wxIndividualLayoutConstraint_GetOtherEdge( TSelf(wxIndividualLayoutConstraint) _obj );
+void*      wxIndividualLayoutConstraint_GetOtherWindow( TSelf(wxIndividualLayoutConstraint) _obj );
+int        wxIndividualLayoutConstraint_GetPercent( TSelf(wxIndividualLayoutConstraint) _obj );
+int        wxIndividualLayoutConstraint_GetRelationship( TSelf(wxIndividualLayoutConstraint) _obj );
+int        wxIndividualLayoutConstraint_GetValue( TSelf(wxIndividualLayoutConstraint) _obj );
+void       wxIndividualLayoutConstraint_LeftOf( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
+void       wxIndividualLayoutConstraint_PercentOf( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) otherW, int wh, int per );
+int        wxIndividualLayoutConstraint_ResetIfWin( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) otherW );
+void       wxIndividualLayoutConstraint_RightOf( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) sibling, int marg );
+void       wxIndividualLayoutConstraint_SameAs( TSelf(wxIndividualLayoutConstraint) _obj, TClass(wxWindow) otherW, int edge, int marg );
+int        wxIndividualLayoutConstraint_SatisfyConstraint( TSelf(wxIndividualLayoutConstraint) _obj, void* constraints, TClass(wxWindow) win );
+void       wxIndividualLayoutConstraint_Set( TSelf(wxIndividualLayoutConstraint) _obj, int rel, TClass(wxWindow) otherW, int otherE, int val, int marg );
+void       wxIndividualLayoutConstraint_SetDone( TSelf(wxIndividualLayoutConstraint) _obj, int d );
+void       wxIndividualLayoutConstraint_SetEdge( TSelf(wxIndividualLayoutConstraint) _obj, int which );
+void       wxIndividualLayoutConstraint_SetMargin( TSelf(wxIndividualLayoutConstraint) _obj, int m );
+void       wxIndividualLayoutConstraint_SetRelationship( TSelf(wxIndividualLayoutConstraint) _obj, int r );
+void       wxIndividualLayoutConstraint_SetValue( TSelf(wxIndividualLayoutConstraint) _obj, int v );
+void       wxIndividualLayoutConstraint_Unconstrained( TSelf(wxIndividualLayoutConstraint) _obj );
+
+/* wxInitDialogEvent */
+TClassDefExtend(wxInitDialogEvent,wxEvent)
+
+/* wxInputStream */
+TClassDefExtend(wxInputStream,wxStreamBase)
+void       wxInputStream_Delete( TSelf(wxInputStream) _obj );
+TBool      wxInputStream_Eof( TSelf(wxInputStream) _obj );
+TChar      wxInputStream_GetC( TSelf(wxInputStream) _obj );
+int        wxInputStream_LastRead( TSelf(wxInputStream) _obj );
+TChar      wxInputStream_Peek( TSelf(wxInputStream) _obj );
+void       wxInputStream_Read( TSelf(wxInputStream) _obj, void* buffer, int size );
+int        wxInputStream_SeekI( TSelf(wxInputStream) _obj, int pos, int mode );
+int        wxInputStream_Tell( TSelf(wxInputStream) _obj );
+int        wxInputStream_UngetBuffer( TSelf(wxInputStream) _obj, void* buffer, int size );
+int        wxInputStream_Ungetch( TSelf(wxInputStream) _obj, TChar c );
+
+/* wxJoystick */
+TClassDefExtend(wxJoystick,wxObject)
+TClass(wxJoystick) wxJoystick_Create( int joystick );
+void       wxJoystick_Delete( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetButtonState( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetManufacturerId( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetMaxAxes( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetMaxButtons( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetMovementThreshold( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetNumberAxes( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetNumberButtons( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetNumberJoysticks( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetPOVCTSPosition( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetPOVPosition( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetPollingMax( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetPollingMin( TSelf(wxJoystick) _obj );
+void       wxJoystick_GetPosition( TSelf(wxJoystick) _obj, TPointOutVoid(_x,_y) );
+int        wxJoystick_GetProductId( TSelf(wxJoystick) _obj );
+TStringLen wxJoystick_GetProductName( TSelf(wxJoystick) _obj, TStringOutVoid _buf );
+int        wxJoystick_GetRudderMax( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetRudderMin( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetRudderPosition( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetUMax( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetUMin( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetUPosition( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetVMax( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetVMin( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetVPosition( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetXMax( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetXMin( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetYMax( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetYMin( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetZMax( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetZMin( TSelf(wxJoystick) _obj );
+int        wxJoystick_GetZPosition( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_HasPOV( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_HasPOV4Dir( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_HasPOVCTS( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_HasRudder( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_HasU( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_HasV( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_HasZ( TSelf(wxJoystick) _obj );
+TBool      wxJoystick_IsOk( TSelf(wxJoystick) _obj );
+int        wxJoystick_ReleaseCapture( TSelf(wxJoystick) _obj );
+int        wxJoystick_SetCapture( TSelf(wxJoystick) _obj, TClass(wxWindow) win, int pollingFreq );
+void       wxJoystick_SetMovementThreshold( TSelf(wxJoystick) _obj, int threshold );
+
+/* wxJoystickEvent */
+TClassDefExtend(wxJoystickEvent,wxEvent)
+TBool      wxJoystickEvent_ButtonDown( TSelf(wxJoystickEvent) _obj, int but );
+TBool      wxJoystickEvent_ButtonIsDown( TSelf(wxJoystickEvent) _obj, int but );
+TBool      wxJoystickEvent_ButtonUp( TSelf(wxJoystickEvent) _obj, int but );
+void       wxJoystickEvent_CopyObject( TSelf(wxJoystickEvent) _obj, void* obj );
+int        wxJoystickEvent_GetButtonChange( TSelf(wxJoystickEvent) _obj );
+int        wxJoystickEvent_GetButtonState( TSelf(wxJoystickEvent) _obj );
+int        wxJoystickEvent_GetJoystick( TSelf(wxJoystickEvent) _obj );
+void       wxJoystickEvent_GetPosition( TSelf(wxJoystickEvent) _obj, TPointOut(_x,_y) );
+int        wxJoystickEvent_GetZPosition( TSelf(wxJoystickEvent) _obj );
+TBool      wxJoystickEvent_IsButton( TSelf(wxJoystickEvent) _obj );
+TBool      wxJoystickEvent_IsMove( TSelf(wxJoystickEvent) _obj );
+TBool      wxJoystickEvent_IsZMove( TSelf(wxJoystickEvent) _obj );
+void       wxJoystickEvent_SetButtonChange( TSelf(wxJoystickEvent) _obj, int change );
+void       wxJoystickEvent_SetButtonState( TSelf(wxJoystickEvent) _obj, int state );
+void       wxJoystickEvent_SetJoystick( TSelf(wxJoystickEvent) _obj, int stick );
+void       wxJoystickEvent_SetPosition( TSelf(wxJoystickEvent) _obj, void* pos );
+void       wxJoystickEvent_SetZPosition( TSelf(wxJoystickEvent) _obj, int zPos );
+
+/* wxKeyEvent */
+TClassDefExtend(wxKeyEvent,wxEvent)
+TBool      wxKeyEvent_AltDown( TSelf(wxKeyEvent) _obj );
+TBool      wxKeyEvent_ControlDown( TSelf(wxKeyEvent) _obj );
+void       wxKeyEvent_CopyObject( TSelf(wxKeyEvent) _obj, void* obj );
+int        wxKeyEvent_GetKeyCode( TSelf(wxKeyEvent) _obj );
+void       wxKeyEvent_GetPosition( TSelf(wxKeyEvent) _obj, TPointOut(_x,_y) );
+int        wxKeyEvent_GetX( TSelf(wxKeyEvent) _obj );
+int        wxKeyEvent_GetY( TSelf(wxKeyEvent) _obj );
+TBool      wxKeyEvent_HasModifiers( TSelf(wxKeyEvent) _obj );
+TBool      wxKeyEvent_MetaDown( TSelf(wxKeyEvent) _obj );
+void       wxKeyEvent_SetKeyCode( TSelf(wxKeyEvent) _obj, int code );
+TBool      wxKeyEvent_ShiftDown( TSelf(wxKeyEvent) _obj );
+
+/* wxLEDNumberCtrl */
+TClassDefExtend(wxLEDNumberCtrl,wxControl)
+TClass(wxLEDNumberCtrl) wxLEDNumberCtrl_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
+int        wxLEDNumberCtrl_GetAlignment( TSelf(wxLEDNumberCtrl) _obj );
+int        wxLEDNumberCtrl_GetDrawFaded( TSelf(wxLEDNumberCtrl) _obj );
+int        wxLEDNumberCtrl_GetValue( TSelf(wxLEDNumberCtrl) _obj, void* _ref );
+void       wxLEDNumberCtrl_SetAlignment( TSelf(wxLEDNumberCtrl) _obj, int Alignment, int Redraw );
+void       wxLEDNumberCtrl_SetDrawFaded( TSelf(wxLEDNumberCtrl) _obj, int DrawFaded, int Redraw );
+void       wxLEDNumberCtrl_SetValue( TSelf(wxLEDNumberCtrl) _obj, void* Value, int Redraw );
+
+/* wxLayoutAlgorithm */
+TClassDefExtend(wxLayoutAlgorithm,wxObject)
+TClass(wxLayoutAlgorithm) wxLayoutAlgorithm_Create(  );
+void       wxLayoutAlgorithm_Delete( TSelf(wxLayoutAlgorithm) _obj );
+int        wxLayoutAlgorithm_LayoutFrame( TSelf(wxLayoutAlgorithm) _obj, TClass(wxFrame) frame, void* mainWindow );
+int        wxLayoutAlgorithm_LayoutMDIFrame( TSelf(wxLayoutAlgorithm) _obj, TClass(wxFrame) frame, TRect(x,y,w,h), int use );
+int        wxLayoutAlgorithm_LayoutWindow( TSelf(wxLayoutAlgorithm) _obj, TClass(wxFrame) frame, void* mainWindow );
+
+/* wxLayoutConstraints */
+TClassDefExtend(wxLayoutConstraints,wxObject)
+TClass(wxLayoutConstraints) wxLayoutConstraints_Create(  );
+void*      wxLayoutConstraints_bottom( TSelf(wxLayoutConstraints) _obj );
+void*      wxLayoutConstraints_centreX( TSelf(wxLayoutConstraints) _obj );
+void*      wxLayoutConstraints_centreY( TSelf(wxLayoutConstraints) _obj );
+void*      wxLayoutConstraints_height( TSelf(wxLayoutConstraints) _obj );
+void*      wxLayoutConstraints_left( TSelf(wxLayoutConstraints) _obj );
+void*      wxLayoutConstraints_right( TSelf(wxLayoutConstraints) _obj );
+void*      wxLayoutConstraints_top( TSelf(wxLayoutConstraints) _obj );
+void*      wxLayoutConstraints_width( TSelf(wxLayoutConstraints) _obj );
+
+/* wxList */
+TClassDefExtend(wxList,wxObject)
+
+/* wxListBox */
+TClassDefExtend(wxListBox,wxControl)
+void       wxListBox_Append( TSelf(wxListBox) _obj, TString item );
+void       wxListBox_AppendData( TSelf(wxListBox) _obj, TString item, void* data );
+void       wxListBox_Clear( TSelf(wxListBox) _obj );
+TClass(wxListBox) wxListBox_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), TArrayString(n,str), int _stl );
+void       wxListBox_Delete( TSelf(wxListBox) _obj, int n );
+int        wxListBox_FindString( TSelf(wxListBox) _obj, TString s );
+TClass(wxClientData) wxListBox_GetClientData( TSelf(wxListBox) _obj, int n );
+int        wxListBox_GetCount( TSelf(wxListBox) _obj );
+int        wxListBox_GetSelection( TSelf(wxListBox) _obj );
+int        wxListBox_GetSelections( TSelf(wxListBox) _obj, int* aSelections, int allocated );
+TStringLen wxListBox_GetString( TSelf(wxListBox) _obj, int n, TStringOutVoid _buf );
+void       wxListBox_InsertItems( TSelf(wxListBox) _obj, void* items, int pos, int count );
+TBool      wxListBox_IsSelected( TSelf(wxListBox) _obj, int n );
+void       wxListBox_SetClientData( TSelf(wxListBox) _obj, int n, TClass(wxClientData) clientData );
+void       wxListBox_SetFirstItem( TSelf(wxListBox) _obj, int n );
+void       wxListBox_SetSelection( TSelf(wxListBox) _obj, int n, TBoolInt select );
+void       wxListBox_SetString( TSelf(wxListBox) _obj, int n, TString s );
+void       wxListBox_SetStringSelection( TSelf(wxListBox) _obj, TString str, TBoolInt sel );
+
+/* wxListCtrl */
+TClassDefExtend(wxListCtrl,wxControl)
+TBoolInt   wxListCtrl_Arrange( TSelf(wxListCtrl) _obj, int flag );
+void       wxListCtrl_ClearAll( TSelf(wxListCtrl) _obj );
+TClass(wxListCtrl) wxListCtrl_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+TBoolInt   wxListCtrl_DeleteAllColumns( TSelf(wxListCtrl) _obj );
+TBoolInt   wxListCtrl_DeleteAllItems( TSelf(wxListCtrl) _obj );
+TBoolInt   wxListCtrl_DeleteColumn( TSelf(wxListCtrl) _obj, int col );
+TBoolInt   wxListCtrl_DeleteItem( TSelf(wxListCtrl) _obj, int item );
+void       wxListCtrl_EditLabel( TSelf(wxListCtrl) _obj, int item );
+TBoolInt   wxListCtrl_EndEditLabel( TSelf(wxListCtrl) _obj, int cancel );
+TBoolInt   wxListCtrl_EnsureVisible( TSelf(wxListCtrl) _obj, int item );
+int        wxListCtrl_FindItem( TSelf(wxListCtrl) _obj, int start, TStringVoid str, TBoolInt partial );
+int        wxListCtrl_FindItemByData( TSelf(wxListCtrl) _obj, int start, int data );
+int        wxListCtrl_FindItemByPosition( TSelf(wxListCtrl) _obj, int start, TPoint(x,y), int direction );
+TBoolInt   wxListCtrl_GetColumn( TSelf(wxListCtrl) _obj, int col, TClass(wxListItem) item );
+int        wxListCtrl_GetColumnCount( TSelf(wxListCtrl) _obj );
+int        wxListCtrl_GetColumnWidth( TSelf(wxListCtrl) _obj, int col );
+int        wxListCtrl_GetCountPerPage( TSelf(wxListCtrl) _obj );
+TClass(wxTextCtrl)  wxListCtrl_GetEditControl( TSelf(wxListCtrl) _obj );
+TClass(wxImageList) wxListCtrl_GetImageList( TSelf(wxListCtrl) _obj, int which );
+TBoolInt   wxListCtrl_GetItem( TSelf(wxListCtrl) _obj, TClass(wxListItem) info );
+int        wxListCtrl_GetItemCount( TSelf(wxListCtrl) _obj );
+int        wxListCtrl_GetItemData( TSelf(wxListCtrl) _obj, int item );
+TBoolInt   wxListCtrl_GetItemPosition( TSelf(wxListCtrl) _obj, int item, int*x, int* y );
+int        wxListCtrl_GetItemRect( TSelf(wxListCtrl) _obj, int item, int code, TRectOutVoid(x,y,w,h) );
+void       wxListCtrl_GetItemSpacing( TSelf(wxListCtrl) _obj, TBool isSmall, TSizeOutVoid(w,h) );
+int        wxListCtrl_GetItemState( TSelf(wxListCtrl) _obj, int item, int stateMask );
+TStringLen wxListCtrl_GetItemText( TSelf(wxListCtrl) _obj, int item, TStringOutVoid buf );
+int        wxListCtrl_GetNextItem( TSelf(wxListCtrl) _obj, int item, int geometry, int state );
+int        wxListCtrl_GetSelectedItemCount( TSelf(wxListCtrl) _obj );
+void       wxListCtrl_GetTextColour( TSelf(wxListCtrl) _obj, TClassRef(wxColour) _ref );
+int        wxListCtrl_GetTopItem( TSelf(wxListCtrl) _obj );
+int        wxListCtrl_HitTest( TSelf(wxListCtrl) _obj, TPoint(x,y), void* flags );
+int        wxListCtrl_InsertColumn( TSelf(wxListCtrl) _obj, int col, TStringVoid heading, int format, int width );
+int        wxListCtrl_InsertColumnFromInfo( TSelf(wxListCtrl) _obj, int col, TClass(wxListItem) info );
+int        wxListCtrl_InsertItem( TSelf(wxListCtrl) _obj, TClass(wxListItem) info );
+int        wxListCtrl_InsertItemWithData( TSelf(wxListCtrl) _obj, int index, TStringVoid label );
+int        wxListCtrl_InsertItemWithImage( TSelf(wxListCtrl) _obj, int index, int imageIndex );
+int        wxListCtrl_InsertItemWithLabel( TSelf(wxListCtrl) _obj, int index, TStringVoid label, int imageIndex );
+TBoolInt   wxListCtrl_ScrollList( TSelf(wxListCtrl) _obj, TVector(dx,dy) );
+void       wxListCtrl_SetBackgroundColour( TSelf(wxListCtrl) _obj, TClass(wxColour) col );
+TBoolInt   wxListCtrl_SetColumn( TSelf(wxListCtrl) _obj, int col, TClass(wxListItem) item );
+TBoolInt   wxListCtrl_SetColumnWidth( TSelf(wxListCtrl) _obj, int col, int width );
+int        wxListCtrl_SetForegroundColour( TSelf(wxListCtrl) _obj, TClass(wxColour) col );
+void       wxListCtrl_SetImageList( TSelf(wxListCtrl) _obj, TClass(wxImageList) imageList, int which );
+TBoolInt   wxListCtrl_SetItem( TSelf(wxListCtrl) _obj, int index, int col, TStringVoid label, int imageId );
+TBoolInt   wxListCtrl_SetItemData( TSelf(wxListCtrl) _obj, int item, int data );
+TBoolInt   wxListCtrl_SetItemFromInfo( TSelf(wxListCtrl) _obj, TClass(wxListItem) info );
+TBoolInt   wxListCtrl_SetItemImage( TSelf(wxListCtrl) _obj, int item, int image, int selImage );
+TBoolInt   wxListCtrl_SetItemPosition( TSelf(wxListCtrl) _obj, int item, TPoint(x,y) );
+TBoolInt   wxListCtrl_SetItemState( TSelf(wxListCtrl) _obj, int item, int state, int stateMask );
+void       wxListCtrl_SetItemText( TSelf(wxListCtrl) _obj, int item, TStringVoid str );
+void       wxListCtrl_SetSingleStyle( TSelf(wxListCtrl) _obj, int style, TBoolInt add );
+void       wxListCtrl_SetTextColour( TSelf(wxListCtrl) _obj, TClass(wxColour) col );
+void       wxListCtrl_SetWindowStyleFlag( TSelf(wxListCtrl) _obj, int style );
+TBoolInt   wxListCtrl_SortItems( TSelf(wxListCtrl) _obj, void* fn, void* eif_obj );
+void       wxListCtrl_UpdateStyle( TSelf(wxListCtrl) _obj );
+
+/* wxListEvent */
+TClassDefExtend(wxListEvent,wxNotifyEvent)
+TBool      wxListEvent_Cancelled( TSelf(wxListEvent) _obj );
+int        wxListEvent_GetCode( TSelf(wxListEvent) _obj );
+int        wxListEvent_GetColumn( TSelf(wxListEvent) _obj );
+int        wxListEvent_GetData( TSelf(wxListEvent) _obj );
+int        wxListEvent_GetImage( TSelf(wxListEvent) _obj );
+int        wxListEvent_GetIndex( TSelf(wxListEvent) _obj );
+void       wxListEvent_GetItem( TSelf(wxListEvent) _obj, TClassRef(wxListItem) _ref );
+TStringLen wxListEvent_GetLabel( TSelf(wxListEvent) _obj, TStringOutVoid _buf );
+int        wxListEvent_GetMask( TSelf(wxListEvent) _obj );
+/*
+int        wxListEvent_GetOldIndex( TSelf(wxListEvent) _obj );
+int        wxListEvent_GetOldItem( TSelf(wxListEvent) _obj );
+*/
+void       wxListEvent_GetPoint( TSelf(wxListEvent) _obj, TPointOutVoid(_x,_y) );
+TStringLen wxListEvent_GetText( TSelf(wxListEvent) _obj, TStringOutVoid _buf );
+
+/* wxListItem */
+TClassDefExtend(wxListItem,wxObject)
+void       wxListItem_Clear( TSelf(wxListItem) _obj );
+void       wxListItem_ClearAttributes( TSelf(wxListItem) _obj );
+TClass(wxListItem) wxListItem_Create(  );
+void       wxListItem_Delete( TSelf(wxListItem) _obj );
+int        wxListItem_GetAlign( TSelf(wxListItem) _obj );
+void*      wxListItem_GetAttributes( TSelf(wxListItem) _obj );
+void       wxListItem_GetBackgroundColour( TSelf(wxListItem) _obj, TClassRef(wxColour) _ref );
+int        wxListItem_GetColumn( TSelf(wxListItem) _obj );
+int        wxListItem_GetData( TSelf(wxListItem) _obj );
+void       wxListItem_GetFont( TSelf(wxListItem) _obj, TClassRef(wxFont) _ref );
+int        wxListItem_GetId( TSelf(wxListItem) _obj );
+int        wxListItem_GetImage( TSelf(wxListItem) _obj );
+int        wxListItem_GetMask( TSelf(wxListItem) _obj );
+int        wxListItem_GetState( TSelf(wxListItem) _obj );
+TStringLen wxListItem_GetText( TSelf(wxListItem) _obj, TStringOutVoid _buf );
+void       wxListItem_GetTextColour( TSelf(wxListItem) _obj, TClassRef(wxColour) _ref );
+int        wxListItem_GetWidth( TSelf(wxListItem) _obj );
+TBool      wxListItem_HasAttributes( TSelf(wxListItem) _obj );
+void       wxListItem_SetAlign( TSelf(wxListItem) _obj, int align );
+void       wxListItem_SetBackgroundColour( TSelf(wxListItem) _obj, TClass(wxColour) colBack );
+void       wxListItem_SetColumn( TSelf(wxListItem) _obj, int col );
+void       wxListItem_SetData( TSelf(wxListItem) _obj, int data );
+void       wxListItem_SetDataPointer( TSelf(wxListItem) _obj, void* data );
+void       wxListItem_SetFont( TSelf(wxListItem) _obj, TClass(wxFont) font );
+void       wxListItem_SetId( TSelf(wxListItem) _obj, int id );
+void       wxListItem_SetImage( TSelf(wxListItem) _obj, int image );
+void       wxListItem_SetMask( TSelf(wxListItem) _obj, int mask );
+void       wxListItem_SetState( TSelf(wxListItem) _obj, int state );
+void       wxListItem_SetStateMask( TSelf(wxListItem) _obj, int stateMask );
+void       wxListItem_SetText( TSelf(wxListItem) _obj, TStringVoid text );
+void       wxListItem_SetTextColour( TSelf(wxListItem) _obj, TClass(wxColour) colText );
+void       wxListItem_SetWidth( TSelf(wxListItem) _obj, int width );
+
+/* wxLocale */
+TClassDef(wxLocale)
+int        wxLocale_AddCatalog( TSelf(wxLocale) _obj, void* szDomain );
+void       wxLocale_AddCatalogLookupPathPrefix( TSelf(wxLocale) _obj, void* prefix );
+TClass(wxLocale) wxLocale_Create( int _name, int _flags );
+void       wxLocale_Delete( TSelf(wxLocale) _obj );
+TClass(wxLocale) wxLocale_GetLocale( TSelf(wxLocale) _obj );
+int        wxLocale_GetName( TSelf(wxLocale) _obj, void* _ref );
+TClass(wxString) wxLocale_GetString( TSelf(wxLocale) _obj, void* szOrigString, void* szDomain );
+TBool      wxLocale_IsLoaded( TSelf(wxLocale) _obj, void* szDomain );
+TBool      wxLocale_IsOk( TSelf(wxLocale) _obj );
+
+/* wxLog */
+TClassDef(wxLog)
+
+/* wxLogChain */
+TClassDefExtend(wxLogChain,wxLog)
+TClass(wxLogChain) wxLogChain_Create( TClass(wxLog) logger );
+void       wxLogChain_Delete( TSelf(wxLogChain) _obj );
+TClass(wxLog) wxLogChain_GetOldLog( TSelf(wxLogChain) _obj );
+TBool      wxLogChain_IsPassingMessages( TSelf(wxLogChain) _obj );
+void       wxLogChain_PassMessages( TSelf(wxLogChain) _obj, TBoolInt bDoPass );
+void       wxLogChain_SetLog( TSelf(wxLogChain) _obj, TClass(wxLog) logger );
+
+/* wxLogGUI */
+TClassDefExtend(wxLogGUI,wxLog)
+
+/* wxLogNull */
+TClassDefExtend(wxLogNull,wxLog)
+
+/* wxLogPassThrough */
+TClassDefExtend(wxLogPassThrough,wxLogChain)
+
+/* wxLogStderr */
+TClassDefExtend(wxLogStderr,wxLog)
+
+/* wxLogStream */
+TClassDefExtend(wxLogStream,wxLog)
+
+/* wxLogTextCtrl */
+TClassDefExtend(wxLogTextCtrl,wxLog)
+
+/* wxLogWindow */
+TClassDefExtend(wxLogWindow,wxLogPassThrough)
+
+/* wxLongLong */
+TClassDef(wxLongLong)
+
+/* wxMBConv */
+TClassDef(wxMBConv)
+
+/* wxMBConvFile */
+TClassDefExtend(wxMBConvFile,wxMBConv)
+
+/* wxMBConvUTF7 */
+TClassDefExtend(wxMBConvUTF7,wxMBConv)
+
+/* wxMBConvUTF8 */
+TClassDefExtend(wxMBConvUTF8,wxMBConv)
+
+/* wxMDIChildFrame */
+TClassDefExtend(wxMDIChildFrame,wxFrame)
+void       wxMDIChildFrame_Activate( TSelf(wxMDIChildFrame) _obj );
+TClass(wxMDIChildFrame) wxMDIChildFrame_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+
+/* wxMDIClientWindow */
+TClassDefExtend(wxMDIClientWindow,wxWindow)
+
+/* wxMDIParentFrame */
+TClassDefExtend(wxMDIParentFrame,wxFrame)
+void       wxMDIParentFrame_ActivateNext( TSelf(wxMDIParentFrame) _obj );
+void       wxMDIParentFrame_ActivatePrevious( TSelf(wxMDIParentFrame) _obj );
+void       wxMDIParentFrame_ArrangeIcons( TSelf(wxMDIParentFrame) _obj );
+void       wxMDIParentFrame_Cascade( TSelf(wxMDIParentFrame) _obj );
+TClass(wxMDIParentFrame)  wxMDIParentFrame_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+TClass(wxMDIChildFrame)   wxMDIParentFrame_GetActiveChild( TSelf(wxMDIParentFrame) _obj );
+TClass(wxMDIClientWindow) wxMDIParentFrame_GetClientWindow( TSelf(wxMDIParentFrame) _obj );
+TClass(wxMenu)            wxMDIParentFrame_GetWindowMenu( TSelf(wxMDIParentFrame) _obj );
+TClass(wxMDIClientWindow) wxMDIParentFrame_OnCreateClient( TSelf(wxMDIParentFrame) _obj );
+void       wxMDIParentFrame_SetWindowMenu( TSelf(wxMDIParentFrame) _obj, TClass(wxMenu) menu );
+void       wxMDIParentFrame_Tile( TSelf(wxMDIParentFrame) _obj );
+
+/* wxMask */
+TClassDefExtend(wxMask,wxObject)
+TClass(wxMask) wxMask_Create( TClass(wxBitmap) bitmap );
+void*      wxMask_CreateColoured( TClass(wxBitmap) bitmap, TClass(wxColour) colour );
+
+/* wxMaximizeEvent */
+TClassDefExtend(wxMaximizeEvent,wxEvent)
+
+/* wxMemoryDC */
+TClassDefExtend(wxMemoryDC,wxDC)
+TClass(wxMemoryDC) wxMemoryDC_Create(  );
+TClass(wxMemoryDC) wxMemoryDC_CreateCompatible( TClass(wxDC) dc );
+void       wxMemoryDC_Delete( TSelf(wxMemoryDC) _obj );
+void       wxMemoryDC_SelectObject( TSelf(wxMemoryDC) _obj, TClass(wxBitmap) bitmap );
+
+/* wxMemoryFSHandler */
+TClassDefExtend(wxMemoryFSHandler,wxFileSystemHandler)
+
+/* wxMemoryInputStream */
+TClassDefExtend(wxMemoryInputStream,wxInputStream)
+
+/* wxMemoryOutputStream */
+TClassDefExtend(wxMemoryOutputStream,wxOutputStream)
+
+/* wxMenu */
+TClassDefExtend(wxMenu,wxEvtHandler)
+void       wxMenu_Append( TSelf(wxMenu) _obj, int id, TString text, TString help, TBool isCheckable );
+void       wxMenu_AppendItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
+void       wxMenu_AppendSeparator( TSelf(wxMenu) _obj );
+void       wxMenu_AppendSub( TSelf(wxMenu) _obj, int id, TString text, TClass(wxMenu) submenu, TString help );
+void       wxMenu_Break( TSelf(wxMenu) _obj );
+void       wxMenu_Check( TSelf(wxMenu) _obj, int id, TBool check );
+TClass(wxMenu) wxMenu_Create( TString title, long style );
+void       wxMenu_DeleteById( TSelf(wxMenu) _obj, int id );
+void       wxMenu_DeleteByItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
+void       wxMenu_DeletePointer( TSelf(wxMenu) _obj );
+void       wxMenu_DestroyById( TSelf(wxMenu) _obj, int id );
+void       wxMenu_DestroyByItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
+void       wxMenu_Enable( TSelf(wxMenu) _obj, int id, TBool enable );
+TClass(wxMenuItem)  wxMenu_FindItem( TSelf(wxMenu) _obj, int id, TClass(wxMenu)* menu );
+int        wxMenu_FindItemByLabel( TSelf(wxMenu) _obj, TString itemString );
+TClass(wxClientData) wxMenu_GetClientData( TSelf(wxMenu) _obj );
+TStringLen wxMenu_GetHelpString( TSelf(wxMenu) _obj, int id, TStringOutVoid _buf );
+TClass(wxWindow) wxMenu_GetInvokingWindow( TSelf(wxMenu) _obj );
+TStringLen wxMenu_GetLabel( TSelf(wxMenu) _obj, int id, TStringOutVoid _buf );
+size_t     wxMenu_GetMenuItemCount( TSelf(wxMenu) _obj );
+int        wxMenu_GetMenuItems( TSelf(wxMenu) _obj, TClass(wxList) _lst );
+TClass(wxMenu) wxMenu_GetParent( TSelf(wxMenu) _obj );
+int        wxMenu_GetStyle( TSelf(wxMenu) _obj );
+TStringLen wxMenu_GetTitle( TSelf(wxMenu) _obj, TStringOutVoid _buf );
+void       wxMenu_Insert( TSelf(wxMenu) _obj, size_t pos, int id, TString text, TString help, TBool isCheckable );
+void       wxMenu_InsertItem( TSelf(wxMenu) _obj, size_t pos, TClass(wxMenuItem) _itm );
+void       wxMenu_InsertSub( TSelf(wxMenu) _obj, size_t pos, int id, TString text, TClass(wxMenu) submenu, TString help );
+TBool      wxMenu_IsAttached( TSelf(wxMenu) _obj );
+TBool      wxMenu_IsChecked( TSelf(wxMenu) _obj, int id );
+TBool      wxMenu_IsEnabled( TSelf(wxMenu) _obj, int id );
+void       wxMenu_Prepend( TSelf(wxMenu) _obj, int id, TString text, TString help, TBool isCheckable );
+void       wxMenu_PrependItem( TSelf(wxMenu) _obj, TClass(wxMenuItem) _itm );
+void       wxMenu_PrependSub( TSelf(wxMenu) _obj, int id, TString text, TClass(wxMenu) submenu, TString help );
+void       wxMenu_RemoveById( TSelf(wxMenu) _obj, int id, TClass(wxMenuItem) _itm );
+void       wxMenu_RemoveByItem( TSelf(wxMenu) _obj, void* item );
+void       wxMenu_SetClientData( TSelf(wxMenu) _obj, TClass(wxClientData) clientData );
+void       wxMenu_SetEventHandler( TSelf(wxMenu) _obj, TClass(wxEvtHandler) handler );
+void       wxMenu_SetHelpString( TSelf(wxMenu) _obj, int id, TString helpString );
+void       wxMenu_SetInvokingWindow( TSelf(wxMenu) _obj, TClass(wxWindow) win );
+void       wxMenu_SetLabel( TSelf(wxMenu) _obj, int id, TString label );
+void       wxMenu_SetParent( TSelf(wxMenu) _obj, TClass(wxWindow) parent );
+void       wxMenu_SetTitle( TSelf(wxMenu) _obj, TString title );
+void       wxMenu_UpdateUI( TSelf(wxMenu) _obj, void* source );
+
+/* wxMenuBar */
+TClassDefExtend(wxMenuBar,wxEvtHandler)
+int        wxMenuBar_Append( TSelf(wxMenuBar) _obj, TClass(wxMenu) menu, TString title );
+void       wxMenuBar_Check( TSelf(wxMenuBar) _obj, int id, TBool check );
+TClass(wxMenuBar) wxMenuBar_Create( int _style );
+void       wxMenuBar_DeletePointer( TSelf(wxMenuBar) _obj );
+int        wxMenuBar_Enable( TSelf(wxMenuBar) _obj, TBool enable );
+void       wxMenuBar_EnableItem( TSelf(wxMenuBar) _obj, int id, TBool enable );
+void       wxMenuBar_EnableTop( TSelf(wxMenuBar) _obj, int pos, TBool enable );
+void*      wxMenuBar_FindItem( TSelf(wxMenuBar) _obj, int id, TClass(wxMenu) menu );
+int        wxMenuBar_FindMenu( TSelf(wxMenuBar) _obj, TString title );
+int        wxMenuBar_FindMenuItem( TSelf(wxMenuBar) _obj, TString menuString, TString itemString );
+TStringLen wxMenuBar_GetHelpString( TSelf(wxMenuBar) _obj, int id, TStringOutVoid _buf );
+TStringLen wxMenuBar_GetLabel( TSelf(wxMenuBar) _obj, int id, TStringOutVoid _buf );
+TStringLen wxMenuBar_GetLabelTop( TSelf(wxMenuBar) _obj, int pos, TStringOutVoid _buf );
+TClass(wxMenu) wxMenuBar_GetMenu( TSelf(wxMenuBar) _obj, int pos );
+int        wxMenuBar_GetMenuCount( TSelf(wxMenuBar) _obj );
+int        wxMenuBar_Insert( TSelf(wxMenuBar) _obj, int pos, TClass(wxMenu) menu, TString title );
+TBool      wxMenuBar_IsChecked( TSelf(wxMenuBar) _obj, int id );
+TBool      wxMenuBar_IsEnabled( TSelf(wxMenuBar) _obj, int id );
+void*      wxMenuBar_Remove( TSelf(wxMenuBar) _obj, int pos );
+void*      wxMenuBar_Replace( TSelf(wxMenuBar) _obj, int pos, TClass(wxMenu) menu, TString title );
+void       wxMenuBar_SetHelpString( TSelf(wxMenuBar) _obj, int id, TString helpString );
+void       wxMenuBar_SetItemLabel( TSelf(wxMenuBar) _obj, int id, TString label );
+void       wxMenuBar_SetLabel( TSelf(wxMenuBar) _obj, TString s );
+void       wxMenuBar_SetLabelTop( TSelf(wxMenuBar) _obj, int pos, TString label );
+
+/* wxMenuEvent */
+TClassDefExtend(wxMenuEvent,wxEvent)
+void       wxMenuEvent_CopyObject( TSelf(wxMenuEvent) _obj, void* obj );
+int        wxMenuEvent_GetMenuId( TSelf(wxMenuEvent) _obj );
+
+/* wxMenuItem */
+TClassDefExtend(wxMenuItem,wxObject)
+void       wxMenuItem_Check( TSelf(wxMenuItem) _obj, TBool check );
+TClass(wxMenuItem) wxMenuItem_Create(  );
+void       wxMenuItem_Delete( TSelf(wxMenuItem) _obj );
+void       wxMenuItem_Enable( TSelf(wxMenuItem) _obj, TBool enable );
+TStringLen wxMenuItem_GetHelp( TSelf(wxMenuItem) _obj, TStringOutVoid _buf );
+int        wxMenuItem_GetId( TSelf(wxMenuItem) _obj );
+TStringLen wxMenuItem_GetLabel( TSelf(wxMenuItem) _obj, TStringOutVoid _buf );
+TStringLen wxMenuItem_GetLabelFromText( TStringVoid text, TStringOutVoid _buf );
+TClass(wxMenu) wxMenuItem_GetMenu( TSelf(wxMenuItem) _obj );
+void*      wxMenuItem_GetSubMenu( TSelf(wxMenuItem) _obj );
+TStringLen wxMenuItem_GetText( TSelf(wxMenuItem) _obj, TStringOutVoid _buf );
+TBool      wxMenuItem_IsCheckable( TSelf(wxMenuItem) _obj );
+TBool      wxMenuItem_IsChecked( TSelf(wxMenuItem) _obj );
+TBool      wxMenuItem_IsEnabled( TSelf(wxMenuItem) _obj );
+TBool      wxMenuItem_IsSeparator( TSelf(wxMenuItem) _obj );
+TBool      wxMenuItem_IsSubMenu( TSelf(wxMenuItem) _obj );
+void       wxMenuItem_SetCheckable( TSelf(wxMenuItem) _obj, int checkable );
+void       wxMenuItem_SetHelp( TSelf(wxMenuItem) _obj, TStringVoid str );
+void       wxMenuItem_SetId( TSelf(wxMenuItem) _obj, int id );
+void       wxMenuItem_SetSubMenu( TSelf(wxMenuItem) _obj, TClass(wxMenu) menu );
+void       wxMenuItem_SetText( TSelf(wxMenuItem) _obj, TStringVoid str );
+
+/* wxMessageDialog */
+TClassDefExtend(wxMessageDialog,wxDialog)
+TClass(wxMessageDialog) wxMessageDialog_Create( TClass(wxWindow) _prt, TStringVoid _msg, TStringVoid _cap, int _stl );
+void       wxMessageDialog_Delete( TSelf(wxMessageDialog) _obj );
+int        wxMessageDialog_ShowModal( TSelf(wxMessageDialog) _obj );
+
+/* wxMetafile */
+TClassDefExtend(wxMetafile,wxObject)
+TClass(wxMetafile) wxMetafile_Create( TStringVoid _file );
+void       wxMetafile_Delete( TSelf(wxMetafile) _obj );
+TBool      wxMetafile_Ok( TSelf(wxMetafile) _obj );
+TBool      wxMetafile_Play( TSelf(wxMetafile) _obj, TClass(wxDC) _dc );
+TBool      wxMetafile_SetClipboard( TSelf(wxMetafile) _obj, TSize(width,height) );
+
+/* wxMetafileDC */
+TClassDefExtend(wxMetafileDC,wxDC)
+void*      wxMetafileDC_Close( TSelf(wxMetafileDC) _obj );
+TClass(wxMetafileDC) wxMetafileDC_Create( TStringVoid _file );
+void       wxMetafileDC_Delete( TSelf(wxMetafileDC) _obj );
+
+/* wxMimeTypesManager */
+TClassDef(wxMimeTypesManager)
+void       wxMimeTypesManager_AddFallbacks( TSelf(wxMimeTypesManager) _obj, void* _types );
+TClass(wxMimeTypesManager) wxMimeTypesManager_Create(  );
+int        wxMimeTypesManager_EnumAllFileTypes( TSelf(wxMimeTypesManager) _obj, TClass(wxList) _lst );
+void*      wxMimeTypesManager_GetFileTypeFromExtension( TSelf(wxMimeTypesManager) _obj, void* _ext );
+void*      wxMimeTypesManager_GetFileTypeFromMimeType( TSelf(wxMimeTypesManager) _obj, TStringVoid _name );
+TBool      wxMimeTypesManager_IsOfType( TSelf(wxMimeTypesManager) _obj, void* _type, void* _wildcard );
+int        wxMimeTypesManager_ReadMailcap( TSelf(wxMimeTypesManager) _obj, void* _file, int _fb );
+int        wxMimeTypesManager_ReadMimeTypes( TSelf(wxMimeTypesManager) _obj, void* _file );
+
+/* wxMiniFrame */
+TClassDefExtend(wxMiniFrame,wxFrame)
+TClass(wxMiniFrame) wxMiniFrame_Create( TClass(wxWindow) _prt, int _id, TStringVoid _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+
+/* wxModule */
+TClassDefExtend(wxModule,wxObject)
+
+/* wxMouseCaptureChangedEvent */
+TClassDefExtend(wxMouseCaptureChangedEvent,wxEvent)
+
+/* wxMouseEvent */
+TClassDefExtend(wxMouseEvent,wxEvent)
+TBool      wxMouseEvent_AltDown( TSelf(wxMouseEvent) _obj );
+int        wxMouseEvent_Button( TSelf(wxMouseEvent) _obj, int but );
+TBool      wxMouseEvent_ButtonDClick( TSelf(wxMouseEvent) _obj, int but );
+TBool      wxMouseEvent_ButtonDown( TSelf(wxMouseEvent) _obj, int but );
+TBool      wxMouseEvent_ButtonIsDown( TSelf(wxMouseEvent) _obj, int but );
+TBool      wxMouseEvent_ButtonUp( TSelf(wxMouseEvent) _obj, int but );
+TBool      wxMouseEvent_ControlDown( TSelf(wxMouseEvent) _obj );
+void       wxMouseEvent_CopyObject( TSelf(wxMouseEvent) _obj, void* object_dest );
+TBool      wxMouseEvent_Dragging( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_Entering( TSelf(wxMouseEvent) _obj );
+void       wxMouseEvent_GetLogicalPosition( TSelf(wxMouseEvent) _obj, TClass(wxDC) dc, TPointOut(_x,_y) );
+void       wxMouseEvent_GetPosition( TSelf(wxMouseEvent) _obj, TPointOut(_x,_y) );
+int        wxMouseEvent_GetX( TSelf(wxMouseEvent) _obj );
+int        wxMouseEvent_GetY( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_IsButton( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_Leaving( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_LeftDClick( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_LeftDown( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_LeftIsDown( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_LeftUp( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_MetaDown( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_MiddleDClick( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_MiddleDown( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_MiddleIsDown( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_MiddleUp( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_Moving( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_RightDClick( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_RightDown( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_RightIsDown( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_RightUp( TSelf(wxMouseEvent) _obj );
+TBool      wxMouseEvent_ShiftDown( TSelf(wxMouseEvent) _obj );
+
+/* wxMoveEvent */
+TClassDefExtend(wxMoveEvent,wxEvent)
+void       wxMoveEvent_CopyObject( TSelf(wxMoveEvent) _obj, void* obj );
+void       wxMoveEvent_GetPosition( TSelf(wxMoveEvent) _obj, TPointOut(_x,_y) );
+
+/* wxMultiCellCanvas */
+TClassDefExtend(wxMultiCellCanvas,wxFlexGridSizer)
+void       wxMultiCellCanvas_Add( TSelf(wxMultiCellCanvas) _obj, TClass(wxWindow) win, int row, int col );
+void       wxMultiCellCanvas_CalculateConstraints( TSelf(wxMultiCellCanvas) _obj );
+TClass(wxMultiCellCanvas) wxMultiCellCanvas_Create( TClass(wxWindow) parent, int numRows, int numCols );
+int        wxMultiCellCanvas_MaxCols( TSelf(wxMultiCellCanvas) _obj );
+int        wxMultiCellCanvas_MaxRows( TSelf(wxMultiCellCanvas) _obj );
+void       wxMultiCellCanvas_SetMinCellSize( TSelf(wxMultiCellCanvas) _obj, TSize(w,h) );
+
+/* wxMultiCellItemHandle */
+TClassDefExtend(wxMultiCellItemHandle,wxObject)
+TClass(wxMultiCellItemHandle) wxMultiCellItemHandle_Create( int row, int column, int height, int width, int sx, int sy, int style, int wx, int wy, int align );
+void*      wxMultiCellItemHandle_CreateWithSize( TSelf(wxMultiCellItemHandle) _obj, int row, int column, int sx, int sy, int style, int wx, int wy, int align );
+void*      wxMultiCellItemHandle_CreateWithStyle( TSelf(wxMultiCellItemHandle) _obj, int row, int column, int style, int wx, int wy, int align );
+int        wxMultiCellItemHandle_GetAlignment( TSelf(wxMultiCellItemHandle) _obj );
+int        wxMultiCellItemHandle_GetColumn( TSelf(wxMultiCellItemHandle) _obj );
+int        wxMultiCellItemHandle_GetHeight( TSelf(wxMultiCellItemHandle) _obj );
+void       wxMultiCellItemHandle_GetLocalSize( TSelf(wxMultiCellItemHandle) _obj, TSizeOutVoid(_w,_h) );
+int        wxMultiCellItemHandle_GetRow( TSelf(wxMultiCellItemHandle) _obj );
+int        wxMultiCellItemHandle_GetStyle( TSelf(wxMultiCellItemHandle) _obj );
+void       wxMultiCellItemHandle_GetWeight( TSelf(wxMultiCellItemHandle) _obj, TSizeOutVoid(_w,_h) );
+int        wxMultiCellItemHandle_GetWidth( TSelf(wxMultiCellItemHandle) _obj );
+
+/* wxMultiCellSizer */
+TClassDefExtend(wxMultiCellSizer,wxSizer)
+void       wxMultiCellSizer_CalcMin( TSelf(wxMultiCellSizer) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxMultiCellSizer) wxMultiCellSizer_Create( int rows, int cols );
+void       wxMultiCellSizer_Delete( TSelf(wxMultiCellSizer) _obj );
+int        wxMultiCellSizer_EnableGridLines( TSelf(wxMultiCellSizer) _obj, TClass(wxWindow) win );
+void       wxMultiCellSizer_RecalcSizes( TSelf(wxMultiCellSizer) _obj );
+int        wxMultiCellSizer_SetColumnWidth( TSelf(wxMultiCellSizer) _obj, int column, int colSize, int expandable );
+int        wxMultiCellSizer_SetDefaultCellSize( TSelf(wxMultiCellSizer) _obj, TSize(w,h) );
+int        wxMultiCellSizer_SetGridPen( TSelf(wxMultiCellSizer) _obj, TClass(wxPen) pen );
+int        wxMultiCellSizer_SetRowHeight( TSelf(wxMultiCellSizer) _obj, int row, int rowSize, int expandable );
+
+/* wxMutex */
+TClassDef(wxMutex)
+TClass(wxMutex) wxMutex_Create(  );
+void       wxMutex_Delete( TSelf(wxMutex) _obj );
+TBool      wxMutex_IsLocked( TSelf(wxMutex) _obj );
+int        wxMutex_Lock( TSelf(wxMutex) _obj );
+int        wxMutex_TryLock( TSelf(wxMutex) _obj );
+int        wxMutex_Unlock( TSelf(wxMutex) _obj );
+
+/* wxMutexLocker */
+TClassDef(wxMutexLocker)
+
+/* wxNavigationKeyEvent */
+TClassDefExtend(wxNavigationKeyEvent,wxEvent)
+void*      wxNavigationKeyEvent_GetCurrentFocus( TSelf(wxNavigationKeyEvent) _obj );
+int        wxNavigationKeyEvent_GetDirection( TSelf(wxNavigationKeyEvent) _obj );
+TBool      wxNavigationKeyEvent_IsWindowChange( TSelf(wxNavigationKeyEvent) _obj );
+void       wxNavigationKeyEvent_SetCurrentFocus( TSelf(wxNavigationKeyEvent) _obj, TClass(wxWindow) win );
+void       wxNavigationKeyEvent_SetDirection( TSelf(wxNavigationKeyEvent) _obj, int bForward );
+/* void       wxNavigationKeyEvent_SetPropagate( TSelf(wxNavigationKeyEvent) _obj, int bDoIt );*/
+void       wxNavigationKeyEvent_SetWindowChange( TSelf(wxNavigationKeyEvent) _obj, int bIs );
+int        wxNavigationKeyEvent_ShouldPropagate( TSelf(wxNavigationKeyEvent) _obj );
+
+/* wxNewBitmapButton */
+TClassDefExtend(wxNewBitmapButton,wxPanel)
+TClass(wxNewBitmapButton) wxNewBitmapButton_Create( void* labelBitmap, void* labelText, int alignText, TBool isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, TBool isSticky );
+TClass(wxNewBitmapButton) wxNewBitmapButton_CreateFromFile( TSelf(wxNewBitmapButton) bitmapFileName, int bitmapFileType, void* labelText, int alignText, TBool isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, TBool isSticky );
+void       wxNewBitmapButton_Delete( TSelf(wxNewBitmapButton) _obj );
+void       wxNewBitmapButton_DrawDecorations( TSelf(wxNewBitmapButton) _obj, TClass(wxDC) dc );
+void       wxNewBitmapButton_DrawLabel( TSelf(wxNewBitmapButton) _obj, TClass(wxDC) dc );
+int        wxNewBitmapButton_Enable( TSelf(wxNewBitmapButton) _obj, TBool enable );
+void       wxNewBitmapButton_Realize( TSelf(wxNewBitmapButton) _obj, TClass(wxWindow) _prt, int _id, TRect(_x,_y,_w,_h) );
+void       wxNewBitmapButton_RenderAllLabelImages( TSelf(wxNewBitmapButton) _obj );
+void       wxNewBitmapButton_RenderLabelImage( TSelf(wxNewBitmapButton) _obj, void* destBmp, void* srcBmp, TBool isEnabled, TBool isPressed );
+void       wxNewBitmapButton_RenderLabelImages( TSelf(wxNewBitmapButton) _obj );
+void       wxNewBitmapButton_Reshape( TSelf(wxNewBitmapButton) _obj );
+void       wxNewBitmapButton_SetAlignments( TSelf(wxNewBitmapButton) _obj, int alignText, int marginX, int marginY, int textToLabelGap );
+void       wxNewBitmapButton_SetLabel( TSelf(wxNewBitmapButton) _obj, void* labelBitmap, void* labelText );
+
+/* wxNodeBase */
+TClassDef(wxNodeBase)
+
+/* wxNotebook */
+TClassDefExtend(wxNotebook,wxControl)
+int        wxNotebook_AddPage( TSelf(wxNotebook) _obj, TClass(wxWindow) pPage, TStringVoid strText, TBoolInt bSelect, int imageId );
+void       wxNotebook_AdvanceSelection( TSelf(wxNotebook) _obj, TBoolInt bForward );
+TClass(wxNotebook) wxNotebook_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxNotebook_DeleteAllPages( TSelf(wxNotebook) _obj );
+int        wxNotebook_DeletePage( TSelf(wxNotebook) _obj, int nPage );
+TClass(wxImageList) wxNotebook_GetImageList( TSelf(wxNotebook) _obj );
+TClass(wxWindow)    wxNotebook_GetPage( TSelf(wxNotebook) _obj, int nPage );
+int        wxNotebook_GetPageCount( TSelf(wxNotebook) _obj );
+int        wxNotebook_GetPageImage( TSelf(wxNotebook) _obj, int nPage );
+TStringLen wxNotebook_GetPageText( TSelf(wxNotebook) _obj, int nPage, TStringOutVoid _buf );
+int        wxNotebook_GetRowCount( TSelf(wxNotebook) _obj );
+int        wxNotebook_GetSelection( TSelf(wxNotebook) _obj );
+int        wxNotebook_InsertPage( TSelf(wxNotebook) _obj, int nPage, TClass(wxWindow) pPage, TStringVoid strText, TBoolInt bSelect, int imageId );
+int        wxNotebook_RemovePage( TSelf(wxNotebook) _obj, int nPage );
+void       wxNotebook_SetImageList( TSelf(wxNotebook) _obj, TClass(wxImageList) imageList );
+void       wxNotebook_SetPadding( TSelf(wxNotebook) _obj, TSize(_w,_h) );
+int        wxNotebook_SetPageImage( TSelf(wxNotebook) _obj, int nPage, int nImage );
+void       wxNotebook_SetPageSize( TSelf(wxNotebook) _obj, TSize(_w,_h) );
+int        wxNotebook_SetPageText( TSelf(wxNotebook) _obj, int nPage, TStringVoid strText );
+int        wxNotebook_SetSelection( TSelf(wxNotebook) _obj, int nPage );
+
+/* wxNotebookEvent */
+TClassDefExtend(wxNotebookEvent,wxNotifyEvent)
+
+/* wxNotebookSizer */
+TClassDefExtend(wxNotebookSizer,wxSizer)
+void       wxNotebookSizer_CalcMin( TSelf(wxNotebookSizer) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxNotebookSizer) wxNotebookSizer_Create( TClass(wxNotebook) nb );
+TClass(wxNotebook) wxNotebookSizer_GetNotebook( TSelf(wxNotebookSizer) _obj );
+void       wxNotebookSizer_RecalcSizes( TSelf(wxNotebookSizer) _obj );
+
+/* wxNotifyEvent */
+TClassDefExtend(wxNotifyEvent,wxCommandEvent)
+void       wxNotifyEvent_Allow( TSelf(wxNotifyEvent) _obj );
+void       wxNotifyEvent_CopyObject( TSelf(wxNotifyEvent) _obj, void* object_dest );
+TBool      wxNotifyEvent_IsAllowed( TSelf(wxNotifyEvent) _obj );
+void       wxNotifyEvent_Veto( TSelf(wxNotifyEvent) _obj );
+
+/* wxObject */
+TClassDef(wxObject)
+
+/* wxObjectRefData */
+TClassDef(wxObjectRefData)
+
+/* wxOutputStream */
+TClassDefExtend(wxOutputStream,wxStreamBase)
+void       wxOutputStream_Delete( TSelf(wxOutputStream) _obj );
+int        wxOutputStream_LastWrite( TSelf(wxOutputStream) _obj );
+void       wxOutputStream_PutC( TSelf(wxOutputStream) _obj, TChar c );
+int        wxOutputStream_Seek( TSelf(wxOutputStream) _obj, int pos, int mode );
+void       wxOutputStream_Sync( TSelf(wxOutputStream) _obj );
+int        wxOutputStream_Tell( TSelf(wxOutputStream) _obj );
+void       wxOutputStream_Write( TSelf(wxOutputStream) _obj, void* buffer, int size );
+
+/* wxPageSetupDialog */
+TClassDefExtend(wxPageSetupDialog,wxDialog)
+TClass(wxPageSetupDialog) wxPageSetupDialog_Create( TClass(wxWindow) parent, TClass(wxPageSetupDialogData) data );
+void       wxPageSetupDialog_GetPageSetupData( TSelf(wxPageSetupDialog) _obj, TClassRef(wxPageSetupDialogData) _ref );
+
+/* wxPageSetupDialogData */
+TClassDefExtend(wxPageSetupDialogData,wxObject)
+void       wxPageSetupDialogData_Assign( TSelf(wxPageSetupDialogData) _obj, TClassRef(wxPageSetupDialogData) data );
+void       wxPageSetupDialogData_AssignData( TSelf(wxPageSetupDialogData) _obj, TClass(wxPrintData) printData );
+void       wxPageSetupDialogData_CalculateIdFromPaperSize( TSelf(wxPageSetupDialogData) _obj );
+void       wxPageSetupDialogData_CalculatePaperSizeFromId( TSelf(wxPageSetupDialogData) _obj );
+TClass(wxPageSetupDialogData) wxPageSetupDialogData_Create(  );
+TClass(wxPageSetupDialogData) wxPageSetupDialogData_CreateFromData( TClass(wxPrintData) printData );
+void       wxPageSetupDialogData_Delete( TSelf(wxPageSetupDialogData) _obj );
+void       wxPageSetupDialogData_EnableHelp( TSelf(wxPageSetupDialogData) _obj, TBool flag );
+void       wxPageSetupDialogData_EnableMargins( TSelf(wxPageSetupDialogData) _obj, TBool flag );
+void       wxPageSetupDialogData_EnableOrientation( TSelf(wxPageSetupDialogData) _obj, TBool flag );
+void       wxPageSetupDialogData_EnablePaper( TSelf(wxPageSetupDialogData) _obj, TBool flag );
+void       wxPageSetupDialogData_EnablePrinter( TSelf(wxPageSetupDialogData) _obj, TBool flag );
+TBool      wxPageSetupDialogData_GetDefaultInfo( TSelf(wxPageSetupDialogData) _obj );
+TBool      wxPageSetupDialogData_GetDefaultMinMargins( TSelf(wxPageSetupDialogData) _obj );
+TBool      wxPageSetupDialogData_GetEnableHelp( TSelf(wxPageSetupDialogData) _obj );
+TBool      wxPageSetupDialogData_GetEnableMargins( TSelf(wxPageSetupDialogData) _obj );
+TBool      wxPageSetupDialogData_GetEnableOrientation( TSelf(wxPageSetupDialogData) _obj );
+TBool      wxPageSetupDialogData_GetEnablePaper( TSelf(wxPageSetupDialogData) _obj );
+TBool      wxPageSetupDialogData_GetEnablePrinter( TSelf(wxPageSetupDialogData) _obj );
+void       wxPageSetupDialogData_GetMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
+void       wxPageSetupDialogData_GetMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
+void       wxPageSetupDialogData_GetMinMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
+void       wxPageSetupDialogData_GetMinMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPointOutVoid(_x,_y) );
+int        wxPageSetupDialogData_GetPaperId( TSelf(wxPageSetupDialogData) _obj );
+void       wxPageSetupDialogData_GetPaperSize( TSelf(wxPageSetupDialogData) _obj, TSizeOutVoid(_w,_h) );
+void       wxPageSetupDialogData_GetPrintData( TSelf(wxPageSetupDialogData) _obj, TClassRef(wxPrintData) _ref );
+void       wxPageSetupDialogData_SetDefaultInfo( TSelf(wxPageSetupDialogData) _obj, TBool flag );
+void       wxPageSetupDialogData_SetDefaultMinMargins( TSelf(wxPageSetupDialogData) _obj, int flag );
+void       wxPageSetupDialogData_SetMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
+void       wxPageSetupDialogData_SetMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
+void       wxPageSetupDialogData_SetMinMarginBottomRight( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
+void       wxPageSetupDialogData_SetMinMarginTopLeft( TSelf(wxPageSetupDialogData) _obj, TPoint(x,y) );
+void       wxPageSetupDialogData_SetPaperId( TSelf(wxPageSetupDialogData) _obj, void* id );
+void       wxPageSetupDialogData_SetPaperSize( TSelf(wxPageSetupDialogData) _obj, TSize(w,h) );
+void       wxPageSetupDialogData_SetPaperSizeId( TSelf(wxPageSetupDialogData) _obj, int id );
+void       wxPageSetupDialogData_SetPrintData( TSelf(wxPageSetupDialogData) _obj, TClass(wxPrintData) printData );
+
+/* wxPaintDC */
+TClassDefExtend(wxPaintDC,wxWindowDC)
+TClass(wxPaintDC) wxPaintDC_Create( TClass(wxWindow) win );
+void       wxPaintDC_Delete( TSelf(wxPaintDC) _obj );
+
+/* wxPaintEvent */
+TClassDefExtend(wxPaintEvent,wxEvent)
+
+/* wxPalette */
+TClassDefExtend(wxPalette,wxGDIObject)
+void       wxPalette_Assign( TSelf(wxPalette) _obj, TClass(wxPalette) palette );
+TClass(wxPalette) wxPalette_CreateDefault(  );
+TClass(wxPalette) wxPalette_CreateRGB( int n, void* red, void* green, void* blue );
+void       wxPalette_Delete( TSelf(wxPalette) _obj );
+int        wxPalette_GetPixel( TSelf(wxPalette) _obj, TColorRGB(red,green,blue) );
+TBoolInt   wxPalette_GetRGB( TSelf(wxPalette) _obj, int pixel, void* red, void* green, void* blue );
+TBool      wxPalette_IsEqual( TSelf(wxPalette) _obj, TClass(wxPalette) palette );
+TBool      wxPalette_Ok( TSelf(wxPalette) _obj );
+
+/* wxPaletteChangedEvent */
+TClassDefExtend(wxPaletteChangedEvent,wxEvent)
+void       wxPaletteChangedEvent_CopyObject( TSelf(wxPaletteChangedEvent) _obj, void* obj );
+void*      wxPaletteChangedEvent_GetChangedWindow( TSelf(wxPaletteChangedEvent) _obj );
+void       wxPaletteChangedEvent_SetChangedWindow( TSelf(wxPaletteChangedEvent) _obj, TClass(wxWindow) win );
+
+/* wxPanel */
+TClassDefExtend(wxPanel,wxWindow)
+TClass(wxPanel)  wxPanel_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+TClass(wxButton) wxPanel_GetDefaultItem( TSelf(wxPanel) _obj );
+void       wxPanel_InitDialog( TSelf(wxPanel) _obj );
+void       wxPanel_SetDefaultItem( TSelf(wxPanel) _obj, TClass(wxButton) btn );
+
+/* wxPathList */
+TClassDefExtend(wxPathList,wxList)
+
+/* wxPen */
+TClassDefExtend(wxPen,wxGDIObject)
+void       wxPen_Assign( TSelf(wxPen) _obj, TClass(wxPen) pen );
+TClass(wxPen) wxPen_CreateDefault(  );
+TClass(wxPen) wxPen_CreateFromBitmap( TClass(wxBitmap) stipple, int width );
+TClass(wxPen) wxPen_CreateFromColour( TClass(wxColour) col, int width, int style );
+TClass(wxPen) wxPen_CreateFromStock( int id );
+void       wxPen_Delete( TSelf(wxPen) _obj );
+int        wxPen_GetCap( TSelf(wxPen) _obj );
+void       wxPen_GetColour( TSelf(wxPen) _obj, TClassRef(wxColour) _ref );
+int        wxPen_GetDashes( TSelf(wxPen) _obj, void* ptr );
+int        wxPen_GetJoin( TSelf(wxPen) _obj );
+void       wxPen_GetStipple( TSelf(wxPen) _obj, TClassRef(wxBitmap) _ref );
+int        wxPen_GetStyle( TSelf(wxPen) _obj );
+int        wxPen_GetWidth( TSelf(wxPen) _obj );
+TBool      wxPen_IsEqual( TSelf(wxPen) _obj, TClass(wxPen) pen );
+TBool      wxPen_Ok( TSelf(wxPen) _obj );
+void       wxPen_SetCap( TSelf(wxPen) _obj, int cap );
+void       wxPen_SetColour( TSelf(wxPen) _obj, TClass(wxColour) col );
+void       wxPen_SetColourSingle( TSelf(wxPen) _obj, TChar r, TChar g, TChar b );
+void       wxPen_SetDashes( TSelf(wxPen) _obj, int nb_dashes, void* dash );
+void       wxPen_SetJoin( TSelf(wxPen) _obj, int join );
+void       wxPen_SetStipple( TSelf(wxPen) _obj, TClass(wxBitmap) stipple );
+void       wxPen_SetStyle( TSelf(wxPen) _obj, int style );
+void       wxPen_SetWidth( TSelf(wxPen) _obj, int width );
+
+/* wxPenList */
+TClassDefExtend(wxPenList,wxList)
+
+/* wxPlotCurve */
+TClassDefExtend(wxPlotCurve,wxObject)
+
+/* wxPlotEvent */
+TClassDefExtend(wxPlotEvent,wxNotifyEvent)
+void*      wxPlotEvent_GetCurve( TSelf(wxPlotEvent) _obj );
+int        wxPlotEvent_GetPosition( TSelf(wxPlotEvent) _obj );
+double     wxPlotEvent_GetZoom( TSelf(wxPlotEvent) _obj );
+void       wxPlotEvent_SetPosition( TSelf(wxPlotEvent) _obj, int pos );
+void       wxPlotEvent_SetZoom( TSelf(wxPlotEvent) _obj, double zoom );
+
+/* wxPlotOnOffCurve */
+TClassDefExtend(wxPlotOnOffCurve,wxObject)
+void       wxPlotOnOffCurve_Add( TSelf(wxPlotOnOffCurve) _obj, int on, int off, TClass(wxClientData) clientData );
+TClass(wxPlotOnOffCurve) wxPlotOnOffCurve_Create( int offsetY );
+void       wxPlotOnOffCurve_Delete( TSelf(wxPlotOnOffCurve) _obj );
+void       wxPlotOnOffCurve_DrawOffLine( TSelf(wxPlotOnOffCurve) _obj, TClass(wxDC) dc, int y, int start, int end );
+void       wxPlotOnOffCurve_DrawOnLine( TSelf(wxPlotOnOffCurve) _obj, TClass(wxDC) dc, int y, int start, int end, TClass(wxClientData) clientData );
+void*      wxPlotOnOffCurve_GetAt( TSelf(wxPlotOnOffCurve) _obj, int index );
+TClass(wxClientData) wxPlotOnOffCurve_GetClientData( TSelf(wxPlotOnOffCurve) _obj, int index );
+int        wxPlotOnOffCurve_GetCount( TSelf(wxPlotOnOffCurve) _obj );
+int        wxPlotOnOffCurve_GetEndX( TSelf(wxPlotOnOffCurve) _obj );
+int        wxPlotOnOffCurve_GetOff( TSelf(wxPlotOnOffCurve) _obj, int index );
+int        wxPlotOnOffCurve_GetOffsetY( TSelf(wxPlotOnOffCurve) _obj );
+int        wxPlotOnOffCurve_GetOn( TSelf(wxPlotOnOffCurve) _obj, int index );
+int        wxPlotOnOffCurve_GetStartX( TSelf(wxPlotOnOffCurve) _obj );
+void       wxPlotOnOffCurve_SetOffsetY( TSelf(wxPlotOnOffCurve) _obj, int offsetY );
+
+/* wxPlotWindow */
+TClassDefExtend(wxPlotWindow,wxScrolledWindow)
+void       wxPlotWindow_Add( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve );
+void       wxPlotWindow_AddOnOff( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve );
+TClass(wxPlotWindow) wxPlotWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int flags );
+void       wxPlotWindow_Delete( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve );
+void       wxPlotWindow_DeleteOnOff( TSelf(wxPlotWindow) _obj, TClass(wxPlotOnOffCurve) curve );
+void       wxPlotWindow_Enlarge( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve, double factor );
+TClass(wxPlotCurve) wxPlotWindow_GetAt( TSelf(wxPlotWindow) _obj, int n );
+int        wxPlotWindow_GetCount( TSelf(wxPlotWindow) _obj );
+TClass(wxPlotCurve) wxPlotWindow_GetCurrent( TSelf(wxPlotWindow) _obj );
+int        wxPlotWindow_GetEnlargeAroundWindowCentre( TSelf(wxPlotWindow) _obj );
+TClass(wxPlotOnOffCurve)      wxPlotWindow_GetOnOffCurveAt( TSelf(wxPlotWindow) _obj, int n );
+int        wxPlotWindow_GetOnOffCurveCount( TSelf(wxPlotWindow) _obj );
+int        wxPlotWindow_GetScrollOnThumbRelease( TSelf(wxPlotWindow) _obj );
+double     wxPlotWindow_GetUnitsPerValue( TSelf(wxPlotWindow) _obj );
+double     wxPlotWindow_GetZoom( TSelf(wxPlotWindow) _obj );
+void       wxPlotWindow_Move( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) curve, int pixels_up );
+void       wxPlotWindow_RedrawEverything( TSelf(wxPlotWindow) _obj );
+void       wxPlotWindow_RedrawXAxis( TSelf(wxPlotWindow) _obj );
+void       wxPlotWindow_RedrawYAxis( TSelf(wxPlotWindow) _obj );
+void       wxPlotWindow_ResetScrollbar( TSelf(wxPlotWindow) _obj );
+void       wxPlotWindow_SetCurrent( TSelf(wxPlotWindow) _obj, TClass(wxPlotCurve) current );
+void       wxPlotWindow_SetEnlargeAroundWindowCentre( TSelf(wxPlotWindow) _obj, int enlargeAroundWindowCentre );
+void       wxPlotWindow_SetScrollOnThumbRelease( TSelf(wxPlotWindow) _obj, int scrollOnThumbRelease );
+void       wxPlotWindow_SetUnitsPerValue( TSelf(wxPlotWindow) _obj, double upv );
+void       wxPlotWindow_SetZoom( TSelf(wxPlotWindow) _obj, double zoom );
+
+/* wxPoint */
+TClassDef(wxPoint)
+TClass(wxPoint) wxPoint_Create( TPoint(xx,yy) );
+void       wxPoint_Destroy( TSelf(wxPoint) _obj );
+int        wxPoint_GetX( TSelf(wxPoint) _obj );
+int        wxPoint_GetY( TSelf(wxPoint) _obj );
+void       wxPoint_SetX( TSelf(wxPoint) _obj, int w );
+void       wxPoint_SetY( TSelf(wxPoint) _obj, int h );
+
+/* wxPopupTransientWindow */
+TClassDefExtend(wxPopupTransientWindow,wxPopupWindow)
+
+/* wxPopupWindow */
+TClassDefExtend(wxPopupWindow,wxWindow)
+
+/* wxPostScriptDC */
+TClassDefExtend(wxPostScriptDC,wxDC)
+
+/* wxPreviewCanvas */
+TClassDefExtend(wxPreviewCanvas,wxScrolledWindow)
+TClass(wxPreviewCanvas) wxPreviewCanvas_Create( TClass(wxPrintPreview) preview, TClass(wxWindow) parent, TRect(x,y,w,h), int style );
+
+/* wxPreviewControlBar */
+TClassDefExtend(wxPreviewControlBar,wxPanel)
+
+/* wxPreviewFrame */
+TClassDefExtend(wxPreviewFrame,wxFrame)
+
+/* wxPrintData */
+TClassDefExtend(wxPrintData,wxObject)
+void       wxPrintData_Assign( TSelf(wxPrintData) _obj, TClass(wxPrintData) data );
+TClass(wxPrintData) wxPrintData_Create(  );
+void       wxPrintData_Delete( TSelf(wxPrintData) _obj );
+TBool      wxPrintData_GetCollate( TSelf(wxPrintData) _obj );
+TBool      wxPrintData_GetColour( TSelf(wxPrintData) _obj );
+int        wxPrintData_GetDuplex( TSelf(wxPrintData) _obj );
+TStringLen wxPrintData_GetFilename( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
+TStringLen wxPrintData_GetFontMetricPath( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
+int        wxPrintData_GetNoCopies( TSelf(wxPrintData) _obj );
+int        wxPrintData_GetOrientation( TSelf(wxPrintData) _obj );
+int        wxPrintData_GetPaperId( TSelf(wxPrintData) _obj );
+void       wxPrintData_GetPaperSize( TSelf(wxPrintData) _obj, TSizeOutVoid(_w,_h) );
+TStringLen wxPrintData_GetPreviewCommand( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
+int        wxPrintData_GetPrintMode( TSelf(wxPrintData) _obj );
+TStringLen wxPrintData_GetPrinterCommand( TSelf(wxPrintData) _obj, TStringOutVoid  _ref );
+TStringLen wxPrintData_GetPrinterName( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
+TStringLen wxPrintData_GetPrinterOptions( TSelf(wxPrintData) _obj, TStringOutVoid _ref );
+double     wxPrintData_GetPrinterScaleX( TSelf(wxPrintData) _obj );
+double     wxPrintData_GetPrinterScaleY( TSelf(wxPrintData) _obj );
+int        wxPrintData_GetPrinterTranslateX( TSelf(wxPrintData) _obj );
+int        wxPrintData_GetPrinterTranslateY( TSelf(wxPrintData) _obj );
+int        wxPrintData_GetQuality( TSelf(wxPrintData) _obj );
+void       wxPrintData_SetCollate( TSelf(wxPrintData) _obj, TBoolInt flag );
+void       wxPrintData_SetColour( TSelf(wxPrintData) _obj, TBoolInt colour );
+void       wxPrintData_SetDuplex( TSelf(wxPrintData) _obj, int duplex );
+void       wxPrintData_SetFilename( TSelf(wxPrintData) _obj, TStringVoid filename );
+void       wxPrintData_SetFontMetricPath( TSelf(wxPrintData) _obj, TStringVoid path );
+void       wxPrintData_SetNoCopies( TSelf(wxPrintData) _obj, int v );
+void       wxPrintData_SetOrientation( TSelf(wxPrintData) _obj, int orient );
+void       wxPrintData_SetPaperId( TSelf(wxPrintData) _obj, int sizeId );
+void       wxPrintData_SetPaperSize( TSelf(wxPrintData) _obj, TSize(w,h) );
+void       wxPrintData_SetPreviewCommand( TSelf(wxPrintData) _obj, TClass(wxCommand) command );
+void       wxPrintData_SetPrintMode( TSelf(wxPrintData) _obj, int printMode );
+void       wxPrintData_SetPrinterCommand( TSelf(wxPrintData) _obj, TClass(wxCommand) command );
+void       wxPrintData_SetPrinterName( TSelf(wxPrintData) _obj, TStringVoid name );
+void       wxPrintData_SetPrinterOptions( TSelf(wxPrintData) _obj, TStringVoid options );
+void       wxPrintData_SetPrinterScaleX( TSelf(wxPrintData) _obj, double x );
+void       wxPrintData_SetPrinterScaleY( TSelf(wxPrintData) _obj, double y );
+void       wxPrintData_SetPrinterScaling( TSelf(wxPrintData) _obj, double x, double y );
+void       wxPrintData_SetPrinterTranslateX( TSelf(wxPrintData) _obj, int x );
+void       wxPrintData_SetPrinterTranslateY( TSelf(wxPrintData) _obj, int y );
+void       wxPrintData_SetPrinterTranslation( TSelf(wxPrintData) _obj, TPoint(x,y) );
+void       wxPrintData_SetQuality( TSelf(wxPrintData) _obj, int quality );
+
+/* wxPostScriptPrintNativeData */
+TClassDefExtend(wxPostScriptPrintNativeData,wxObject)
+TClass(wxPostScriptPrintNativeData) wxPostScriptPrintNativeData_Create(  );
+void       wxPostScriptPrintNativeData_Delete( TSelf(wxPostScriptPrintNativeData) _obj );
+
+/* wxPrintDialog */
+TClassDefExtend(wxPrintDialog,wxDialog)
+TClass(wxPrintDialog) wxPrintDialog_Create( TClass(wxWindow) parent, TClass(wxPrintDialogData) data );
+TClass(wxDC)         wxPrintDialog_GetPrintDC( TSelf(wxPrintDialog) _obj );
+void       wxPrintDialog_GetPrintData( TSelf(wxPrintDialog) _obj, TClassRef(wxPrintData) _ref );
+TClass(wxPrintDialogData) wxPrintDialog_GetPrintDialogData( TSelf(wxPrintDialog) _obj );
+
+/* wxPrintDialogData */
+TClassDefExtend(wxPrintDialogData,wxObject)
+void       wxPrintDialogData_Assign( TSelf(wxPrintDialogData) _obj, TClass(wxPrintDialogData) data );
+void       wxPrintDialogData_AssignData( TSelf(wxPrintDialogData) _obj, TClass(wxPrintData) data );
+TClass(wxPrintDialogData) wxPrintDialogData_CreateDefault(  );
+TClass(wxPrintDialogData) wxPrintDialogData_CreateFromData( TClass(wxPrintData) printData );
+void       wxPrintDialogData_Delete( TSelf(wxPrintDialogData) _obj );
+void       wxPrintDialogData_EnableHelp( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+void       wxPrintDialogData_EnablePageNumbers( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+void       wxPrintDialogData_EnablePrintToFile( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+void       wxPrintDialogData_EnableSelection( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+int        wxPrintDialogData_GetAllPages( TSelf(wxPrintDialogData) _obj );
+TBoolInt   wxPrintDialogData_GetCollate( TSelf(wxPrintDialogData) _obj );
+TBoolInt   wxPrintDialogData_GetEnableHelp( TSelf(wxPrintDialogData) _obj );
+TBoolInt   wxPrintDialogData_GetEnablePageNumbers( TSelf(wxPrintDialogData) _obj );
+TBoolInt   wxPrintDialogData_GetEnablePrintToFile( TSelf(wxPrintDialogData) _obj );
+TBoolInt   wxPrintDialogData_GetEnableSelection( TSelf(wxPrintDialogData) _obj );
+int        wxPrintDialogData_GetFromPage( TSelf(wxPrintDialogData) _obj );
+int        wxPrintDialogData_GetMaxPage( TSelf(wxPrintDialogData) _obj );
+int        wxPrintDialogData_GetMinPage( TSelf(wxPrintDialogData) _obj );
+int        wxPrintDialogData_GetNoCopies( TSelf(wxPrintDialogData) _obj );
+void       wxPrintDialogData_GetPrintData( TSelf(wxPrintDialogData) _obj, TClassRef(wxPrintData) _ref );
+TBoolInt   wxPrintDialogData_GetPrintToFile( TSelf(wxPrintDialogData) _obj );
+TBoolInt   wxPrintDialogData_GetSelection( TSelf(wxPrintDialogData) _obj );
+int        wxPrintDialogData_GetToPage( TSelf(wxPrintDialogData) _obj );
+void       wxPrintDialogData_SetAllPages( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+void       wxPrintDialogData_SetCollate( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+void       wxPrintDialogData_SetFromPage( TSelf(wxPrintDialogData) _obj, int v );
+void       wxPrintDialogData_SetMaxPage( TSelf(wxPrintDialogData) _obj, int v );
+void       wxPrintDialogData_SetMinPage( TSelf(wxPrintDialogData) _obj, int v );
+void       wxPrintDialogData_SetNoCopies( TSelf(wxPrintDialogData) _obj, int v );
+void       wxPrintDialogData_SetPrintData( TSelf(wxPrintDialogData) _obj, TClass(wxPrintData) printData );
+void       wxPrintDialogData_SetPrintToFile( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+void       wxPrintDialogData_SetSelection( TSelf(wxPrintDialogData) _obj, TBoolInt flag );
+void       wxPrintDialogData_SetToPage( TSelf(wxPrintDialogData) _obj, int v );
+
+/* wxPrintPreview */
+TClassDefExtend(wxPrintPreview,wxObject)
+TClass(wxPrintPreview) wxPrintPreview_CreateFromData( TClass(wxPrintout) printout, TClass(wxPrintout) printoutForPrinting, TClass(wxPrintData) data );
+TClass(wxPrintPreview) wxPrintPreview_CreateFromDialogData( TClass(wxPrintout) printout, TClass(wxPrintout) printoutForPrinting, TClass(wxPrintDialogData) data );
+void       wxPrintPreview_Delete( TSelf(wxPrintPreview) _obj );
+void       wxPrintPreview_DetermineScaling( TSelf(wxPrintPreview) _obj );
+TBoolInt   wxPrintPreview_DrawBlankPage( TSelf(wxPrintPreview) _obj, TClass(wxPreviewCanvas) canvas, TClass(wxDC) dc );
+TClass(wxPreviewCanvas)  wxPrintPreview_GetCanvas( TSelf(wxPrintPreview) _obj );
+int        wxPrintPreview_GetCurrentPage( TSelf(wxPrintPreview) _obj );
+TClass(wxFrame) wxPrintPreview_GetFrame( TSelf(wxPrintPreview) _obj );
+int        wxPrintPreview_GetMaxPage( TSelf(wxPrintPreview) _obj );
+int        wxPrintPreview_GetMinPage( TSelf(wxPrintPreview) _obj );
+void       wxPrintPreview_GetPrintDialogData( TSelf(wxPrintPreview) _obj, TClassRef(wxPrintDialogData) _ref );
+TClass(wxPrintout) wxPrintPreview_GetPrintout( TSelf(wxPrintPreview) _obj );
+TClass(wxPrintout) wxPrintPreview_GetPrintoutForPrinting( TSelf(wxPrintPreview) _obj );
+int        wxPrintPreview_GetZoom( TSelf(wxPrintPreview) _obj );
+TBool      wxPrintPreview_Ok( TSelf(wxPrintPreview) _obj );
+TBoolInt   wxPrintPreview_PaintPage( TSelf(wxPrintPreview) _obj, TClass(wxPrintPreview) canvas, TClass(wxDC) dc );
+TBoolInt   wxPrintPreview_Print( TSelf(wxPrintPreview) _obj, TBoolInt interactive );
+TBoolInt   wxPrintPreview_RenderPage( TSelf(wxPrintPreview) _obj, int pageNum );
+void       wxPrintPreview_SetCanvas( TSelf(wxPrintPreview) _obj, TClass(wxPreviewCanvas) canvas );
+TBoolInt   wxPrintPreview_SetCurrentPage( TSelf(wxPrintPreview) _obj, int pageNum );
+void       wxPrintPreview_SetFrame( TSelf(wxPrintPreview) _obj, TClass(wxFrame) frame );
+void       wxPrintPreview_SetOk( TSelf(wxPrintPreview) _obj, TBoolInt ok );
+void       wxPrintPreview_SetPrintout( TSelf(wxPrintPreview) _obj, TClass(wxPrintout) printout );
+void       wxPrintPreview_SetZoom( TSelf(wxPrintPreview) _obj, int percent );
+
+/* wxPrinter */
+TClassDefExtend(wxPrinter,wxObject)
+TClass(wxPrinter) wxPrinter_Create( TClass(wxPrintDialogData) data );
+TClass(wxWindow)  wxPrinter_CreateAbortWindow( TSelf(wxPrinter) _obj, TClass(wxWindow) parent, TClass(wxPrintout) printout );
+void       wxPrinter_Delete( TSelf(wxPrinter) _obj );
+TBoolInt   wxPrinter_GetAbort( TSelf(wxPrinter) _obj );
+int        wxPrinter_GetLastError( TSelf(wxPrinter) _obj );
+void       wxPrinter_GetPrintDialogData( TSelf(wxPrinter) _obj, TClassRef(wxPrintDialogData) _ref );
+TBoolInt   wxPrinter_Print( TSelf(wxPrinter) _obj, TClass(wxWindow) parent, TClass(wxPrintout) printout, TBoolInt prompt );
+TClass(wxDC)  wxPrinter_PrintDialog( TSelf(wxPrinter) _obj, TClass(wxWindow) parent );
+void       wxPrinter_ReportError( TSelf(wxPrinter) _obj, TClass(wxWindow) parent, TClass(wxPrintout) printout, TStringVoid message );
+TBoolInt   wxPrinter_Setup( TSelf(wxPrinter) _obj, TClass(wxWindow) parent );
+
+/* wxPrinterDC */
+TClassDefExtend(wxPrinterDC,wxDC)
+
+/* wxPrintout */
+TClassDefExtend(wxPrintout,wxObject)
+
+/* wxPrivateDropTarget */
+TClassDefExtend(wxPrivateDropTarget,wxDropTarget)
+
+/* wxProcess */
+TClassDefExtend(wxProcess,wxEvtHandler)
+void       wxProcess_CloseOutput( TSelf(wxProcess) _obj );
+TClass(wxProcess) wxProcess_CreateDefault( TClass(wxWindow) _prt, int _id );
+TClass(wxProcess) wxProcess_CreateRedirect( TClass(wxWindow) _prt, TBool _rdr );
+void       wxProcess_Delete( TSelf(wxProcess) _obj );
+void       wxProcess_Detach( TSelf(wxProcess) _obj );
+TClass(wxInputStream) wxProcess_GetErrorStream( TSelf(wxProcess) _obj );
+TClass(wxInputStream) wxProcess_GetInputStream( TSelf(wxProcess) _obj );
+TClass(wxOutputStream) wxProcess_GetOutputStream( TSelf(wxProcess) _obj );
+TBool      wxProcess_IsRedirected( TSelf(wxProcess) _obj );
+void       wxProcess_Redirect( TSelf(wxProcess) _obj );
+
+/* wxProcessEvent */
+TClassDefExtend(wxProcessEvent,wxEvent)
+int        wxProcessEvent_GetExitCode( TSelf(wxProcessEvent) _obj );
+int        wxProcessEvent_GetPid( TSelf(wxProcessEvent) _obj );
+
+/* wxProgressDialog */
+TClassDefExtend(wxProgressDialog,wxFrame)
+
+/* wxProtocol */
+TClassDefExtend(wxProtocol,wxSocketClient)
+
+/* wxQuantize */
+TClassDefExtend(wxQuantize,wxObject)
+
+/* wxQueryCol */
+TClassDefExtend(wxQueryCol,wxObject)
+
+/* wxQueryField */
+TClassDefExtend(wxQueryField,wxObject)
+
+/* wxQueryLayoutInfoEvent */
+TClassDefExtend(wxQueryLayoutInfoEvent,wxEvent)
+TClass(wxQueryLayoutInfoEvent) wxQueryLayoutInfoEvent_Create( int id );
+int        wxQueryLayoutInfoEvent_GetAlignment( TSelf(wxQueryLayoutInfoEvent) _obj );
+int        wxQueryLayoutInfoEvent_GetFlags( TSelf(wxQueryLayoutInfoEvent) _obj );
+int        wxQueryLayoutInfoEvent_GetOrientation( TSelf(wxQueryLayoutInfoEvent) _obj );
+int        wxQueryLayoutInfoEvent_GetRequestedLength( TSelf(wxQueryLayoutInfoEvent) _obj );
+void       wxQueryLayoutInfoEvent_GetSize( TSelf(wxQueryLayoutInfoEvent) _obj, TSizeOutVoid(_w,_h) );
+void       wxQueryLayoutInfoEvent_SetAlignment( TSelf(wxQueryLayoutInfoEvent) _obj, int align );
+void       wxQueryLayoutInfoEvent_SetFlags( TSelf(wxQueryLayoutInfoEvent) _obj, int flags );
+void       wxQueryLayoutInfoEvent_SetOrientation( TSelf(wxQueryLayoutInfoEvent) _obj, int orient );
+void       wxQueryLayoutInfoEvent_SetRequestedLength( TSelf(wxQueryLayoutInfoEvent) _obj, int length );
+void       wxQueryLayoutInfoEvent_SetSize( TSelf(wxQueryLayoutInfoEvent) _obj, TSize(w,h) );
+
+/* wxQueryNewPaletteEvent */
+TClassDefExtend(wxQueryNewPaletteEvent,wxEvent)
+void       wxQueryNewPaletteEvent_CopyObject( TSelf(wxQueryNewPaletteEvent) _obj, void* obj );
+int        wxQueryNewPaletteEvent_GetPaletteRealized( TSelf(wxQueryNewPaletteEvent) _obj );
+void       wxQueryNewPaletteEvent_SetPaletteRealized( TSelf(wxQueryNewPaletteEvent) _obj, int realized );
+
+/* wxRadioBox */
+TClassDefExtend(wxRadioBox,wxControl)
+TClass(wxRadioBox) wxRadioBox_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), TArrayString(n, _str), int _dim, int _stl );
+void       wxRadioBox_EnableItem( TSelf(wxRadioBox) _obj, int item, TBoolInt enable );
+int        wxRadioBox_FindString( TSelf(wxRadioBox) _obj, TStringVoid s );
+TStringLen wxRadioBox_GetItemLabel( TSelf(wxRadioBox) _obj, int item, TStringOutVoid _buf );
+int        wxRadioBox_GetNumberOfRowsOrCols( TSelf(wxRadioBox) _obj );
+int        wxRadioBox_GetSelection( TSelf(wxRadioBox) _obj );
+TStringLen wxRadioBox_GetStringSelection( TSelf(wxRadioBox) _obj, TStringOutVoid _buf );
+int        wxRadioBox_Number( TSelf(wxRadioBox) _obj );
+void       wxRadioBox_SetItemBitmap( TSelf(wxRadioBox) _obj, int item, TClass(wxBitmap) bitmap );
+void       wxRadioBox_SetItemLabel( TSelf(wxRadioBox) _obj, int item, TStringVoid label );
+void       wxRadioBox_SetNumberOfRowsOrCols( TSelf(wxRadioBox) _obj, int n );
+void       wxRadioBox_SetSelection( TSelf(wxRadioBox) _obj, int _n );
+void       wxRadioBox_SetStringSelection( TSelf(wxRadioBox) _obj, TStringVoid s );
+void       wxRadioBox_ShowItem( TSelf(wxRadioBox) _obj, int item, TBoolInt show );
+
+/* wxRadioButton */
+TClassDefExtend(wxRadioButton,wxControl)
+TClass(wxRadioButton) wxRadioButton_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxRadioButton_GetValue( TSelf(wxRadioButton) _obj );
+void       wxRadioButton_SetValue( TSelf(wxRadioButton) _obj, int value );
+
+/* wxRealPoint */
+TClassDef(wxRealPoint)
+
+/* wxRecordSet */
+TClassDefExtend(wxRecordSet,wxObject)
+
+/* wxRect */
+TClassDef(wxRect)
+
+/* wxRegEx */
+TClassDef(wxRegEx)
+
+/* wxRegion */
+TClassDefExtend(wxRegion,wxGDIObject)
+void       wxRegion_Assign( TSelf(wxRegion) _obj, TClass(wxRegion) region );
+void       wxRegion_Clear( TSelf(wxRegion) _obj );
+TBool      wxRegion_ContainsPoint( TSelf(wxRegion) _obj, TPoint(x,y) );
+TBool      wxRegion_ContainsRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
+TClass(wxRegion) wxRegion_CreateDefault(  );
+TClass(wxRegion) wxRegion_CreateFromRect( TRect(x,y,w,h) );
+void       wxRegion_Delete( TSelf(wxRegion) _obj );
+int        wxRegion_Empty( TSelf(wxRegion) _obj );
+void       wxRegion_GetBox( TSelf(wxRegion) _obj, TRectOutVoid(_x,_y,_w,_h) );
+int        wxRegion_IntersectRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
+int        wxRegion_IntersectRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
+int        wxRegion_SubtractRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
+int        wxRegion_SubtractRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
+int        wxRegion_UnionRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
+int        wxRegion_UnionRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
+int        wxRegion_XorRect( TSelf(wxRegion) _obj, TRect(x,y,width,height) );
+int        wxRegion_XorRegion( TSelf(wxRegion) _obj, TClass(wxRegion) region );
+
+/* wxRegionIterator */
+TClassDefExtend(wxRegionIterator,wxObject)
+TClass(wxRegionIterator) wxRegionIterator_Create(  );
+TClass(wxRegionIterator) wxRegionIterator_CreateFromRegion( TClass(wxRegion) region );
+void       wxRegionIterator_Delete( TSelf(wxRegionIterator) _obj );
+int        wxRegionIterator_GetHeight( TSelf(wxRegionIterator) _obj );
+int        wxRegionIterator_GetWidth( TSelf(wxRegionIterator) _obj );
+int        wxRegionIterator_GetX( TSelf(wxRegionIterator) _obj );
+int        wxRegionIterator_GetY( TSelf(wxRegionIterator) _obj );
+int        wxRegionIterator_HaveRects( TSelf(wxRegionIterator) _obj );
+void       wxRegionIterator_Next( TSelf(wxRegionIterator) _obj );
+void       wxRegionIterator_Reset( TSelf(wxRegionIterator) _obj );
+void       wxRegionIterator_ResetToRegion( TSelf(wxRegionIterator) _obj, TClass(wxRegion) region );
+
+/* wxRemotelyScrolledTreeCtrl */
+TClassDefExtend(wxRemotelyScrolledTreeCtrl,wxTreeCtrl)
+void       wxRemotelyScrolledTreeCtrl_AdjustRemoteScrollbars( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
+void       wxRemotelyScrolledTreeCtrl_CalcTreeSize( TSelf(wxRemotelyScrolledTreeCtrl) _obj, TRectOutVoid(_x,_y,_w,_h) );
+void       wxRemotelyScrolledTreeCtrl_CalcTreeSizeItem( TSelf(wxRemotelyScrolledTreeCtrl) _obj, void* id, TRectOutVoid(_x,_y,_w,_h) );
+TClass(wxRemotelyScrolledTreeCtrl) wxRemotelyScrolledTreeCtrl_Create( void* _obj, void* _cmp, TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
+void       wxRemotelyScrolledTreeCtrl_Delete( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
+void*      wxRemotelyScrolledTreeCtrl_GetCompanionWindow( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
+int        wxRemotelyScrolledTreeCtrl_GetScrollPos( TSelf(wxRemotelyScrolledTreeCtrl) _obj, int orient );
+TClass(wxScrolledWindow) wxRemotelyScrolledTreeCtrl_GetScrolledWindow( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
+void       wxRemotelyScrolledTreeCtrl_GetViewStart( TSelf(wxRemotelyScrolledTreeCtrl) _obj, TPointOutVoid(_x,_y) );
+void       wxRemotelyScrolledTreeCtrl_HideVScrollbar( TSelf(wxRemotelyScrolledTreeCtrl) _obj );
+void       wxRemotelyScrolledTreeCtrl_PrepareDC( TSelf(wxRemotelyScrolledTreeCtrl) _obj, TClass(wxDC) dc );
+void       wxRemotelyScrolledTreeCtrl_ScrollToLine( TSelf(wxRemotelyScrolledTreeCtrl) _obj, int posHoriz, int posVert );
+void       wxRemotelyScrolledTreeCtrl_SetCompanionWindow( TSelf(wxRemotelyScrolledTreeCtrl) _obj, void* companion );
+void       wxRemotelyScrolledTreeCtrl_SetScrollbars( TSelf(wxRemotelyScrolledTreeCtrl) _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, int noRefresh );
+
+/* wxSVGFileDC */
+TClassDefExtend(wxSVGFileDC,wxDC)
+void*      wxSVGFileDC_ComputeScaleAndOrigin( TSelf(wxSVGFileDC) obj );
+TClass(wxSVGFileDC) wxSVGFileDC_Create( void* f );
+void*      wxSVGFileDC_CreateWithSize( TSelf(wxSVGFileDC) f, int a_width, int a_height );
+void*      wxSVGFileDC_CreateWithSizeAndResolution( TSelf(wxSVGFileDC) f, int a_width, int a_height, float a_dpi );
+void*      wxSVGFileDC_Delete( TSelf(wxSVGFileDC) obj );
+
+/* wxSashEvent */
+TClassDefExtend(wxSashEvent,wxEvent)
+TClass(wxSashEvent) wxSashEvent_Create( int id, int edge );
+void       wxSashEvent_GetDragRect( TSelf(wxSashEvent) _obj, TRectOutVoid(_x,_y,_w,_h) );
+int        wxSashEvent_GetDragStatus( TSelf(wxSashEvent) _obj );
+int        wxSashEvent_GetEdge( TSelf(wxSashEvent) _obj );
+void       wxSashEvent_SetDragRect( TSelf(wxSashEvent) _obj, TRect(x,y,w,h) );
+void       wxSashEvent_SetDragStatus( TSelf(wxSashEvent) _obj, int status );
+void       wxSashEvent_SetEdge( TSelf(wxSashEvent) _obj, int edge );
+
+/* wxSashLayoutWindow */
+TClassDefExtend(wxSashLayoutWindow,wxSashWindow)
+TClass(wxSashLayoutWindow) wxSashLayoutWindow_Create( TClass(wxWindow) _par, int _id, TRect(_x,_y,_w,_h), int _stl );
+int        wxSashLayoutWindow_GetAlignment( TSelf(wxSashLayoutWindow) _obj );
+int        wxSashLayoutWindow_GetOrientation( TSelf(wxSashLayoutWindow) _obj );
+void       wxSashLayoutWindow_SetAlignment( TSelf(wxSashLayoutWindow) _obj, int align );
+void       wxSashLayoutWindow_SetDefaultSize( TSelf(wxSashLayoutWindow) _obj, TSize(w,h) );
+void       wxSashLayoutWindow_SetOrientation( TSelf(wxSashLayoutWindow) _obj, int orient );
+
+/* wxSashWindow */
+TClassDefExtend(wxSashWindow,wxWindow)
+TClass(wxSashWindow) wxSashWindow_Create( TClass(wxWindow) _par, int _id, TRect(_x,_y,_w,_h), int _stl );
+int        wxSashWindow_GetDefaultBorderSize( TSelf(wxSashWindow) _obj );
+int        wxSashWindow_GetEdgeMargin( TSelf(wxSashWindow) _obj, int edge );
+int        wxSashWindow_GetExtraBorderSize( TSelf(wxSashWindow) _obj );
+int        wxSashWindow_GetMaximumSizeX( TSelf(wxSashWindow) _obj );
+int        wxSashWindow_GetMaximumSizeY( TSelf(wxSashWindow) _obj );
+int        wxSashWindow_GetMinimumSizeX( TSelf(wxSashWindow) _obj );
+int        wxSashWindow_GetMinimumSizeY( TSelf(wxSashWindow) _obj );
+int        wxSashWindow_GetSashVisible( TSelf(wxSashWindow) _obj, int edge );
+TBool      wxSashWindow_HasBorder( TSelf(wxSashWindow) _obj, int edge );
+void       wxSashWindow_SetDefaultBorderSize( TSelf(wxSashWindow) _obj, int width );
+void       wxSashWindow_SetExtraBorderSize( TSelf(wxSashWindow) _obj, int width );
+void       wxSashWindow_SetMaximumSizeX( TSelf(wxSashWindow) _obj, int max );
+void       wxSashWindow_SetMaximumSizeY( TSelf(wxSashWindow) _obj, int max );
+void       wxSashWindow_SetMinimumSizeX( TSelf(wxSashWindow) _obj, int min );
+void       wxSashWindow_SetMinimumSizeY( TSelf(wxSashWindow) _obj, int min );
+void       wxSashWindow_SetSashBorder( TSelf(wxSashWindow) _obj, int edge, int border );
+void       wxSashWindow_SetSashVisible( TSelf(wxSashWindow) _obj, int edge, int sash );
+
+/* wxScintilla */
+TClassDef(wxScintilla)
+TClass(wxScintilla) wxScintilla_Create( void* obj, void* fnc, TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxScintilla_Exec( TSelf(wxScintilla) obj, int code, int param1, int param2 );
+
+/* wxScopedArray */
+TClassDef(wxScopedArray)
+
+/* wxScopedPtr */
+TClassDef(wxScopedPtr)
+
+/* wxScreenDC */
+TClassDefExtend(wxScreenDC,wxDC)
+TClass(wxScreenDC) wxScreenDC_Create(  );
+void       wxScreenDC_Delete( TSelf(wxScreenDC) _obj );
+int        wxScreenDC_EndDrawingOnTop( TSelf(wxScreenDC) _obj );
+int        wxScreenDC_StartDrawingOnTop( TSelf(wxScreenDC) _obj, int l, int t, TSize(w,h) );
+int        wxScreenDC_StartDrawingOnTopOfWin( TSelf(wxScreenDC) _obj, TClass(wxWindow) win );
+
+/* wxScrollBar */
+TClassDefExtend(wxScrollBar,wxControl)
+TClass(wxScrollBar) wxScrollBar_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxScrollBar_GetPageSize( TSelf(wxScrollBar) _obj );
+int        wxScrollBar_GetRange( TSelf(wxScrollBar) _obj );
+int        wxScrollBar_GetThumbPosition( TSelf(wxScrollBar) _obj );
+int        wxScrollBar_GetThumbSize( TSelf(wxScrollBar) _obj );
+void       wxScrollBar_SetScrollbar( TSelf(wxScrollBar) _obj, int position, int thumbSize, int range, int pageSize, TBool refresh );
+void       wxScrollBar_SetThumbPosition( TSelf(wxScrollBar) _obj, int viewStart );
+
+/* wxScrollEvent */
+TClassDefExtend(wxScrollEvent,wxEvent)
+int        wxScrollEvent_GetOrientation( TSelf(wxScrollEvent) _obj );
+int        wxScrollEvent_GetPosition( TSelf(wxScrollEvent) _obj );
+
+/* wxScrollWinEvent */
+TClassDefExtend(wxScrollWinEvent,wxEvent)
+int        wxScrollWinEvent_GetOrientation( TSelf(wxScrollWinEvent) _obj );
+int        wxScrollWinEvent_GetPosition( TSelf(wxScrollWinEvent) _obj );
+void       wxScrollWinEvent_SetOrientation( TSelf(wxScrollWinEvent) _obj, int orient );
+void       wxScrollWinEvent_SetPosition( TSelf(wxScrollWinEvent) _obj, int pos );
+
+/* wxScrolledWindow */
+TClassDefExtend(wxScrolledWindow,wxPanel)
+void       wxScrolledWindow_AdjustScrollbars( TSelf(wxScrolledWindow) _obj );
+void       wxScrolledWindow_CalcScrolledPosition( TSelf(wxScrolledWindow) _obj, TPoint(x,y), TPointOutVoid(xx,yy) );
+void       wxScrolledWindow_CalcUnscrolledPosition( TSelf(wxScrolledWindow) _obj, TPoint(x,y), TPointOutVoid(xx,yy) );
+TClass(wxScrolledWindow) wxScrolledWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxScrolledWindow_EnableScrolling( TSelf(wxScrolledWindow) _obj, TBool x_scrolling, TBool y_scrolling );
+double     wxScrolledWindow_GetScaleX( TSelf(wxScrolledWindow) _obj );
+double     wxScrolledWindow_GetScaleY( TSelf(wxScrolledWindow) _obj );
+int        wxScrolledWindow_GetScrollPageSize( TSelf(wxScrolledWindow) _obj, int orient );
+void       wxScrolledWindow_GetScrollPixelsPerUnit( TSelf(wxScrolledWindow) _obj, TPointOutVoid(_x,_y) );
+TClass(wxWindow) wxScrolledWindow_GetTargetWindow( TSelf(wxScrolledWindow) _obj );
+void       wxScrolledWindow_GetViewStart( TSelf(wxScrolledWindow) _obj, TPointOutVoid(_x,_y) );
+void       wxScrolledWindow_GetVirtualSize( TSelf(wxScrolledWindow) _obj, TSizeOutVoid(_x,_y) );
+void       wxScrolledWindow_OnDraw( TSelf(wxScrolledWindow) _obj, TClass(wxDC) dc );
+void       wxScrolledWindow_PrepareDC( TSelf(wxScrolledWindow) _obj, TClass(wxDC) dc );
+void       wxScrolledWindow_Scroll( TSelf(wxScrolledWindow) _obj, TPoint(x_pos,y_pos) );
+void       wxScrolledWindow_SetScale( TSelf(wxScrolledWindow) _obj, double xs, double ys );
+void       wxScrolledWindow_SetScrollPageSize( TSelf(wxScrolledWindow) _obj, int orient, int pageSize );
+void       wxScrolledWindow_SetScrollbars( TSelf(wxScrolledWindow) _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, TBoolInt noRefresh );
+void       wxScrolledWindow_SetTargetWindow( TSelf(wxScrolledWindow) _obj, TClass(wxWindow) target );
+void       wxScrolledWindow_ViewStart( TSelf(wxScrolledWindow) _obj, TPointOutVoid(_x,_y) );
+
+/* wxSemaphore */
+TClassDef(wxSemaphore)
+
+/* wxServer */
+TClassDefExtend(wxServer,wxServerBase)
+
+/* wxServerBase */
+TClassDefExtend(wxServerBase,wxObject)
+
+/* wxSetCursorEvent */
+TClassDefExtend(wxSetCursorEvent,wxEvent)
+TClass(wxCursor) wxSetCursorEvent_GetCursor( TSelf(wxSetCursorEvent) _obj );
+int        wxSetCursorEvent_GetX( TSelf(wxSetCursorEvent) _obj );
+int        wxSetCursorEvent_GetY( TSelf(wxSetCursorEvent) _obj );
+TBool      wxSetCursorEvent_HasCursor( TSelf(wxSetCursorEvent) _obj );
+void       wxSetCursorEvent_SetCursor( TSelf(wxSetCursorEvent) _obj, TClass(wxCursor) cursor );
+
+/* wxShowEvent */
+TClassDefExtend(wxShowEvent,wxEvent)
+void       wxShowEvent_CopyObject( TSelf(wxShowEvent) _obj, void* obj );
+int        wxShowEvent_GetShow( TSelf(wxShowEvent) _obj );
+void       wxShowEvent_SetShow( TSelf(wxShowEvent) _obj, int show );
+
+/* wxSimpleHelpProvider */
+TClassDefExtend(wxSimpleHelpProvider,wxHelpProvider)
+TClass(wxSimpleHelpProvider) wxSimpleHelpProvider_Create(  );
+
+/* wxSingleChoiceDialog */
+TClassDefExtend(wxSingleChoiceDialog,wxDialog)
+
+/* wxSingleInstanceChecker */
+TClassDef(wxSingleInstanceChecker)
+int        wxSingleInstanceChecker_Create( void* _obj, TStringVoid name, TStringVoid path );
+TClass(wxSingleInstanceChecker) wxSingleInstanceChecker_CreateDefault(  );
+void       wxSingleInstanceChecker_Delete( TSelf(wxSingleInstanceChecker) _obj );
+TBool      wxSingleInstanceChecker_IsAnotherRunning( TSelf(wxSingleInstanceChecker) _obj );
+
+/* wxSize */
+TClassDef(wxSize)
+TClass(wxSize) wxSize_Create( TSize(w,h) );
+void       wxSize_Destroy( TSelf(wxSize) _obj );
+int        wxSize_GetHeight( TSelf(wxSize) _obj );
+int        wxSize_GetWidth( TSelf(wxSize) _obj );
+void       wxSize_SetHeight( TSelf(wxSize) _obj, int h );
+void       wxSize_SetWidth( TSelf(wxSize) _obj, int w );
+
+/* wxSizeEvent */
+TClassDefExtend(wxSizeEvent,wxEvent)
+void       wxSizeEvent_CopyObject( TSelf(wxSizeEvent) _obj, void* obj );
+void       wxSizeEvent_GetSize( TSelf(wxSizeEvent) _obj, TSizeOut(_w,_h) );
+
+/* wxSizer */
+TClassDefExtend(wxSizer,wxObject)
+void       wxSizer_Add( TSelf(wxSizer) _obj, TSize(width,height), int option, int flag, int border, void* userData );
+void       wxSizer_AddSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
+void       wxSizer_AddWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window, int option, int flag, int border, void* userData );
+void       wxSizer_CalcMin( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );
+void       wxSizer_Fit( TSelf(wxSizer) _obj, TClass(wxWindow) window );
+int        wxSizer_GetChildren( TSelf(wxSizer) _obj, void* _res, int _cnt );
+void       wxSizer_GetMinSize( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );
+void       wxSizer_GetPosition( TSelf(wxSizer) _obj, TPointOutVoid(_x,_y) );
+void       wxSizer_GetSize( TSelf(wxSizer) _obj, TSizeOutVoid(_w,_h) );
+void       wxSizer_Insert( TSelf(wxSizer) _obj, int before, TSize(width,height), int option, int flag, int border, void* userData );
+void       wxSizer_InsertSizer( TSelf(wxSizer) _obj, int before, TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
+void       wxSizer_InsertWindow( TSelf(wxSizer) _obj, int before, TClass(wxWindow) window, int option, int flag, int border, void* userData );
+void       wxSizer_Layout( TSelf(wxSizer) _obj );
+void       wxSizer_Prepend( TSelf(wxSizer) _obj, TSize(width,height), int option, int flag, int border, void* userData );
+void       wxSizer_PrependSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
+void       wxSizer_PrependWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window, int option, int flag, int border, void* userData );
+void       wxSizer_RecalcSizes( TSelf(wxSizer) _obj );
+int        wxSizer_Remove( TSelf(wxSizer) _obj, int pos );
+int        wxSizer_RemoveSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer );
+int        wxSizer_RemoveWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window );
+void       wxSizer_SetDimension( TSelf(wxSizer) _obj, TRect(x,y,width,height) );
+void       wxSizer_SetItemMinSize( TSelf(wxSizer) _obj, int pos, TSize(width,height) );
+void       wxSizer_SetItemMinSizeSizer( TSelf(wxSizer) _obj, TClass(wxSizer) sizer, TSize(width,height) );
+void       wxSizer_SetItemMinSizeWindow( TSelf(wxSizer) _obj, TClass(wxWindow) window, TSize(width,height) );
+void       wxSizer_SetMinSize( TSelf(wxSizer) _obj, TSize(width,height) );
+void       wxSizer_SetSizeHints( TSelf(wxSizer) _obj, TClass(wxWindow) window );
+
+/* wxSizerItem */
+TClassDefExtend(wxSizerItem,wxObject)
+void       wxSizerItem_CalcMin( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxSizerItem) wxSizerItem_Create( TSize(width,height), int option, int flag, int border, void* userData );
+void*      wxSizerItem_CreateInSizer( TClass(wxSizer) sizer, int option, int flag, int border, void* userData );
+void*      wxSizerItem_CreateInWindow( TClass(wxWindow) window, int option, int flag, int border, void* userData );
+int        wxSizerItem_GetBorder( TSelf(wxSizerItem) _obj );
+int        wxSizerItem_GetFlag( TSelf(wxSizerItem) _obj );
+void       wxSizerItem_GetMinSize( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_h) );
+int        wxSizerItem_GetOption( TSelf(wxSizerItem) _obj );
+void       wxSizerItem_GetPosition( TSelf(wxSizerItem) _obj, TPointOutVoid(_x,_y) );
+float      wxSizerItem_GetRatio( TSelf(wxSizerItem) _obj );
+void       wxSizerItem_GetSize( TSelf(wxSizerItem) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxSizer) wxSizerItem_GetSizer( TSelf(wxSizerItem) _obj );
+void*      wxSizerItem_GetUserData( TSelf(wxSizerItem) _obj );
+TClass(wxWindow) wxSizerItem_GetWindow( TSelf(wxSizerItem) _obj );
+TBool      wxSizerItem_IsSizer( TSelf(wxSizerItem) _obj );
+TBool      wxSizerItem_IsSpacer( TSelf(wxSizerItem) _obj );
+TBool      wxSizerItem_IsWindow( TSelf(wxSizerItem) _obj );
+void       wxSizerItem_SetBorder( TSelf(wxSizerItem) _obj, int border );
+void       wxSizerItem_SetDimension( TSelf(wxSizerItem) _obj, TRect(_x,_y,_w,_h) );
+void       wxSizerItem_SetFlag( TSelf(wxSizerItem) _obj, int flag );
+void       wxSizerItem_SetFloatRatio( TSelf(wxSizerItem) _obj, float ratio );
+void       wxSizerItem_SetInitSize( TSelf(wxSizerItem) _obj, TPoint(x,y) );
+void       wxSizerItem_SetOption( TSelf(wxSizerItem) _obj, int option );
+void       wxSizerItem_SetRatio( TSelf(wxSizerItem) _obj, TSize(width,height) );
+void       wxSizerItem_SetSizer( TSelf(wxSizerItem) _obj, TClass(wxSizer) sizer );
+void       wxSizerItem_SetWindow( TSelf(wxSizerItem) _obj, TClass(wxWindow) window );
+
+/* wxSlider */
+TClassDefExtend(wxSlider,wxControl)
+void       wxSlider_ClearSel( TSelf(wxSlider) _obj );
+void       wxSlider_ClearTicks( TSelf(wxSlider) _obj );
+TClass(wxSlider) wxSlider_Create( TClass(wxWindow) _prt, int _id, int _init, int _min, int _max, TRect(_lft,_top,_wdt,_hgt), long _stl );
+int        wxSlider_GetLineSize( TSelf(wxSlider) _obj );
+int        wxSlider_GetMax( TSelf(wxSlider) _obj );
+int        wxSlider_GetMin( TSelf(wxSlider) _obj );
+int        wxSlider_GetPageSize( TSelf(wxSlider) _obj );
+int        wxSlider_GetSelEnd( TSelf(wxSlider) _obj );
+int        wxSlider_GetSelStart( TSelf(wxSlider) _obj );
+int        wxSlider_GetThumbLength( TSelf(wxSlider) _obj );
+int        wxSlider_GetTickFreq( TSelf(wxSlider) _obj );
+int        wxSlider_GetValue( TSelf(wxSlider) _obj );
+void       wxSlider_SetLineSize( TSelf(wxSlider) _obj, int lineSize );
+void       wxSlider_SetPageSize( TSelf(wxSlider) _obj, int pageSize );
+void       wxSlider_SetRange( TSelf(wxSlider) _obj, int minValue, int maxValue );
+void       wxSlider_SetSelection( TSelf(wxSlider) _obj, int minPos, int maxPos );
+void       wxSlider_SetThumbLength( TSelf(wxSlider) _obj, int len );
+void       wxSlider_SetTick( TSelf(wxSlider) _obj, int tickPos );
+void       wxSlider_SetTickFreq( TSelf(wxSlider) _obj, int n, int pos );
+void       wxSlider_SetValue( TSelf(wxSlider) _obj, int value );
+
+/* wxSockAddress */
+TClassDefExtend(wxSockAddress,wxObject)
+
+/* wxSocketBase */
+TClassDefExtend(wxSocketBase,wxObject)
+
+/* wxSocketClient */
+TClassDefExtend(wxSocketClient,wxSocketBase)
+
+/* wxSocketEvent */
+TClassDefExtend(wxSocketEvent,wxEvent)
+
+/* wxSocketInputStream */
+TClassDefExtend(wxSocketInputStream,wxInputStream)
+
+/* wxSocketOutputStream */
+TClassDefExtend(wxSocketOutputStream,wxOutputStream)
+
+/* wxSocketServer */
+TClassDefExtend(wxSocketServer,wxSocketBase)
+
+/* wxSpinButton */
+TClassDefExtend(wxSpinButton,wxControl)
+TClass(wxSpinButton) wxSpinButton_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), long _stl );
+int        wxSpinButton_GetMax( TSelf(wxSpinButton) _obj );
+int        wxSpinButton_GetMin( TSelf(wxSpinButton) _obj );
+int        wxSpinButton_GetValue( TSelf(wxSpinButton) _obj );
+void       wxSpinButton_SetRange( TSelf(wxSpinButton) _obj, int minVal, int maxVal );
+void       wxSpinButton_SetValue( TSelf(wxSpinButton) _obj, int val );
+
+/* wxSpinCtrl */
+TClassDefExtend(wxSpinCtrl,wxControl)
+TClass(wxSpinCtrl) wxSpinCtrl_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), long _stl, int _min, int _max, int _init );
+int        wxSpinCtrl_GetMax( TSelf(wxSpinCtrl) _obj );
+int        wxSpinCtrl_GetMin( TSelf(wxSpinCtrl) _obj );
+int        wxSpinCtrl_GetValue( TSelf(wxSpinCtrl) _obj );
+void       wxSpinCtrl_SetRange( TSelf(wxSpinCtrl) _obj, int min_val, int max_val );
+void       wxSpinCtrl_SetValue( TSelf(wxSpinCtrl) _obj, int val );
+
+/* wxSpinEvent */
+TClassDefExtend(wxSpinEvent,wxNotifyEvent)
+int        wxSpinEvent_GetPosition( TSelf(wxSpinEvent) _obj );
+void       wxSpinEvent_SetPosition( TSelf(wxSpinEvent) _obj, int pos );
+
+/* wxSplashScreen */
+TClassDefExtend(wxSplashScreen,wxFrame)
+
+/* wxSplitterEvent */
+TClassDefExtend(wxSplitterEvent,wxNotifyEvent)
+
+/* wxSplitterScrolledWindow */
+TClassDefExtend(wxSplitterScrolledWindow,wxScrolledWindow)
+TClass(wxSplitterScrolledWindow) wxSplitterScrolledWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
+
+/* wxSplitterWindow */
+TClassDefExtend(wxSplitterWindow,wxWindow)
+TClass(wxSplitterWindow) wxSplitterWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxSplitterWindow_GetBorderSize( TSelf(wxSplitterWindow) _obj );
+int        wxSplitterWindow_GetMinimumPaneSize( TSelf(wxSplitterWindow) _obj );
+int        wxSplitterWindow_GetSashPosition( TSelf(wxSplitterWindow) _obj );
+int        wxSplitterWindow_GetSashSize( TSelf(wxSplitterWindow) _obj );
+int        wxSplitterWindow_GetSplitMode( TSelf(wxSplitterWindow) _obj );
+TClass(wxWindow) wxSplitterWindow_GetWindow1( TSelf(wxSplitterWindow) _obj );
+TClass(wxWindow) wxSplitterWindow_GetWindow2( TSelf(wxSplitterWindow) _obj );
+void       wxSplitterWindow_Initialize( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) window );
+TBool      wxSplitterWindow_IsSplit( TSelf(wxSplitterWindow) _obj );
+TBoolInt   wxSplitterWindow_ReplaceWindow( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) winOld, TClass(wxWindow) winNew );
+void       wxSplitterWindow_SetBorderSize( TSelf(wxSplitterWindow) _obj, int width );
+void       wxSplitterWindow_SetMinimumPaneSize( TSelf(wxSplitterWindow) _obj, int min );
+void       wxSplitterWindow_SetSashPosition( TSelf(wxSplitterWindow) _obj, int position, TBoolInt redraw );
+void       wxSplitterWindow_SetSashSize( TSelf(wxSplitterWindow) _obj, int width );
+void       wxSplitterWindow_SetSplitMode( TSelf(wxSplitterWindow) _obj, int mode );
+TBool      wxSplitterWindow_SplitHorizontally( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) window1, TClass(wxWindow) window2, int sashPosition );
+TBool      wxSplitterWindow_SplitVertically( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) window1, TClass(wxWindow) window2, int sashPosition );
+TBool      wxSplitterWindow_Unsplit( TSelf(wxSplitterWindow) _obj, TClass(wxWindow) toRemove );
+
+/* wxStaticBitmap */
+TClassDefExtend(wxStaticBitmap,wxControl)
+TClass(wxStaticBitmap) wxStaticBitmap_Create( TClass(wxWindow) _prt, int _id, TClass(wxBitmap) bitmap, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxStaticBitmap_Delete( TSelf(wxStaticBitmap) _obj );
+void       wxStaticBitmap_GetBitmap( TSelf(wxStaticBitmap) _obj, TClassRef(wxBitmap) _ref );
+void       wxStaticBitmap_GetIcon( TSelf(wxStaticBitmap) _obj, TClassRef(wxIcon) _ref );
+void       wxStaticBitmap_SetBitmap( TSelf(wxStaticBitmap) _obj, TClass(wxBitmap) bitmap );
+void       wxStaticBitmap_SetIcon( TSelf(wxStaticBitmap) _obj, TClass(wxIcon) icon );
+
+/* wxStaticBox */
+TClassDefExtend(wxStaticBox,wxControl)
+TClass(wxStaticBox) wxStaticBox_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+
+/* wxStaticBoxSizer */
+TClassDefExtend(wxStaticBoxSizer,wxBoxSizer)
+void       wxStaticBoxSizer_CalcMin( TSelf(wxStaticBoxSizer) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxStaticBoxSizer) wxStaticBoxSizer_Create( TClass(wxStaticBox) box, int orient );
+TClass(wxStaticBox) wxStaticBoxSizer_GetStaticBox( TSelf(wxStaticBoxSizer) _obj );
+void       wxStaticBoxSizer_RecalcSizes( TSelf(wxStaticBoxSizer) _obj );
+
+/* wxStaticLine */
+TClassDefExtend(wxStaticLine,wxControl)
+TClass(wxStaticLine) wxStaticLine_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxStaticLine_GetDefaultSize( TSelf(wxStaticLine) _obj );
+TBool      wxStaticLine_IsVertical( TSelf(wxStaticLine) _obj );
+
+/* wxStaticText */
+TClassDefExtend(wxStaticText,wxControl)
+TClass(wxStaticText) wxStaticText_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), int _stl );
+
+/* wxStatusBar */
+TClassDefExtend(wxStatusBar,wxWindow)
+TClass(wxStatusBar) wxStatusBar_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+int        wxStatusBar_GetBorderX( TSelf(wxStatusBar) _obj );
+int        wxStatusBar_GetBorderY( TSelf(wxStatusBar) _obj );
+int        wxStatusBar_GetFieldsCount( TSelf(wxStatusBar) _obj );
+TStringLen wxStatusBar_GetStatusText( TSelf(wxStatusBar) _obj, int number, TStringOutVoid _buf );
+void       wxStatusBar_SetFieldsCount( TSelf(wxStatusBar) _obj, int number, int* widths );
+void       wxStatusBar_SetMinHeight( TSelf(wxStatusBar) _obj, int height );
+void       wxStatusBar_SetStatusText( TSelf(wxStatusBar) _obj, TStringVoid text, int number );
+void       wxStatusBar_SetStatusWidths( TSelf(wxStatusBar) _obj, int n, int* widths );
+
+/* wxStopWatch */
+TClassDef(wxStopWatch)
+TClass(wxStopWatch) wxStopWatch_Create();
+void      wxStopWatch_Delete(TSelf(wxStopWatch) _obj);
+void      wxStopWatch_Start(TSelf(wxStopWatch) _obj, int msec);
+void      wxStopWatch_Pause(TSelf(wxStopWatch) _obj);
+void      wxStopWatch_Resume(TSelf(wxStopWatch) _obj);
+int       wxStopWatch_Time(TSelf(wxStopWatch) _obj);
+
+
+/* wxStreamBase */
+TClassDef(wxStreamBase)
+int        wxStreamBase_GetLastError( TSelf(wxStreamBase) _obj );
+int        wxStreamBase_GetSize( TSelf(wxStreamBase) _obj );
+TBool      wxStreamBase_IsOk( TSelf(wxStreamBase) _obj );
+
+/* wxStreamBuffer */
+TClassDef(wxStreamBuffer)
+
+/* wxStreamToTextRedirector */
+TClassDef(wxStreamToTextRedirector)
+
+/* wxString */
+TClassDef(wxString)
+
+/* wxStringBuffer */
+TClassDef(wxStringBuffer)
+
+/* wxStringClientData */
+TClassDefExtend(wxStringClientData,wxClientData)
+
+/* wxStringList */
+TClassDefExtend(wxStringList,wxList)
+
+/* wxStringTokenizer */
+TClassDefExtend(wxStringTokenizer,wxObject)
+
+/* wxSysColourChangedEvent */
+TClassDefExtend(wxSysColourChangedEvent,wxEvent)
+
+/* wxSystemOptions */
+TClassDefExtend(wxSystemOptions,wxObject)
+
+/* wxSystemSettings */
+TClassDefExtend(wxSystemSettings,wxObject)
+void       wxSystemSettings_GetSystemColour( int index, TClassRef(wxColour) _ref );
+void       wxSystemSettings_GetSystemFont( int index, TClassRef(wxFont) _ref );
+int        wxSystemSettings_GetSystemMetric( int index );
+
+/* wxTabCtrl */
+TClassDefExtend(wxTabCtrl,wxControl)
+
+/* wxTabEvent */
+TClassDefExtend(wxTabEvent,wxCommandEvent)
+
+/* wxTablesInUse */
+TClassDefExtend(wxTablesInUse,wxObject)
+
+/* wxTaskBarIcon */
+TClassDefExtend(wxTaskBarIcon,wxEvtHandler)
+TClass(wxTaskBarIcon) wxTaskBarIcon_Create();
+void       wxTaskBarIcon_Delete( TSelf(wxTaskBarIcon) _obj );
+/* TClass(wxMenu)  wxTaskBarIcon_CreatePopupMenu( TSelf(wxTaskBarIcon) _obj ); */
+TBool      wxTaskBarIcon_IsIconInstalled( TSelf(wxTaskBarIcon) _obj );
+TBool      wxTaskBarIcon_IsOk( TSelf(wxTaskBarIcon) _obj );
+TBool      wxTaskBarIcon_PopupMenu( TSelf(wxTaskBarIcon) _obj, TClass(wxMenu) menu );
+TBool      wxTaskBarIcon_RemoveIcon( TSelf(wxTaskBarIcon) _obj );
+TBool      wxTaskBarIcon_SetIcon( TSelf(wxTaskBarIcon) _obj, TClass(wxIcon) icon, TString text );
+
+/* wxTempFile */
+TClassDef(wxTempFile)
+
+/* wxTextAttr */
+TClassDef(wxTextAttr)
+
+/* wxTextCtrl */
+TClassDefExtend(wxTextCtrl,wxControl)
+void       wxTextCtrl_AppendText( TSelf(wxTextCtrl) _obj, TString text );
+TBool      wxTextCtrl_CanCopy( TSelf(wxTextCtrl) _obj );
+TBool      wxTextCtrl_CanCut( TSelf(wxTextCtrl) _obj );
+TBool      wxTextCtrl_CanPaste( TSelf(wxTextCtrl) _obj );
+TBool      wxTextCtrl_CanRedo( TSelf(wxTextCtrl) _obj );
+TBool      wxTextCtrl_CanUndo( TSelf(wxTextCtrl) _obj );
+void       wxTextCtrl_Clear( TSelf(wxTextCtrl) _obj );
+void       wxTextCtrl_Copy( TSelf(wxTextCtrl) _obj );
+TClass(wxTextCtrl) wxTextCtrl_Create( TClass(wxWindow) _prt, int _id, TString _txt, TRect(_lft,_top,_wdt,_hgt), long _stl );
+void       wxTextCtrl_Cut( TSelf(wxTextCtrl) _obj );
+void       wxTextCtrl_DiscardEdits( TSelf(wxTextCtrl) _obj );
+long       wxTextCtrl_GetInsertionPoint( TSelf(wxTextCtrl) _obj );
+long       wxTextCtrl_GetLastPosition( TSelf(wxTextCtrl) _obj );
+int        wxTextCtrl_GetLineLength( TSelf(wxTextCtrl) _obj, long lineNo );
+TStringLen wxTextCtrl_GetLineText( TSelf(wxTextCtrl) _obj, long lineNo, TStringOutVoid _buf );
+int        wxTextCtrl_GetNumberOfLines( TSelf(wxTextCtrl) _obj );
+void       wxTextCtrl_GetSelection( TSelf(wxTextCtrl) _obj, void* from, void* to );
+TStringLen wxTextCtrl_GetValue( TSelf(wxTextCtrl) _obj, TStringOutVoid _buf );
+TBool      wxTextCtrl_IsEditable( TSelf(wxTextCtrl) _obj );
+TBool      wxTextCtrl_IsModified( TSelf(wxTextCtrl) _obj );
+int        wxTextCtrl_LoadFile( TSelf(wxTextCtrl) _obj, TString file );
+void       wxTextCtrl_Paste( TSelf(wxTextCtrl) _obj );
+int        wxTextCtrl_PositionToXY( TSelf(wxTextCtrl) _obj, long pos, long* x, long* y );
+void       wxTextCtrl_Redo( TSelf(wxTextCtrl) _obj );
+void       wxTextCtrl_Remove( TSelf(wxTextCtrl) _obj, long from, long to );
+void       wxTextCtrl_Replace( TSelf(wxTextCtrl) _obj, long from, long to, TString value );
+int        wxTextCtrl_SaveFile( TSelf(wxTextCtrl) _obj, TString file );
+void       wxTextCtrl_SetEditable( TSelf(wxTextCtrl) _obj, TBool editable );
+void       wxTextCtrl_SetInsertionPoint( TSelf(wxTextCtrl) _obj, long pos );
+void       wxTextCtrl_SetInsertionPointEnd( TSelf(wxTextCtrl) _obj );
+void       wxTextCtrl_SetSelection( TSelf(wxTextCtrl) _obj, long from, long to );
+void       wxTextCtrl_SetValue( TSelf(wxTextCtrl) _obj, TString value );
+void       wxTextCtrl_ShowPosition( TSelf(wxTextCtrl) _obj, long pos );
+void       wxTextCtrl_Undo( TSelf(wxTextCtrl) _obj );
+void       wxTextCtrl_WriteText( TSelf(wxTextCtrl) _obj, TString text );
+long       wxTextCtrl_XYToPosition( TSelf(wxTextCtrl) _obj, TPointLong(x,y) );
+
+/* wxTextDataObject */
+TClassDefExtend(wxTextDataObject,wxDataObjectSimple)
+TClass(TextDataObject) TextDataObject_Create( TStringVoid _txt );
+void       TextDataObject_Delete( TSelf(TextDataObject) _obj );
+size_t TextDataObject_GetTextLength( TSelf(TextDataObject) _obj );
+TStringLen       TextDataObject_GetText( TSelf(TextDataObject) _obj, TStringOutVoid _buf );
+void       TextDataObject_SetText( TSelf(TextDataObject) _obj, TString text );
+
+/* wxTextDropTarget */
+TClassDefExtend(wxTextDropTarget,wxDropTarget)
+
+/* wxTextEntryDialog */
+TClassDefExtend(wxTextEntryDialog,wxDialog)
+
+/* wxTextFile */
+TClassDef(wxTextFile)
+
+/* wxTextInputStream */
+TClassDef(wxTextInputStream)
+
+/* wxTextOutputStream */
+TClassDef(wxTextOutputStream)
+
+/* wxTextValidator */
+TClassDefExtend(wxTextValidator,wxValidator)
+TClass(wxTextValidator) wxTextValidator_Create( int style, void* val );
+TArrayLen  wxTextValidator_GetExcludeList( TSelf(wxTextValidator) _obj, TArrayStringOutVoid _ref );
+TArrayLen  wxTextValidator_GetIncludeList( TSelf(wxTextValidator) _obj, TArrayStringOutVoid _ref );
+int        wxTextValidator_GetStyle( TSelf(wxTextValidator) _obj );
+void       wxTextValidator_OnChar( TSelf(wxTextValidator) _obj, TClass(wxEvent) event );
+void       wxTextValidator_SetExcludeList( TSelf(wxTextValidator) _obj, TClass(wxList) list, int count );
+void       wxTextValidator_SetIncludeList( TSelf(wxTextValidator) _obj, TClass(wxList) list, int count );
+void       wxTextValidator_SetStyle( TSelf(wxTextValidator) _obj, int style );
+
+/* wxThinSplitterWindow */
+TClassDefExtend(wxThinSplitterWindow,wxSplitterWindow)
+TClass(wxThinSplitterWindow) wxThinSplitterWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
+void       wxThinSplitterWindow_DrawSash( TSelf(wxThinSplitterWindow) _obj, TClass(wxDC) dc );
+int        wxThinSplitterWindow_SashHitTest( TSelf(wxThinSplitterWindow) _obj, TPoint(x,y), int tolerance );
+void       wxThinSplitterWindow_SizeWindows( TSelf(wxThinSplitterWindow) _obj );
+
+/* wxThread */
+TClassDef(wxThread)
+
+/* wxTime */
+TClassDefExtend(wxTime,wxObject)
+
+/* wxTimeSpan */
+TClassDef(wxTimeSpan)
+
+/* wxTimer */
+TClassDefExtend(wxTimer,wxObject)
+TClass(wxTimer) wxTimer_Create( TClass(wxWindow) _prt, int _id );
+void       wxTimer_Delete( TSelf(wxTimer) _obj );
+int        wxTimer_GetInterval( TSelf(wxTimer) _obj );
+TBool      wxTimer_IsOneShot( TSelf(wxTimer) _obj );
+TBool      wxTimer_IsRuning( TSelf(wxTimer) _obj );
+TBool      wxTimer_Start( TSelf(wxTimer) _obj, int _int, TBool _one );
+void       wxTimer_Stop( TSelf(wxTimer) _obj );
+
+/* wxTimerBase */
+TClassDefExtend(wxTimerBase,wxObject)
+
+/* wxTimerEvent */
+TClassDefExtend(wxTimerEvent,wxEvent)
+int        wxTimerEvent_GetInterval( TSelf(wxTimerEvent) _obj );
+
+/* wxTimerEx */
+TClassDefExtend(wxTimerEx,wxTimer)
+
+/* wxTimerRunner */
+TClassDef(wxTimerRunner)
+
+/* wxTipProvider */
+TClassDef(wxTipProvider)
+
+/* wxTipWindow */
+TClassDefExtend(wxTipWindow,wxPopupTransientWindow)
+void       wxTipWindow_Close( TSelf(wxTipWindow) _obj );
+TClass(wxTipWindow) wxTipWindow_Create( TClass(wxWindow) parent, TStringVoid text, int maxLength );
+void       wxTipWindow_SetBoundingRect( TSelf(wxTipWindow) _obj, TRect(x,y,w,h) );
+void       wxTipWindow_SetTipWindowPtr( TSelf(wxTipWindow) _obj, void* windowPtr );
+
+/* wxToggleButton */
+TClassDefExtend(wxToggleButton,wxControl)
+TClass(wxToggleButton) wxToggleButton_Create( TClass(wxWindow) parent, int id, void* label, TRect(x,y,w,h), int style );
+int        wxToggleButton_Enable( TSelf(wxToggleButton) _obj, TBool enable );
+int        wxToggleButton_GetValue( TSelf(wxToggleButton) _obj );
+void       wxToggleButton_SetLabel( TSelf(wxToggleButton) _obj, void* label );
+void       wxToggleButton_SetValue( TSelf(wxToggleButton) _obj, int state );
+
+/* wxToolBar */
+TClassDefExtend(wxToolBar,wxToolBarBase)
+TBoolInt   wxToolBar_AddControl( TSelf(wxToolBar) _obj, TClass(wxControl) ctrl );
+void       wxToolBar_AddSeparator( TSelf(wxToolBar) _obj );
+void       wxToolBar_AddTool( TSelf(wxToolBar) _obj, int id, TClass(wxBitmap) bmp, TStringVoid shelp, TStringVoid lhelp );
+void       wxToolBar_AddToolEx( TSelf(wxToolBar) _obj, int id, TClass(wxBitmap) bmp1, TClass(wxBitmap) bmp2, TBoolInt isToggle, TPoint(x,y), TClass(wxObject) data, TStringVoid shelp, TStringVoid lhelp );
+TClass(wxToolBar) wxToolBar_Create( TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxToolBar_Delete( TSelf(wxToolBar) _obj );
+TBoolInt   wxToolBar_DeleteTool( TSelf(wxToolBar) _obj, int id );
+TBoolInt   wxToolBar_DeleteToolByPos( TSelf(wxToolBar) _obj, int pos );
+void       wxToolBar_EnableTool( TSelf(wxToolBar) _obj, int id, TBool enable );
+void       wxToolBar_GetMargins( TSelf(wxToolBar) _obj, TPointOutVoid(x,y) );
+void       wxToolBar_GetToolBitmapSize( TSelf(wxToolBar) _obj, TSizeOutVoid(_x,_y) );
+TClass(wxObject) wxToolBar_GetToolClientData( TSelf(wxToolBar) _obj, int id );
+TBool      wxToolBar_GetToolEnabled( TSelf(wxToolBar) _obj, int id );
+TStringLen wxToolBar_GetToolLongHelp( TSelf(wxToolBar) _obj, int id, TStringOutVoid _buf );
+int        wxToolBar_GetToolPacking( TSelf(wxToolBar) _obj );
+TStringLen wxToolBar_GetToolShortHelp( TSelf(wxToolBar) _obj, int id, TStringOutVoid _buf );
+void       wxToolBar_GetToolSize( TSelf(wxToolBar) _obj, TPointOutVoid(_x,_y) );
+TBoolInt   wxToolBar_GetToolState( TSelf(wxToolBar) _obj, int id );
+void       wxToolBar_InsertControl( TSelf(wxToolBar) _obj, int pos, TClass(wxControl) ctrl );
+void       wxToolBar_InsertSeparator( TSelf(wxToolBar) _obj, int pos );
+void       wxToolBar_InsertTool( TSelf(wxToolBar) _obj, int pos, int id, TClass(wxBitmap) bmp1, TClass(wxBitmap) bmp2, TBoolInt isToggle, TClass(wxObject) data, TStringVoid shelp, TStringVoid lhelp );
+TBoolInt   wxToolBar_Realize( TSelf(wxToolBar) _obj );
+void       wxToolBar_RemoveTool( TSelf(wxToolBar) _obj, int id );
+void       wxToolBar_SetMargins( TSelf(wxToolBar) _obj, TPoint(x,y) );
+void       wxToolBar_SetToolBitmapSize( TSelf(wxToolBar) _obj, TSize(x,y) );
+void       wxToolBar_SetToolClientData( TSelf(wxToolBar) _obj, int id, TClass(wxObject) data );
+void       wxToolBar_SetToolLongHelp( TSelf(wxToolBar) _obj, int id, TStringVoid str );
+void       wxToolBar_SetToolPacking( TSelf(wxToolBar) _obj, int packing );
+void       wxToolBar_SetToolSeparation( TSelf(wxToolBar) _obj, int separation );
+void       wxToolBar_SetToolShortHelp( TSelf(wxToolBar) _obj, int id, TStringVoid str );
+void       wxToolBar_ToggleTool( TSelf(wxToolBar) _obj, int id, TBoolInt toggle );
+
+/* wxToolBarBase */
+TClassDefExtend(wxToolBarBase,wxControl)
+
+/* wxToolLayoutItem */
+TClassDefExtend(wxToolLayoutItem,wxObject)
+TBool      wxToolLayoutItem_IsSeparator( TSelf(wxToolLayoutItem) _obj );
+void       wxToolLayoutItem_Rect( TSelf(wxToolLayoutItem) _obj, TRectOutVoid(_x,_y,_w,_h) );
+
+/* wxToolTip */
+TClassDefExtend(wxToolTip,wxObject)
+
+/* wxToolWindow */
+TClassDefExtend(wxToolWindow,wxFrame)
+void       wxToolWindow_AddMiniButton( TSelf(wxToolWindow) _obj, void* _btn );
+TClass(wxToolWindow) wxToolWindow_Create( void* _obj, void* _btn, void* _ttl );
+TClass(wxClient) wxToolWindow_GetClient( TSelf(wxToolWindow) _obj );
+void       wxToolWindow_SetClient( TSelf(wxToolWindow) _obj, TClass(wxWindow) _wnd );
+void       wxToolWindow_SetTitleFont( TSelf(wxToolWindow) _obj, void* _fnt );
+
+/* wxTreeCompanionWindow */
+TClassDefExtend(wxTreeCompanionWindow,wxWindow)
+TClass(wxTreeCompanionWindow) wxTreeCompanionWindow_Create( TClass(wxWindow) parent, int id, TRect(x,y,w,h), int style );
+void       wxTreeCompanionWindow_DrawItem( TSelf(wxTreeCompanionWindow) _obj, TClass(wxDC) dc, void* id, TRect(x,y,w,h));
+TClass(wxTreeCtrl) wxTreeCompanionWindow_GetTreeCtrl( TSelf(wxTreeCompanionWindow) _obj );
+void       wxTreeCompanionWindow_SetTreeCtrl( TSelf(wxTreeCompanionWindow) _obj, TClass(wxTreeCtrl) treeCtrl );
+
+/* wxTreeCtrl */
+TClassDefExtend(wxTreeCtrl,wxControl)
+void       wxTreeCtrl_AddRoot( TSelf(wxTreeCtrl) _obj, TStringVoid text, int image, int selectedImage, TClass(wxTreeItemData) data, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_AppendItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, TStringVoid text, int image, int selectedImage, TClass(wxTreeItemData)  data, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_Collapse( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_CollapseAndReset( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+TClass(wxTreeCtrl) wxTreeCtrl_Create( void* _obj, void* _cmp, TClass(wxWindow) _prt, int _id, TRect(_lft,_top,_wdt,_hgt), int _stl );
+void       wxTreeCtrl_Delete( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_DeleteAllItems( TSelf(wxTreeCtrl) _obj );
+void       wxTreeCtrl_DeleteChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_EditLabel( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_EndEditLabel( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt discardChanges );
+void       wxTreeCtrl_EnsureVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_Expand( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+int        wxTreeCtrl_GetBoundingRect( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt textOnly, TRectOutVoid(x,y,w,h) );
+int        wxTreeCtrl_GetChildrenCount( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt recursively );
+int        wxTreeCtrl_GetCount( TSelf(wxTreeCtrl) _obj );
+TClass(wxTextCtrl) wxTreeCtrl_GetEditControl( TSelf(wxTreeCtrl) _obj );
+void       wxTreeCtrl_GetFirstChild( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int* cookie, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetFirstVisibleItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
+TClass(wxImageList) wxTreeCtrl_GetImageList( TSelf(wxTreeCtrl) _obj );
+int        wxTreeCtrl_GetIndent( TSelf(wxTreeCtrl) _obj );
+void*      wxTreeCtrl_GetItemData( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+int        wxTreeCtrl_GetItemImage( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int which );
+TStringLen wxTreeCtrl_GetItemText( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TStringOutVoid _buf );
+void       wxTreeCtrl_GetLastChild( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetNextChild( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int* cookie, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetNextSibling( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetNextVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetParent( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetPrevSibling( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetPrevVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetRootItem( TSelf(wxTreeCtrl) _obj, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_GetSelection( TSelf(wxTreeCtrl) _obj, TClassRef(wxTreeItemId) _item );
+TArrayLen  wxTreeCtrl_GetSelections( TSelf(wxTreeCtrl) _obj, TArrayIntOutVoid selections );
+int        wxTreeCtrl_GetSpacing( TSelf(wxTreeCtrl) _obj );
+TClass(wxImageList)  wxTreeCtrl_GetStateImageList( TSelf(wxTreeCtrl) _obj );
+void       wxTreeCtrl_HitTest( TSelf(wxTreeCtrl) _obj, TPoint(_x,_y), int* flags, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_InsertItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, TClass(wxTreeItemId) idPrevious, TStringVoid text, int image, int selectedImage, void* data, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_InsertItemByIndex( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, int index, TStringVoid text, int image, int selectedImage, void* data, TClassRef(wxTreeItemId) _item );
+TBool      wxTreeCtrl_IsBold( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+TBool      wxTreeCtrl_IsExpanded( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+TBool      wxTreeCtrl_IsSelected( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+TBool      wxTreeCtrl_IsVisible( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+int        wxTreeCtrl_ItemHasChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+int        wxTreeCtrl_OnCompareItems( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item1, TClass(wxTreeItemId) item2 );
+void       wxTreeCtrl_PrependItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) parent, TStringVoid text, int image, int selectedImage, void* data, TClassRef(wxTreeItemId) _item );
+void       wxTreeCtrl_ScrollTo( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_SelectItem( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_SetImageList( TSelf(wxTreeCtrl) _obj, TClass(wxImageList) imageList );
+void       wxTreeCtrl_SetIndent( TSelf(wxTreeCtrl) _obj, int indent );
+void       wxTreeCtrl_SetItemBackgroundColour( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClass(wxColour) col );
+void       wxTreeCtrl_SetItemBold( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt bold );
+void       wxTreeCtrl_SetItemData( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, void* data );
+void       wxTreeCtrl_SetItemDropHighlight( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt highlight );
+void       wxTreeCtrl_SetItemFont( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClass(wxFont) font );
+void       wxTreeCtrl_SetItemHasChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TBoolInt hasChildren );
+void       wxTreeCtrl_SetItemImage( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, int image, int which );
+void       wxTreeCtrl_SetItemText( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TStringVoid text );
+void       wxTreeCtrl_SetItemTextColour( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item, TClass(wxColour) col );
+void       wxTreeCtrl_SetSpacing( TSelf(wxTreeCtrl) _obj, int spacing );
+void       wxTreeCtrl_SetStateImageList( TSelf(wxTreeCtrl) _obj, TClass(wxImageList) imageList );
+void       wxTreeCtrl_SortChildren( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_Toggle( TSelf(wxTreeCtrl) _obj, TClass(wxTreeItemId) item );
+void       wxTreeCtrl_Unselect( TSelf(wxTreeCtrl) _obj );
+void       wxTreeCtrl_UnselectAll( TSelf(wxTreeCtrl) _obj );
+
+/* wxTreeEvent */
+TClassDefExtend(wxTreeEvent,wxNotifyEvent)
+int        wxTreeEvent_GetCode( TSelf(wxTreeEvent) _obj );
+void       wxTreeEvent_GetItem( TSelf(wxTreeEvent) _obj, TClassRef(wxTreeItemId) _ref );
+TStringLen wxTreeEvent_GetLabel( TSelf(wxTreeEvent) _obj, TStringOutVoid _buf );
+void       wxTreeEvent_GetOldItem( TSelf(wxTreeEvent) _obj, TClassRef(wxTreeItemId) _ref );
+void       wxTreeEvent_GetPoint( TSelf(wxTreeEvent) _obj, TPointOutVoid(_x,_y) );
+
+/* wxTreeItemData */
+TClassDefExtend(wxTreeItemData,wxClientData)
+
+/* wxTreeItemId */
+TClassDef(wxTreeItemId)
+TClass(wxTreeItemId) wxTreeItemId_Create(  );
+void       wxTreeItemId_Delete( TSelf(wxTreeItemId) _obj );
+TBool      wxTreeItemId_IsOk( TSelf(wxTreeItemId) _obj );
+
+/* wxTreeLayout */
+TClassDefExtend(wxTreeLayout,wxObject)
+
+/* wxTreeLayoutStored */
+TClassDefExtend(wxTreeLayoutStored,wxTreeLayout)
+
+/* wxURL */
+TClassDefExtend(wxURL,wxObject)
+
+/* wxUpdateUIEvent */
+TClassDefExtend(wxUpdateUIEvent,wxEvent)
+void       wxUpdateUIEvent_Check( TSelf(wxUpdateUIEvent) _obj, TBool check );
+void       wxUpdateUIEvent_CopyObject( TSelf(wxUpdateUIEvent) _obj, void* obj );
+void       wxUpdateUIEvent_Enable( TSelf(wxUpdateUIEvent) _obj, TBool enable );
+TBool      wxUpdateUIEvent_GetChecked( TSelf(wxUpdateUIEvent) _obj );
+TBool      wxUpdateUIEvent_GetEnabled( TSelf(wxUpdateUIEvent) _obj );
+int        wxUpdateUIEvent_GetSetChecked( TSelf(wxUpdateUIEvent) _obj );
+int        wxUpdateUIEvent_GetSetEnabled( TSelf(wxUpdateUIEvent) _obj );
+int        wxUpdateUIEvent_GetSetText( TSelf(wxUpdateUIEvent) _obj );
+TStringLen wxUpdateUIEvent_GetText( TSelf(wxUpdateUIEvent) _obj, TStringOutVoid _buf );
+void       wxUpdateUIEvent_SetText( TSelf(wxUpdateUIEvent) _obj, TString text );
+
+/* wxValidator */
+TClassDefExtend(wxValidator,wxEvtHandler)
+TClass(wxValidator) wxValidator_Create(  );
+void       wxValidator_Delete( TSelf(wxValidator) _obj );
+TClass(wxWindow) wxValidator_GetWindow( TSelf(wxValidator) _obj );
+TBool      wxValidator_IsSilent(  );
+void       wxValidator_SetBellOnError( TBool doIt );
+void       wxValidator_SetWindow( TSelf(wxValidator) _obj, TClass(wxWindow) win );
+int        wxValidator_TransferFromWindow( TSelf(wxValidator) _obj );
+int        wxValidator_TransferToWindow( TSelf(wxValidator) _obj );
+TBool      wxValidator_Validate( TSelf(wxValidator) _obj, TClass(wxWindow) parent );
+
+/* wxVariant */
+TClassDefExtend(wxVariant,wxObject)
+
+/* wxVariantData */
+TClassDefExtend(wxVariantData,wxObject)
+
+/* wxView */
+TClassDefExtend(wxView,wxEvtHandler)
+
+/* wxSound */
+TClassDefExtend(wxSound,wxEvtHandler)
+
+/* wxWindow */
+TClassDefExtend(wxWindow,wxEvtHandler)
+void       wxWindow_AddChild( TSelf(wxWindow) _obj, TClass(wxWindow) child );
+void       wxWindow_AddConstraintReference( TSelf(wxWindow) _obj, TClass(wxWindow) otherWin );
+void       wxWindow_CaptureMouse( TSelf(wxWindow) _obj );
+void       wxWindow_Center( TSelf(wxWindow) _obj, int direction );
+void       wxWindow_CenterOnParent( TSelf(wxWindow) _obj, int dir );
+void       wxWindow_Clear( TSelf(wxWindow) _obj );
+TBool      wxWindow_Close( TSelf(wxWindow) _obj, TBool _force );
+void       wxWindow_ConvertDialogToPixels( TSelf(wxWindow) _obj, TPointOut(_x,_y) );
+void       wxWindow_ConvertPixelsToDialog( TSelf(wxWindow) _obj, TPointOut(_x,_y) );
+TClass(wxWindow) wxWindow_Create( TClass(wxWindow) _prt, int _id, TRect(_x,_y,_w,_h), int _stl );
+void       wxWindow_DeleteRelatedConstraints( TSelf(wxWindow) _obj );
+TBool      wxWindow_Destroy( TSelf(wxWindow) _obj );
+TBool      wxWindow_DestroyChildren( TSelf(wxWindow) _obj );
+TBool      wxWindow_Disable( TSelf(wxWindow) _obj );
+int        wxWindow_DoPhase( TSelf(wxWindow) _obj, int phase );
+TBoolInt   wxWindow_Enable( TSelf(wxWindow) _obj );
+TClass(wxWindow) wxWindow_FindFocus( TSelf(wxWindow) _obj );
+TClass(wxWindow) wxWindow_FindWindow( TSelf(wxWindow) _obj, TString name );
+void       wxWindow_Fit( TSelf(wxWindow) _obj );
+void       wxWindow_Freeze( TSelf(wxWindow) _obj );
+void       wxWindow_GetAdjustedBestSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
+int        wxWindow_GetAutoLayout( TSelf(wxWindow) _obj );
+void       wxWindow_GetBackgroundColour( TSelf(wxWindow) _obj, TClassRef(wxColour) _ref );
+void       wxWindow_GetBestSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
+TClass(wxCaret) wxWindow_GetCaret( TSelf(wxWindow) _obj );
+int        wxWindow_GetCharHeight( TSelf(wxWindow) _obj );
+int        wxWindow_GetCharWidth( TSelf(wxWindow) _obj );
+int        wxWindow_GetChildren( TSelf(wxWindow) _obj, void* _res, int _cnt );
+TClass(wxClientData) wxWindow_GetClientData( TSelf(wxWindow) _obj );
+void       wxWindow_GetClientSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
+void       wxWindow_GetClientSizeConstraint( TSelf(wxWindow) _obj, TSizeOut(_w,_h) );
+TClass(wxLayoutConstraints) wxWindow_GetConstraints( TSelf(wxWindow) _obj );
+void*      wxWindow_GetConstraintsInvolvedIn( TSelf(wxWindow) _obj );
+TClass(wxCursor) wxWindow_GetCursor( TSelf(wxWindow) _obj );
+TClass(wxDropTarget) wxWindow_GetDropTarget( TSelf(wxWindow) _obj );
+TClass(wxEvtHandler) wxWindow_GetEventHandler( TSelf(wxWindow) _obj );
+void       wxWindow_GetFont( TSelf(wxWindow) _obj, TClassRef(wxFont) _ref );
+void       wxWindow_GetForegroundColour( TSelf(wxWindow) _obj, TClassRef(wxColour) _ref );
+void*      wxWindow_GetHandle( TSelf(wxWindow) _obj );
+int        wxWindow_GetId( TSelf(wxWindow) _obj );
+TStringLen wxWindow_GetLabel( TSelf(wxWindow) _obj, TStringOutVoid _buf );
+int        wxWindow_GetLabelEmpty( TSelf(wxWindow) _obj );
+int        wxWindow_GetMaxHeight( TSelf(wxWindow) _obj );
+int        wxWindow_GetMaxWidth( TSelf(wxWindow) _obj );
+int        wxWindow_GetMinHeight( TSelf(wxWindow) _obj );
+int        wxWindow_GetMinWidth( TSelf(wxWindow) _obj );
+TStringLen wxWindow_GetName( TSelf(wxWindow) _obj, TStringOutVoid _buf );
+TClass(wxWindow) wxWindow_GetParent( TSelf(wxWindow) _obj );
+void       wxWindow_GetPosition( TSelf(wxWindow) _obj, TPointOutVoid(_x,_y) );
+void       wxWindow_GetPositionConstraint( TSelf(wxWindow) _obj, TPointOut(_x,_y) );
+void       wxWindow_GetRect( TSelf(wxWindow) _obj, TRectOutVoid(_x,_y,_w,_h) );
+int        wxWindow_GetScrollPos( TSelf(wxWindow) _obj, int orient );
+int        wxWindow_GetScrollRange( TSelf(wxWindow) _obj, int orient );
+int        wxWindow_GetScrollThumb( TSelf(wxWindow) _obj, int orient );
+void       wxWindow_GetSize( TSelf(wxWindow) _obj, TSizeOutVoid(_w,_h) );
+void       wxWindow_GetSizeConstraint( TSelf(wxWindow) _obj, TSizeOut(_w,_h) );
+TClass(wxSizer) wxWindow_GetSizer( TSelf(wxWindow) _obj );
+void       wxWindow_GetTextExtent( TSelf(wxWindow) _obj, TString string, int* x, int* y, int* descent, int* externalLeading, TClass(wxFont) theFont );
+TStringLen wxWindow_GetToolTip( TSelf(wxWindow) _obj, TStringOutVoid _buf );
+TClass(wxRegion) wxWindow_GetUpdateRegion( TSelf(wxWindow) _obj );
+TClass(wxValidator) wxWindow_GetValidator( TSelf(wxWindow) _obj );
+int        wxWindow_GetWindowStyleFlag( TSelf(wxWindow) _obj );
+TBool      wxWindow_HasFlag( TSelf(wxWindow) _obj, int flag );
+TBool      wxWindow_Hide( TSelf(wxWindow) _obj );
+void       wxWindow_InitDialog( TSelf(wxWindow) _obj );
+TBool      wxWindow_IsBeingDeleted( TSelf(wxWindow) _obj );
+TBool      wxWindow_IsEnabled( TSelf(wxWindow) _obj );
+TBool      wxWindow_IsExposed( TSelf(wxWindow) _obj, TRect(x,y,w,h) );
+TBool      wxWindow_IsShown( TSelf(wxWindow) _obj );
+TBool      wxWindow_IsTopLevel( TSelf(wxWindow) _obj );
+int        wxWindow_Layout( TSelf(wxWindow) _obj );
+int        wxWindow_LayoutPhase1( TSelf(wxWindow) _obj, int* noChanges );
+int        wxWindow_LayoutPhase2( TSelf(wxWindow) _obj, int* noChanges );
+void       wxWindow_Lower( TSelf(wxWindow) _obj );
+void       wxWindow_MakeModal( TSelf(wxWindow) _obj, TBool modal );
+void       wxWindow_Move( TSelf(wxWindow) _obj, TPoint(x,y) );
+void       wxWindow_MoveConstraint( TSelf(wxWindow) _obj, TPoint(x,y) );
+void*      wxWindow_PopEventHandler( TSelf(wxWindow) _obj, TBool deleteHandler );
+int        wxWindow_PopupMenu( TSelf(wxWindow) _obj, TClass(wxMenu) menu, TPoint(x,y) );
+void       wxWindow_PrepareDC( TSelf(wxWindow) _obj, TClass(wxDC) dc );
+void       wxWindow_PushEventHandler( TSelf(wxWindow) _obj, TClass(wxEvtHandler) handler );
+void       wxWindow_Raise( TSelf(wxWindow) _obj );
+void       wxWindow_Refresh( TSelf(wxWindow) _obj, TBool eraseBackground );
+void       wxWindow_RefreshRect( TSelf(wxWindow) _obj, TBool eraseBackground, TRect(x,y,w,h) );
+void       wxWindow_ReleaseMouse( TSelf(wxWindow) _obj );
+void       wxWindow_RemoveChild( TSelf(wxWindow) _obj, TClass(wxWindow) child );
+void       wxWindow_RemoveConstraintReference( TSelf(wxWindow) _obj, TClass(wxWindow) otherWin );
+int        wxWindow_Reparent( TSelf(wxWindow) _obj, TClass(wxWindow) _par );
+void       wxWindow_ResetConstraints( TSelf(wxWindow) _obj );
+void       wxWindow_ScreenToClient( TSelf(wxWindow) _obj, int* x, int* y );
+void       wxWindow_ScrollWindow( TSelf(wxWindow) _obj, TVector(dx,dy) );
+void       wxWindow_ScrollWindowRect( TSelf(wxWindow) _obj, TVector(dx,dy), TRect(x,y,w,h) );
+void       wxWindow_SetAcceleratorTable( TSelf(wxWindow) _obj, TClass(wxAcceleratorTable) accel );
+void       wxWindow_SetAutoLayout( TSelf(wxWindow) _obj, TBool autoLayout );
+int        wxWindow_SetBackgroundColour( TSelf(wxWindow) _obj, TClass(wxColour) colour );
+void       wxWindow_SetCaret( TSelf(wxWindow) _obj, TClass(wxCaret) caret );
+void       wxWindow_SetClientData( TSelf(wxWindow) _obj, TClass(wxClientData) data );
+void       wxWindow_SetClientObject( TSelf(wxWindow) _obj, TClass(wxClientData) data );
+void       wxWindow_SetClientSize( TSelf(wxWindow) _obj, TSize(width,height) );
+void       wxWindow_SetConstraintSizes( TSelf(wxWindow) _obj, int recurse );
+void       wxWindow_SetConstraints( TSelf(wxWindow) _obj, TClass(wxLayoutConstraints) constraints );
+int        wxWindow_SetCursor( TSelf(wxWindow) _obj, TClass(wxCursor) cursor );
+void       wxWindow_SetDropTarget( TSelf(wxWindow) _obj, TClass(wxDropTarget) dropTarget );
+void       wxWindow_SetExtraStyle( TSelf(wxWindow) _obj, long exStyle );
+void       wxWindow_SetFocus( TSelf(wxWindow) _obj );
+int        wxWindow_SetFont( TSelf(wxWindow) _obj, TClass(wxFont) font );
+int        wxWindow_SetForegroundColour( TSelf(wxWindow) _obj, TClass(wxColour) colour );
+void       wxWindow_SetId( TSelf(wxWindow) _obj, int _id );
+void       wxWindow_SetLabel( TSelf(wxWindow) _obj, TString _title );
+void       wxWindow_SetName( TSelf(wxWindow) _obj, TString _name );
+void       wxWindow_SetScrollPos( TSelf(wxWindow) _obj, int orient, int pos, TBool refresh );
+void       wxWindow_SetScrollbar( TSelf(wxWindow) _obj, int orient, int pos, int thumbVisible, int range, TBool refresh );
+void       wxWindow_SetSize( TSelf(wxWindow) _obj, TRect(x,y,width,height), int sizeFlags );
+void       wxWindow_SetSizeConstraint( TSelf(wxWindow) _obj, TRect(x,y,w,h) );
+void       wxWindow_SetSizeHints( TSelf(wxWindow) _obj, int minW, int minH, int maxW, int maxH, int incW, int incH );
+void       wxWindow_SetSizer( TSelf(wxWindow) _obj, TClass(wxSizer) sizer );
+void       wxWindow_SetToolTip( TSelf(wxWindow) _obj, TString tip );
+void       wxWindow_SetValidator( TSelf(wxWindow) _obj, TClass(wxValidator) validator );
+void       wxWindow_SetWindowStyleFlag( TSelf(wxWindow) _obj, long style );
+TBool      wxWindow_Show( TSelf(wxWindow) _obj );
+void       wxWindow_Thaw( TSelf(wxWindow) _obj );
+TBoolInt   wxWindow_TransferDataFromWindow( TSelf(wxWindow) _obj );
+TBoolInt   wxWindow_TransferDataToWindow( TSelf(wxWindow) _obj );
+void       wxWindow_UnsetConstraints( TSelf(wxWindow) _obj, void* c );
+void       wxWindow_UpdateWindowUI( TSelf(wxWindow) _obj );
+TBool      wxWindow_Validate( TSelf(wxWindow) _obj );
+void       wxWindow_WarpPointer( TSelf(wxWindow) _obj, TPoint(x,y) );
+
+/* wxWindowCreateEvent */
+TClassDefExtend(wxWindowCreateEvent,wxCommandEvent)
+TClass(wxWindow) wxWindowCreateEvent_GetWindow( TSelf(wxWindowCreateEvent) _obj );
+
+/* wxWindowDC */
+TClassDefExtend(wxWindowDC,wxDC)
+TClass(wxWindowDC) wxWindowDC_Create( TClass(wxWindow) win );
+void       wxWindowDC_Delete( TSelf(wxWindowDC) _obj );
+
+/* wxWindowDestroyEvent */
+TClassDefExtend(wxWindowDestroyEvent,wxCommandEvent)
+TClass(wxWindow) wxWindowDestroyEvent_GetWindow( TSelf(wxWindowDestroyEvent) _obj );
+
+/* wxWindowDisabler */
+TClassDef(wxWindowDisabler)
+
+/* wxWizard */
+TClassDefExtend(wxWizard,wxDialog)
+void       wxWizard_Chain( TClass(wxWizardPageSimple) f, TClass(wxWizardPageSimple) s );
+TClass(wxWizard) wxWizard_Create( TClass(wxWindow) _prt, int _id, TStringVoid _txt, TClass(wxBitmap) _bmp, TRect(_lft,_top,_wdt,_hgt) );
+TClass(wxWizardPage) wxWizard_GetCurrentPage( TSelf(wxWizard) _obj );
+void       wxWizard_GetPageSize( TSelf(wxWizard) _obj, TSizeOutVoid(_w,_h) );
+int        wxWizard_RunWizard( TSelf(wxWizard) _obj, TClass(wxWizardPage) firstPage );
+void       wxWizard_SetPageSize( TSelf(wxWizard) _obj, TSize(w,h) );
+
+/* wxWizardEvent */
+TClassDefExtend(wxWizardEvent,wxNotifyEvent)
+int        wxWizardEvent_GetDirection( TSelf(wxWizardEvent) _obj );
+
+/* wxWizardPage */
+TClassDefExtend(wxWizardPage,wxPanel)
+
+/* wxWizardPageSimple */
+TClassDefExtend(wxWizardPageSimple,wxWizardPage)
+TClass(wxWizardPageSimple) wxWizardPageSimple_Create( TClass(wxWizard) _prt );
+void       wxWizardPageSimple_GetBitmap( TSelf(wxWizardPageSimple) _obj, TClassRef(wxBitmap) _ref );
+TClass(wxWizardPageSimple) wxWizardPageSimple_GetNext( TSelf(wxWizardPageSimple) _obj );
+TClass(wxWizardPageSimple) wxWizardPageSimple_GetPrev( TSelf(wxWizardPageSimple) _obj );
+void       wxWizardPageSimple_SetNext( TSelf(wxWizardPageSimple) _obj, TClass(wxWizardPageSimple) next );
+void       wxWizardPageSimple_SetPrev( TSelf(wxWizardPageSimple) _obj, TClass(wxWizardPageSimple) prev );
+
+/* wxXmlResource */
+TClassDefExtend(wxXmlResource,wxObject)
+void       wxXmlResource_AddHandler( TSelf(wxXmlResource) _obj, TClass(wxEvtHandler) handler );
+void       wxXmlResource_AddSubclassFactory( TSelf(wxXmlResource) _obj, void* factory );
+int        wxXmlResource_AttachUnknownControl( TSelf(wxXmlResource) _obj, TStringVoid name, TClass(wxControl) control, TClass(wxWindow) parent );
+void       wxXmlResource_ClearHandlers( TSelf(wxXmlResource) _obj );
+int        wxXmlResource_CompareVersion( TSelf(wxXmlResource) _obj, int major, int minor, int release, int revision );
+TClass(wxXmlResource) wxXmlResource_Create( void* _obj, int flags );
+TClass(wxXmlResource) wxXmlResource_CreateFromFile( TSelf(wxXmlResource) _obj, void* filemask, int flags );
+void       wxXmlResource_Delete( TSelf(wxXmlResource) _obj );
+void*      wxXmlResource_Get(  );
+int        wxXmlResource_GetFlags( TSelf(wxXmlResource) _obj );
+long       wxXmlResource_GetVersion( TSelf(wxXmlResource) _obj );
+int        wxXmlResource_GetXRCID( TSelf(wxXmlResource) str_id );
+void       wxXmlResource_InitAllHandlers( TSelf(wxXmlResource) _obj );
+int        wxXmlResource_InitializeObject( TSelf(wxXmlResource) _obj, void* _inst, TClass(wxWindow) parent, TStringVoid name, void* classname );
+void       wxXmlResource_InsertHandler( TSelf(wxXmlResource) _obj, TClass(wxEvtHandler) handler );
+int        wxXmlResource_Load( TSelf(wxXmlResource) _obj, void* filemask );
+void       wxXmlResource_LoadBitmap( TSelf(wxXmlResource) _obj, TStringVoid name, TClassRef(wxBitmap) _ref );
+void*      wxXmlResource_LoadDialog( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
+void*      wxXmlResource_LoadFrame( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
+void       wxXmlResource_LoadIcon( TSelf(wxXmlResource) _obj, TStringVoid name, TClassRef(wxIcon) _ref );
+void*      wxXmlResource_LoadMenu( TSelf(wxXmlResource) _obj, TStringVoid name );
+void*      wxXmlResource_LoadMenuBar( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
+void*      wxXmlResource_LoadObject( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name, void* classname );
+void*      wxXmlResource_LoadPanel( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
+void*      wxXmlResource_LoadToolBar( TSelf(wxXmlResource) _obj, TClass(wxWindow) parent, TStringVoid name );
+void*      wxXmlResource_Set( TSelf(wxXmlResource) res );
+void       wxXmlResource_SetFlags( TSelf(wxXmlResource) _obj, int flags );
+
+/* wxXmlResourceHandler */
+TClassDefExtend(wxXmlResourceHandler,wxObject)
+
+/* wxZipInputStream */
+TClassDefExtend(wxZipInputStream,wxInputStream)
+
+/* wxZlibInputStream */
+TClassDefExtend(wxZlibInputStream,wxFilterInputStream)
+
+/* wxZlibOutputStream */
+TClassDefExtend(wxZlibOutputStream,wxFilterOutputStream)
+
+
+#endif /* WXC_GLUE_H */
+
diff --git a/wxc/include/wxc_types.h b/wxc/include/wxc_types.h
new file mode 100644
--- /dev/null
+++ b/wxc/include/wxc_types.h
@@ -0,0 +1,145 @@
+#ifndef WXC_TYPES_H
+#define WXC_TYPES_H
+
+/* Types: we use standard pre-processor definitions to add more
+   type information to the C signatures. These 'types' can be
+   either read by other tools to automatically generate a marshalling
+   layer for foreign languages, or you can define the macros in such
+   a way that they contain more type information while compiling the
+   library itself. 
+   
+   All macros start with "T" to avoid clashes with other libraries. 
+*/
+#undef TClassDef
+#undef TClassDefExtend
+#undef TChar
+#undef TBool
+#undef TBoolInt
+#undef TClass
+#undef TSelf
+#undef TClassRef      
+#undef TClosureFun
+#undef TString
+#undef TStringVoid
+#undef TStringOut
+#undef TStringOutVoid
+#undef TStringLen
+#undef TPoint
+#undef TPointLong
+#undef TPointOut
+#undef TPointOutVoid
+#undef TSize
+#undef TSizeOut
+#undef TSizeOutVoid
+#undef TVector
+#undef TVectorOut
+#undef TVectorOutVoid
+#undef TRect
+#undef TRectOut
+#undef TRectOutVoid
+#undef TArrayString
+#undef TArrayInt
+#undef TArrayObject
+#undef TArrayLen
+#undef TArrayIntOut
+#undef TArrayIntOutVoid
+#undef TArrayStringOut
+#undef TArrayStringOutVoid
+#undef TArrayObjectOut
+#undef TArrayObjectOutVoid
+#undef TColorRGB
+
+/* Class definitions */
+#define TClassDef(tp)     
+#define TClassDefExtend(tp,parent)
+
+/* Types that can be 'untyped' or C++ typed */
+#ifdef WXC_USE_TYPED_INTERFACE
+# define TClass(tp)     tp*
+# define TBool          bool
+# define TClosureFun    ClosureFun
+#else
+# define TClass(tp)     void*
+# define TBool          int
+# define TClosureFun    void*
+#endif
+
+/* basic types */
+#ifdef wxUSE_UNICODE
+#define TChar             wchar_t
+#else
+#define TChar             char
+#endif
+
+/* boolean as int */
+#define TBoolInt          int
+
+/* classes. 
+   "Ref" is used for classes assigned by reference.
+   "Self" is used for the 'this' or 'self' pointer.
+*/
+#define TSelf(tp)         TClass(tp)
+#define TClassRef(tp)     TClass(tp)
+
+/* strings */
+#define TString           TChar*
+#define TStringOut        TChar*
+#define TStringLen        int
+
+/* structures */
+#define TPoint(x,y)       int x,  int y
+#define TPointOut(x,y)    int* x, int* y
+#define TVector(x,y)      int x,  int y
+#define TVectorOut(x,y)   int* x, int* y
+#define TSize(w,h)        int w,  int h
+#define TSizeOut(w,h)     int* w, int* h
+#define TRect(x,y,w,h)    int x,  int y,  int w,  int h
+#define TRectOut(x,y,w,h) int* x, int* y, int* w, int* h
+#define TColorRGB(r,g,b)  char r, char g, char b
+
+/* arrays */
+#define TArrayLen               int
+#define TArrayIntOut            intptr_t*
+#define TArrayStringOut         TString*
+#define TArrayObjectOut(tp)     TClass(tp)*
+
+#define TArrayString(n,p)       int n, TString* p
+#define TArrayInt(n,p)          int n, int* p
+#define TArrayObject(n,tp,p)    int n, TClass(tp)* p
+
+/* Define "Void" variants for void* declared signatures.
+   we only use this for compatibility with the original ewxw_glue.h */
+#ifdef WXC_USE_TYPED_INTERFACE
+# define TStringVoid             TString
+# define TStringOutVoid          TStringOut
+# define TPointOutVoid(x,y)      TPointOut(x,y)
+# define TVectorOutVoid(x,y)     TVectorOut(x,y)
+# define TSizeOutVoid(w,h)       TSizeOut(w,h)
+# define TRectOutVoid(x,y,w,h)   TRectOut(x,y,w,h)
+# define TArrayIntOutVoid        TArrayIntOut
+# define TArrayStringOutVoid     TArrayStringOut
+# define TArrayObjectOutVoid(tp) TArrayObjectOut(tp)
+#else
+# define TStringVoid           void*
+# define TStringOutVoid        void*
+# define TPointOutVoid(x,y)    void* x, void* y
+# define TVectorOutVoid(x,y)   void* x, void* y
+# define TSizeOutVoid(w,h)     void* w, void* h
+# define TRectOutVoid(x,y,w,h) void* x, void* y, void* w, void* h
+# define TArrayIntOutVoid        void*
+# define TArrayStringOutVoid     void*
+# define TArrayObjectOutVoid(tp) void*
+#endif
+
+/* Define "Long" variants for long declared signatures.
+   we only use this for compatibility with the original ewxw_glue.h */
+#define TPointLong(x,y)       long x,  long y
+#define TPointOutLong(x,y)    long* x, long* y
+#define TVectorLong(x,y)      long x,  long y
+#define TVectorOutLong(x,y)   long* x, long* y
+#define TSizeLong(w,h)        long w,  long h
+#define TSizeOutLong(w,h)     long* w, long* h
+#define TRectLong(x,y,w,h)    long x,  long y,  long w,  long h
+#define TRectOutLong(x,y,w,h) long* x, long* y, long* w, long* h
+
+#endif /* WXC_TYPES_H */
diff --git a/wxc/src/Scintilla.h b/wxc/src/Scintilla.h
new file mode 100644
--- /dev/null
+++ b/wxc/src/Scintilla.h
@@ -0,0 +1,619 @@
+// Scintilla source code edit control
+/** @file Scintilla.h
+ ** Interface to the edit control.
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// Most of this file is automatically generated from the Scintilla.iface interface definition
+// file which contains any comments about the definitions. HFacer.py does the generation.
+
+#ifndef SCINTILLA_H
+#define SCINTILLA_H
+
+#if PLAT_WIN
+// Return false on failure:
+bool Scintilla_RegisterClasses(void *hInstance);
+bool Scintilla_ReleaseResources();
+#endif
+int Scintilla_LinkLexers();
+
+// Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
+// hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
+// May need to be changed for 64 bit platforms.
+#ifdef __int3264
+typedef ULONG_PTR uptr_t;
+typedef LONG_PTR sptr_t;
+#else
+typedef unsigned long uptr_t;
+typedef long sptr_t;
+#endif
+
+typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+#define INVALID_POSITION -1
+#define SCI_START 2000
+#define SCI_OPTIONAL_START 3000
+#define SCI_LEXER_START 4000
+#define SCI_ADDTEXT 2001
+#define SCI_ADDSTYLEDTEXT 2002
+#define SCI_INSERTTEXT 2003
+#define SCI_CLEARALL 2004
+#define SCI_CLEARDOCUMENTSTYLE 2005
+#define SCI_GETLENGTH 2006
+#define SCI_GETCHARAT 2007
+#define SCI_GETCURRENTPOS 2008
+#define SCI_GETANCHOR 2009
+#define SCI_GETSTYLEAT 2010
+#define SCI_REDO 2011
+#define SCI_SETUNDOCOLLECTION 2012
+#define SCI_SELECTALL 2013
+#define SCI_SETSAVEPOINT 2014
+#define SCI_GETSTYLEDTEXT 2015
+#define SCI_CANREDO 2016
+#define SCI_MARKERLINEFROMHANDLE 2017
+#define SCI_MARKERDELETEHANDLE 2018
+#define SCI_GETUNDOCOLLECTION 2019
+#define SCWS_INVISIBLE 0
+#define SCWS_VISIBLEALWAYS 1
+#define SCWS_VISIBLEAFTERINDENT 2
+#define SCI_GETVIEWWS 2020
+#define SCI_SETVIEWWS 2021
+#define SCI_POSITIONFROMPOINT 2022
+#define SCI_POSITIONFROMPOINTCLOSE 2023
+#define SCI_GOTOLINE 2024
+#define SCI_GOTOPOS 2025
+#define SCI_SETANCHOR 2026
+#define SCI_GETCURLINE 2027
+#define SCI_GETENDSTYLED 2028
+#define SC_EOL_CRLF 0
+#define SC_EOL_CR 1
+#define SC_EOL_LF 2
+#define SCI_CONVERTEOLS 2029
+#define SCI_GETEOLMODE 2030
+#define SCI_SETEOLMODE 2031
+#define SCI_STARTSTYLING 2032
+#define SCI_SETSTYLING 2033
+#define SCI_GETBUFFEREDDRAW 2034
+#define SCI_SETBUFFEREDDRAW 2035
+#define SCI_SETTABWIDTH 2036
+#define SCI_GETTABWIDTH 2121
+#define SC_CP_UTF8 65001
+#define SCI_SETCODEPAGE 2037
+#define SCI_SETUSEPALETTE 2039
+#define MARKER_MAX 31
+#define SC_MARK_CIRCLE 0
+#define SC_MARK_ROUNDRECT 1
+#define SC_MARK_ARROW 2
+#define SC_MARK_SMALLRECT 3
+#define SC_MARK_SHORTARROW 4
+#define SC_MARK_EMPTY 5
+#define SC_MARK_ARROWDOWN 6
+#define SC_MARK_MINUS 7
+#define SC_MARK_PLUS 8
+#define SC_MARK_VLINE 9
+#define SC_MARK_LCORNER 10
+#define SC_MARK_TCORNER 11
+#define SC_MARK_BOXPLUS 12
+#define SC_MARK_BOXPLUSCONNECTED 13
+#define SC_MARK_BOXMINUS 14
+#define SC_MARK_BOXMINUSCONNECTED 15
+#define SC_MARK_LCORNERCURVE 16
+#define SC_MARK_TCORNERCURVE 17
+#define SC_MARK_CIRCLEPLUS 18
+#define SC_MARK_CIRCLEPLUSCONNECTED 19
+#define SC_MARK_CIRCLEMINUS 20
+#define SC_MARK_CIRCLEMINUSCONNECTED 21
+#define SC_MARK_BACKGROUND 22
+#define SC_MARK_CHARACTER 10000
+#define SC_MARKNUM_FOLDEREND 25
+#define SC_MARKNUM_FOLDEROPENMID 26
+#define SC_MARKNUM_FOLDERMIDTAIL 27
+#define SC_MARKNUM_FOLDERTAIL 28
+#define SC_MARKNUM_FOLDERSUB 29
+#define SC_MARKNUM_FOLDER 30
+#define SC_MARKNUM_FOLDEROPEN 31
+#define SC_MASK_FOLDERS 0xFE000000
+#define SCI_MARKERDEFINE 2040
+#define SCI_MARKERSETFORE 2041
+#define SCI_MARKERSETBACK 2042
+#define SCI_MARKERADD 2043
+#define SCI_MARKERDELETE 2044
+#define SCI_MARKERDELETEALL 2045
+#define SCI_MARKERGET 2046
+#define SCI_MARKERNEXT 2047
+#define SCI_MARKERPREVIOUS 2048
+#define SC_MARGIN_SYMBOL 0
+#define SC_MARGIN_NUMBER 1
+#define SCI_SETMARGINTYPEN 2240
+#define SCI_GETMARGINTYPEN 2241
+#define SCI_SETMARGINWIDTHN 2242
+#define SCI_GETMARGINWIDTHN 2243
+#define SCI_SETMARGINMASKN 2244
+#define SCI_GETMARGINMASKN 2245
+#define SCI_SETMARGINSENSITIVEN 2246
+#define SCI_GETMARGINSENSITIVEN 2247
+#define STYLE_DEFAULT 32
+#define STYLE_LINENUMBER 33
+#define STYLE_BRACELIGHT 34
+#define STYLE_BRACEBAD 35
+#define STYLE_CONTROLCHAR 36
+#define STYLE_INDENTGUIDE 37
+#define STYLE_LASTPREDEFINED 39
+#define STYLE_MAX 127
+#define SC_CHARSET_ANSI 0
+#define SC_CHARSET_DEFAULT 1
+#define SC_CHARSET_BALTIC 186
+#define SC_CHARSET_CHINESEBIG5 136
+#define SC_CHARSET_EASTEUROPE 238
+#define SC_CHARSET_GB2312 134
+#define SC_CHARSET_GREEK 161
+#define SC_CHARSET_HANGUL 129
+#define SC_CHARSET_MAC 77
+#define SC_CHARSET_OEM 255
+#define SC_CHARSET_RUSSIAN 204
+#define SC_CHARSET_SHIFTJIS 128
+#define SC_CHARSET_SYMBOL 2
+#define SC_CHARSET_TURKISH 162
+#define SC_CHARSET_JOHAB 130
+#define SC_CHARSET_HEBREW 177
+#define SC_CHARSET_ARABIC 178
+#define SC_CHARSET_VIETNAMESE 163
+#define SC_CHARSET_THAI 222
+#define SCI_STYLECLEARALL 2050
+#define SCI_STYLESETFORE 2051
+#define SCI_STYLESETBACK 2052
+#define SCI_STYLESETBOLD 2053
+#define SCI_STYLESETITALIC 2054
+#define SCI_STYLESETSIZE 2055
+#define SCI_STYLESETFONT 2056
+#define SCI_STYLESETEOLFILLED 2057
+#define SCI_STYLERESETDEFAULT 2058
+#define SCI_STYLESETUNDERLINE 2059
+#define SC_CASE_MIXED 0
+#define SC_CASE_UPPER 1
+#define SC_CASE_LOWER 2
+#define SCI_STYLESETCASE 2060
+#define SCI_STYLESETCHARACTERSET 2066
+#define SCI_SETSELFORE 2067
+#define SCI_SETSELBACK 2068
+#define SCI_SETCARETFORE 2069
+#define SCI_ASSIGNCMDKEY 2070
+#define SCI_CLEARCMDKEY 2071
+#define SCI_CLEARALLCMDKEYS 2072
+#define SCI_SETSTYLINGEX 2073
+#define SCI_STYLESETVISIBLE 2074
+#define SCI_GETCARETPERIOD 2075
+#define SCI_SETCARETPERIOD 2076
+#define SCI_SETWORDCHARS 2077
+#define SCI_BEGINUNDOACTION 2078
+#define SCI_ENDUNDOACTION 2079
+#define INDIC_MAX 7
+#define INDIC_PLAIN 0
+#define INDIC_SQUIGGLE 1
+#define INDIC_TT 2
+#define INDIC_DIAGONAL 3
+#define INDIC_STRIKE 4
+#define INDIC0_MASK 0x20
+#define INDIC1_MASK 0x40
+#define INDIC2_MASK 0x80
+#define INDICS_MASK 0xE0
+#define SCI_INDICSETSTYLE 2080
+#define SCI_INDICGETSTYLE 2081
+#define SCI_INDICSETFORE 2082
+#define SCI_INDICGETFORE 2083
+#define SCI_SETSTYLEBITS 2090
+#define SCI_GETSTYLEBITS 2091
+#define SCI_SETLINESTATE 2092
+#define SCI_GETLINESTATE 2093
+#define SCI_GETMAXLINESTATE 2094
+#define SCI_GETCARETLINEVISIBLE 2095
+#define SCI_SETCARETLINEVISIBLE 2096
+#define SCI_GETCARETLINEBACK 2097
+#define SCI_SETCARETLINEBACK 2098
+#define SCI_STYLESETCHANGEABLE 2099
+#define SCI_AUTOCSHOW 2100
+#define SCI_AUTOCCANCEL 2101
+#define SCI_AUTOCACTIVE 2102
+#define SCI_AUTOCPOSSTART 2103
+#define SCI_AUTOCCOMPLETE 2104
+#define SCI_AUTOCSTOPS 2105
+#define SCI_AUTOCSETSEPARATOR 2106
+#define SCI_AUTOCGETSEPARATOR 2107
+#define SCI_AUTOCSELECT 2108
+#define SCI_AUTOCSETCANCELATSTART 2110
+#define SCI_AUTOCGETCANCELATSTART 2111
+#define SCI_AUTOCSETFILLUPS 2112
+#define SCI_AUTOCSETCHOOSESINGLE 2113
+#define SCI_AUTOCGETCHOOSESINGLE 2114
+#define SCI_AUTOCSETIGNORECASE 2115
+#define SCI_AUTOCGETIGNORECASE 2116
+#define SCI_USERLISTSHOW 2117
+#define SCI_AUTOCSETAUTOHIDE 2118
+#define SCI_AUTOCGETAUTOHIDE 2119
+#define SCI_AUTOCSETDROPRESTOFWORD 2270
+#define SCI_AUTOCGETDROPRESTOFWORD 2271
+#define SCI_SETINDENT 2122
+#define SCI_GETINDENT 2123
+#define SCI_SETUSETABS 2124
+#define SCI_GETUSETABS 2125
+#define SCI_SETLINEINDENTATION 2126
+#define SCI_GETLINEINDENTATION 2127
+#define SCI_GETLINEINDENTPOSITION 2128
+#define SCI_GETCOLUMN 2129
+#define SCI_SETHSCROLLBAR 2130
+#define SCI_GETHSCROLLBAR 2131
+#define SCI_SETINDENTATIONGUIDES 2132
+#define SCI_GETINDENTATIONGUIDES 2133
+#define SCI_SETHIGHLIGHTGUIDE 2134
+#define SCI_GETHIGHLIGHTGUIDE 2135
+#define SCI_GETLINEENDPOSITION 2136
+#define SCI_GETCODEPAGE 2137
+#define SCI_GETCARETFORE 2138
+#define SCI_GETUSEPALETTE 2139
+#define SCI_GETREADONLY 2140
+#define SCI_SETCURRENTPOS 2141
+#define SCI_SETSELECTIONSTART 2142
+#define SCI_GETSELECTIONSTART 2143
+#define SCI_SETSELECTIONEND 2144
+#define SCI_GETSELECTIONEND 2145
+#define SCI_SETPRINTMAGNIFICATION 2146
+#define SCI_GETPRINTMAGNIFICATION 2147
+#define SC_PRINT_NORMAL 0
+#define SC_PRINT_INVERTLIGHT 1
+#define SC_PRINT_BLACKONWHITE 2
+#define SC_PRINT_COLOURONWHITE 3
+#define SC_PRINT_COLOURONWHITEDEFAULTBG 4
+#define SCI_SETPRINTCOLOURMODE 2148
+#define SCI_GETPRINTCOLOURMODE 2149
+#define SCFIND_WHOLEWORD 2
+#define SCFIND_MATCHCASE 4
+#define SCFIND_WORDSTART 0x00100000
+#define SCFIND_REGEXP 0x00200000
+#define SCI_FINDTEXT 2150
+#define SCI_FORMATRANGE 2151
+#define SCI_GETFIRSTVISIBLELINE 2152
+#define SCI_GETLINE 2153
+#define SCI_GETLINECOUNT 2154
+#define SCI_SETMARGINLEFT 2155
+#define SCI_GETMARGINLEFT 2156
+#define SCI_SETMARGINRIGHT 2157
+#define SCI_GETMARGINRIGHT 2158
+#define SCI_GETMODIFY 2159
+#define SCI_SETSEL 2160
+#define SCI_GETSELTEXT 2161
+#define SCI_GETTEXTRANGE 2162
+#define SCI_HIDESELECTION 2163
+#define SCI_POINTXFROMPOSITION 2164
+#define SCI_POINTYFROMPOSITION 2165
+#define SCI_LINEFROMPOSITION 2166
+#define SCI_POSITIONFROMLINE 2167
+#define SCI_LINESCROLL 2168
+#define SCI_SCROLLCARET 2169
+#define SCI_REPLACESEL 2170
+#define SCI_SETREADONLY 2171
+#define SCI_NULL 2172
+#define SCI_CANPASTE 2173
+#define SCI_CANUNDO 2174
+#define SCI_EMPTYUNDOBUFFER 2175
+#define SCI_UNDO 2176
+#define SCI_CUT 2177
+#define SCI_COPY 2178
+#define SCI_PASTE 2179
+#define SCI_CLEAR 2180
+#define SCI_SETTEXT 2181
+#define SCI_GETTEXT 2182
+#define SCI_GETTEXTLENGTH 2183
+#define SCI_GETDIRECTFUNCTION 2184
+#define SCI_GETDIRECTPOINTER 2185
+#define SCI_SETOVERTYPE 2186
+#define SCI_GETOVERTYPE 2187
+#define SCI_SETCARETWIDTH 2188
+#define SCI_GETCARETWIDTH 2189
+#define SCI_SETTARGETSTART 2190
+#define SCI_GETTARGETSTART 2191
+#define SCI_SETTARGETEND 2192
+#define SCI_GETTARGETEND 2193
+#define SCI_REPLACETARGET 2194
+#define SCI_REPLACETARGETRE 2195
+#define SCI_SEARCHINTARGET 2197
+#define SCI_SETSEARCHFLAGS 2198
+#define SCI_GETSEARCHFLAGS 2199
+#define SCI_CALLTIPSHOW 2200
+#define SCI_CALLTIPCANCEL 2201
+#define SCI_CALLTIPACTIVE 2202
+#define SCI_CALLTIPPOSSTART 2203
+#define SCI_CALLTIPSETHLT 2204
+#define SCI_CALLTIPSETBACK 2205
+#define SCI_VISIBLEFROMDOCLINE 2220
+#define SCI_DOCLINEFROMVISIBLE 2221
+#define SC_FOLDLEVELBASE 0x400
+#define SC_FOLDLEVELWHITEFLAG 0x1000
+#define SC_FOLDLEVELHEADERFLAG 0x2000
+#define SC_FOLDLEVELNUMBERMASK 0x0FFF
+#define SCI_SETFOLDLEVEL 2222
+#define SCI_GETFOLDLEVEL 2223
+#define SCI_GETLASTCHILD 2224
+#define SCI_GETFOLDPARENT 2225
+#define SCI_SHOWLINES 2226
+#define SCI_HIDELINES 2227
+#define SCI_GETLINEVISIBLE 2228
+#define SCI_SETFOLDEXPANDED 2229
+#define SCI_GETFOLDEXPANDED 2230
+#define SCI_TOGGLEFOLD 2231
+#define SCI_ENSUREVISIBLE 2232
+#define SCI_SETFOLDFLAGS 2233
+#define SCI_ENSUREVISIBLEENFORCEPOLICY 2234
+#define SCI_SETTABINDENTS 2260
+#define SCI_GETTABINDENTS 2261
+#define SCI_SETBACKSPACEUNINDENTS 2262
+#define SCI_GETBACKSPACEUNINDENTS 2263
+#define SC_TIME_FOREVER 10000000
+#define SCI_SETMOUSEDWELLTIME 2264
+#define SCI_GETMOUSEDWELLTIME 2265
+#define SCI_WORDSTARTPOSITION 2266
+#define SCI_WORDENDPOSITION 2267
+#define SC_WRAP_NONE 0
+#define SC_WRAP_WORD 1
+#define SCI_SETWRAPMODE 2268
+#define SCI_GETWRAPMODE 2269
+#define SC_CACHE_NONE 0
+#define SC_CACHE_CARET 1
+#define SC_CACHE_PAGE 2
+#define SC_CACHE_DOCUMENT 3
+#define SCI_SETLAYOUTCACHE 2272
+#define SCI_GETLAYOUTCACHE 2273
+#define SCI_SETSCROLLWIDTH 2274
+#define SCI_GETSCROLLWIDTH 2275
+#define SCI_TEXTWIDTH 2276
+#define SCI_SETENDATLASTLINE 2277
+#define SCI_GETENDATLASTLINE 2278
+#define SCI_LINEDOWN 2300
+#define SCI_LINEDOWNEXTEND 2301
+#define SCI_LINEUP 2302
+#define SCI_LINEUPEXTEND 2303
+#define SCI_CHARLEFT 2304
+#define SCI_CHARLEFTEXTEND 2305
+#define SCI_CHARRIGHT 2306
+#define SCI_CHARRIGHTEXTEND 2307
+#define SCI_WORDLEFT 2308
+#define SCI_WORDLEFTEXTEND 2309
+#define SCI_WORDRIGHT 2310
+#define SCI_WORDRIGHTEXTEND 2311
+#define SCI_HOME 2312
+#define SCI_HOMEEXTEND 2313
+#define SCI_LINEEND 2314
+#define SCI_LINEENDEXTEND 2315
+#define SCI_DOCUMENTSTART 2316
+#define SCI_DOCUMENTSTARTEXTEND 2317
+#define SCI_DOCUMENTEND 2318
+#define SCI_DOCUMENTENDEXTEND 2319
+#define SCI_PAGEUP 2320
+#define SCI_PAGEUPEXTEND 2321
+#define SCI_PAGEDOWN 2322
+#define SCI_PAGEDOWNEXTEND 2323
+#define SCI_EDITTOGGLEOVERTYPE 2324
+#define SCI_CANCEL 2325
+#define SCI_DELETEBACK 2326
+#define SCI_TAB 2327
+#define SCI_BACKTAB 2328
+#define SCI_NEWLINE 2329
+#define SCI_FORMFEED 2330
+#define SCI_VCHOME 2331
+#define SCI_VCHOMEEXTEND 2332
+#define SCI_ZOOMIN 2333
+#define SCI_ZOOMOUT 2334
+#define SCI_DELWORDLEFT 2335
+#define SCI_DELWORDRIGHT 2336
+#define SCI_LINECUT 2337
+#define SCI_LINEDELETE 2338
+#define SCI_LINETRANSPOSE 2339
+#define SCI_LOWERCASE 2340
+#define SCI_UPPERCASE 2341
+#define SCI_LINESCROLLDOWN 2342
+#define SCI_LINESCROLLUP 2343
+#define SCI_DELETEBACKNOTLINE 2344
+#define SCI_MOVECARETINSIDEVIEW 2401
+#define SCI_LINELENGTH 2350
+#define SCI_BRACEHIGHLIGHT 2351
+#define SCI_BRACEBADLIGHT 2352
+#define SCI_BRACEMATCH 2353
+#define SCI_GETVIEWEOL 2355
+#define SCI_SETVIEWEOL 2356
+#define SCI_GETDOCPOINTER 2357
+#define SCI_SETDOCPOINTER 2358
+#define SCI_SETMODEVENTMASK 2359
+#define EDGE_NONE 0
+#define EDGE_LINE 1
+#define EDGE_BACKGROUND 2
+#define SCI_GETEDGECOLUMN 2360
+#define SCI_SETEDGECOLUMN 2361
+#define SCI_GETEDGEMODE 2362
+#define SCI_SETEDGEMODE 2363
+#define SCI_GETEDGECOLOUR 2364
+#define SCI_SETEDGECOLOUR 2365
+#define SCI_SEARCHANCHOR 2366
+#define SCI_SEARCHNEXT 2367
+#define SCI_SEARCHPREV 2368
+#define CARET_SLOP 0x01
+#define CARET_CENTER 0x02
+#define CARET_STRICT 0x04
+#define CARET_XEVEN 0x08
+#define CARET_XJUMPS 0x10
+#define SCI_SETCARETPOLICY 2369
+#define SCI_LINESONSCREEN 2370
+#define SCI_USEPOPUP 2371
+#define SCI_SELECTIONISRECTANGLE 2372
+#define SCI_SETZOOM 2373
+#define SCI_GETZOOM 2374
+#define SCI_CREATEDOCUMENT 2375
+#define SCI_ADDREFDOCUMENT 2376
+#define SCI_RELEASEDOCUMENT 2377
+#define SCI_GETMODEVENTMASK 2378
+#define SCI_SETFOCUS 2380
+#define SCI_GETFOCUS 2381
+#define SCI_SETSTATUS 2382
+#define SCI_GETSTATUS 2383
+#define SCI_SETMOUSEDOWNCAPTURES 2384
+#define SCI_GETMOUSEDOWNCAPTURES 2385
+#define SC_CURSORNORMAL -1
+#define SC_CURSORWAIT 3
+#define SCI_SETCURSOR 2386
+#define SCI_GETCURSOR 2387
+#define SCI_SETCONTROLCHARSYMBOL 2388
+#define SCI_GETCONTROLCHARSYMBOL 2389
+#define SCI_WORDPARTLEFT 2390
+#define SCI_WORDPARTLEFTEXTEND 2391
+#define SCI_WORDPARTRIGHT 2392
+#define SCI_WORDPARTRIGHTEXTEND 2393
+#define VISIBLE_SLOP 0x01
+#define VISIBLE_STRICT 0x04
+#define SCI_SETVISIBLEPOLICY 2394
+#define SCI_DELLINELEFT 2395
+#define SCI_DELLINERIGHT 2396
+#define SCI_SETXOFFSET 2397
+#define SCI_GETXOFFSET 2398
+#define SCI_GRABFOCUS 2400
+#define SCI_STARTRECORD 3001
+#define SCI_STOPRECORD 3002
+#define SCI_SETLEXER 4001
+#define SCI_GETLEXER 4002
+#define SCI_COLOURISE 4003
+#define SCI_SETPROPERTY 4004
+#define SCI_SETKEYWORDS 4005
+#define SCI_SETLEXERLANGUAGE 4006
+#define SC_MOD_INSERTTEXT 0x1
+#define SC_MOD_DELETETEXT 0x2
+#define SC_MOD_CHANGESTYLE 0x4
+#define SC_MOD_CHANGEFOLD 0x8
+#define SC_PERFORMED_USER 0x10
+#define SC_PERFORMED_UNDO 0x20
+#define SC_PERFORMED_REDO 0x40
+#define SC_LASTSTEPINUNDOREDO 0x100
+#define SC_MOD_CHANGEMARKER 0x200
+#define SC_MOD_BEFOREINSERT 0x400
+#define SC_MOD_BEFOREDELETE 0x800
+#define SC_MODEVENTMASKALL 0xF77
+#define SCEN_CHANGE 768
+#define SCEN_SETFOCUS 512
+#define SCEN_KILLFOCUS 256
+#define SCK_DOWN 300
+#define SCK_UP 301
+#define SCK_LEFT 302
+#define SCK_RIGHT 303
+#define SCK_HOME 304
+#define SCK_END 305
+#define SCK_PRIOR 306
+#define SCK_NEXT 307
+#define SCK_DELETE 308
+#define SCK_INSERT 309
+#define SCK_ESCAPE 7
+#define SCK_BACK 8
+#define SCK_TAB 9
+#define SCK_RETURN 13
+#define SCK_ADD 310
+#define SCK_SUBTRACT 311
+#define SCK_DIVIDE 312
+#define KeyMod SCMOD_
+#define SCMOD_SHIFT 1
+#define SCMOD_CTRL 2
+#define SCMOD_ALT 4
+#define Lexer SCLEX_
+#define SCN_STYLENEEDED 2000
+#define SCN_CHARADDED 2001
+#define SCN_SAVEPOINTREACHED 2002
+#define SCN_SAVEPOINTLEFT 2003
+#define SCN_MODIFYATTEMPTRO 2004
+#define SCN_KEY 2005
+#define SCN_DOUBLECLICK 2006
+#define SCN_UPDATEUI 2007
+#define SCN_MODIFIED 2008
+#define SCN_MACRORECORD 2009
+#define SCN_MARGINCLICK 2010
+#define SCN_NEEDSHOWN 2011
+#define SCN_PAINTED 2013
+#define SCN_USERLISTSELECTION 2014
+#define SCN_URIDROPPED 2015
+#define SCN_DWELLSTART 2016
+#define SCN_DWELLEND 2017
+#define SCN_ZOOM 2018
+//--Autogenerated -- end of section automatically generated from Scintilla.iface
+
+// These structures are defined to be exactly the same shape as the Win32
+// CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
+// So older code that treats Scintilla as a RichEdit will work.
+
+typedef struct _CharacterRange {
+	long cpMin;
+	long cpMax;
+}CharacterRange;
+
+typedef struct _TextRange {
+	CharacterRange chrg;
+	char *lpstrText;
+}TextRange;
+
+typedef struct _TextToFind {
+	CharacterRange chrg;
+	char *lpstrText;
+	CharacterRange chrgText;
+}TextToFind;
+
+#ifdef PLATFORM_H
+
+// This structure is used in printing and requires some of the graphics types
+// from Platform.h.  Not needed by most client code.
+
+typedef struct _RangeToFormat {
+	SurfaceID hdc;
+	SurfaceID hdcTarget;
+	PRectangle rc;
+	PRectangle rcPage;
+	CharacterRange chrg;
+}RangeToFormat;
+
+#endif
+
+typedef struct _NotifyHeader {
+	// hwndFrom is really an environment specifc window handle or pointer
+	// but most clients of Scintilla.h do not have this type visible.
+	//WindowID hwndFrom;
+	void *hwndFrom;
+	unsigned int idFrom;
+	unsigned int code;
+}NotifyHeader;
+
+typedef struct _SCNotification {
+	struct _NotifyHeader nmhdr;
+	int position;	// SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
+	int ch;		// SCN_CHARADDED, SCN_KEY
+	int modifiers;	// SCN_KEY
+	int modificationType;	// SCN_MODIFIED
+	const char *text;	// SCN_MODIFIED
+	int length;		// SCN_MODIFIED
+	int linesAdded;	// SCN_MODIFIED
+	int message;	// SCN_MACRORECORD
+	uptr_t wParam;	// SCN_MACRORECORD
+	sptr_t lParam;	// SCN_MACRORECORD
+	int line;		// SCN_MODIFIED
+	int foldLevelNow;	// SCN_MODIFIED
+	int foldLevelPrev;	// SCN_MODIFIED
+	int margin;		// SCN_MARGINCLICK
+	int listType;	// SCN_USERLISTSELECTION
+	int x;			// SCN_DWELLSTART, SCN_DWELLEND
+	int y;		// SCN_DWELLSTART, SCN_DWELLEND
+}SCNotification;
+
+// Deprecation section listing all API features that are deprecated and will
+// will be removed completely in a future version.
+// To enable these features define INCLUDE_DEPRECATED_FEATURES
+
+#ifdef INCLUDE_DEPRECATED_FEATURES
+
+#define SCN_POSCHANGED 2012
+#define SCN_CHECKBRACE 2007
+
+#endif
+
+#endif
diff --git a/wxc/src/db.cpp b/wxc/src/db.cpp
--- a/wxc/src/db.cpp
+++ b/wxc/src/db.cpp
@@ -200,6 +200,9 @@
 {
 #ifdef wxUSE_ODBC
   switch (sqlType) {
+#if defined(wxUSE_UNICODE) && defined(SQL_WCHAR)
+    case SQL_WCHAR:     return SqlChar;
+#endif
     case SQL_CHAR:      return SqlChar;
     case SQL_NUMERIC:   return SqlNumeric;
     case SQL_DECIMAL:   return SqlDecimal;
@@ -213,6 +216,9 @@
     case SQL_TIME:      return SqlTime;
     case SQL_TIMESTAMP: return SqlTimeStamp;
 #endif
+#if defined(wxUSE_UNICODE) && defined(SQL_WVARCHAR)
+    case SQL_WVARCHAR:  return SqlVarChar;
+#endif
     case SQL_VARCHAR:   return SqlVarChar;
 #ifdef SQL_BIT
     case SQL_BIT:       return SqlBit;
@@ -236,7 +242,11 @@
 {
 #ifdef wxUSE_ODBC
   switch (sqlType) {
+#if defined(wxUSE_UNICODE) && defined(SQL_WCHAR)
+    case SqlChar      : return SQL_WCHAR;
+#else
     case SqlChar      : return SQL_CHAR;
+#endif
     case SqlNumeric   : return SQL_NUMERIC;
     case SqlDecimal   : return SQL_DECIMAL;
     case SqlInteger   : return SQL_INTEGER;
@@ -249,7 +259,11 @@
     case SqlTime      : return SQL_TIME;
     case SqlTimeStamp : return SQL_TIMESTAMP;
 #endif
+#if defined(wxUSE_UNICODE) && defined(SQL_WVARCHAR)
+    case SqlVarChar   : return SQL_WVARCHAR;
+#else
     case SqlVarChar   : return SQL_VARCHAR;
+#endif
 #ifdef SQL_BIT
     case SqlBit       : return SQL_BIT;
 #endif
@@ -1195,6 +1209,14 @@
     colInf[column].dbDataType = 0;
     switch (colInf[column].sqlDataType)
     {
+#ifndef wxUSE_UNICODE
+    #if defined(SQL_WVARCHAR)
+        case SQL_WVARCHAR:
+    #endif
+    #if defined(SQL_WCHAR)
+        case SQL_WCHAR:
+    #endif
+#endif
         case SQL_VARCHAR:
         case SQL_CHAR:
             colInf[column].dbDataType = DB_DATA_TYPE_VARCHAR;
diff --git a/wxc/src/eljaccelerator.cpp b/wxc/src/eljaccelerator.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljaccelerator.cpp
@@ -0,0 +1,55 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxAcceleratorEntry_Create)(int flags, int keyCode, int cmd)
+{
+	return (void*) new wxAcceleratorEntry(flags, keyCode, cmd);
+}
+
+EWXWEXPORT(void, wxAcceleratorEntry_Delete)(void* _obj)
+{
+	delete (wxAcceleratorEntry*)_obj;
+}
+
+EWXWEXPORT(void, wxAcceleratorEntry_Set)(void* _obj, int flags, int keyCode, int cmd)
+{
+	((wxAcceleratorEntry*)_obj)->Set(flags, keyCode, cmd);
+}
+	
+EWXWEXPORT(int, wxAcceleratorEntry_GetFlags)(void* _obj)
+{
+	return ((wxAcceleratorEntry*)_obj)->GetFlags();
+}
+	
+EWXWEXPORT(int, wxAcceleratorEntry_GetKeyCode)(void* _obj)
+{
+	return ((wxAcceleratorEntry*)_obj)->GetKeyCode();
+}
+	
+EWXWEXPORT(int, wxAcceleratorEntry_GetCommand)(void* _obj)
+{
+	return ((wxAcceleratorEntry*)_obj)->GetCommand();
+}
+	
+EWXWEXPORT(void*, wxAcceleratorTable_Create)(int n, void* entries)
+{
+	wxAcceleratorEntry* list = new wxAcceleratorEntry[n];
+	
+	for (int i = 0; i< n; i++)
+		list[i] = *(((wxAcceleratorEntry**)entries)[i]);
+	
+	wxAcceleratorTable* result = new wxAcceleratorTable(n, list);
+	
+	delete [] list;
+	
+	return (void*) result;
+}
+
+EWXWEXPORT(void, wxAcceleratorTable_Delete)(void* _obj)
+{
+	delete (wxAcceleratorEntry*)_obj;
+}
+
+}
diff --git a/wxc/src/eljartprov.cpp b/wxc/src/eljartprov.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljartprov.cpp
@@ -0,0 +1,65 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+#include "wx/artprov.h"
+
+extern "C"
+{
+typedef void* _cdecl (*TCreateBmp)(void* _obj, void* id, void* clt, int w, int h);
+}
+
+
+class ELJArtProv: public wxArtProvider
+{
+	private:
+		void* EiffelObject;
+		TCreateBmp cb;
+	protected:
+    	virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)
+		{
+			if (EiffelObject)
+			{
+				void* res = cb (EiffelObject, (void*)id.c_str(), (void*)client.c_str(), size.GetWidth(), size.GetHeight());
+				
+				if (res)
+					return (*((wxBitmap*)res));
+				else
+					return wxNullBitmap;
+			}
+			return wxNullBitmap;
+		}
+	public:
+		ELJArtProv (void* obj, void* clb){EiffelObject = obj; cb = (TCreateBmp)clb;};
+		void Release(){EiffelObject = NULL; cb = NULL;};
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*,ELJArtProv_Create)(void* _obj, void* _clb)
+{
+	return (void*)new ELJArtProv(_obj, _clb);
+}
+	
+EWXWEXPORT(void,ELJArtProv_Release)(void* _obj)
+{
+	((ELJArtProv*)_obj)->Release();
+	delete (ELJArtProv*)_obj;
+}
+	
+EWXWEXPORT(void,PushProvider)(void* provider)
+{
+	wxArtProvider::PushProvider((wxArtProvider*)provider);
+}
+
+EWXWEXPORT(int,PopProvider)()
+{
+	return (int)wxArtProvider::PopProvider();
+}
+
+EWXWEXPORT(int,RemoveProvider)(void* provider)
+{
+	return (int)wxArtProvider::RemoveProvider((wxArtProvider*)provider);
+}
+
+}
+#endif
diff --git a/wxc/src/eljbitmap.cpp b/wxc/src/eljbitmap.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljbitmap.cpp
@@ -0,0 +1,208 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxBitmap_Create)(void* _data, int _type, int _width, int _height, int _depth)
+{
+#ifdef __WIN32__
+	return (void*) new wxBitmap(_data, _type, _width, _height, _depth);
+#else
+	return (void*) new wxBitmap((const char*)_data, _width, _height, _depth);
+#endif
+}
+
+EWXWEXPORT(void*, wxBitmap_CreateFromXPM)(void* _data)
+{
+	return (void*) new wxBitmap((const char**)_data);
+}
+
+EWXWEXPORT(void*, wxBitmap_CreateEmpty)(int _width, int _height, int _depth)
+{
+	return (void*) new wxBitmap(_width, _height, _depth);
+}
+
+EWXWEXPORT(void*, wxBitmap_CreateLoad)(void* name, int type)
+{
+#if wxVERSION_NUMBER >= 2400
+	return (void*) new wxBitmap((wxChar*)name, (wxBitmapType)type);
+#else
+	return (void*) new wxBitmap((wxChar*)name, (long)type);
+#endif
+}
+
+EWXWEXPORT(void*, wxBitmap_CreateDefault)()
+{
+	return (void*) new wxBitmap();
+}
+
+EWXWEXPORT(void, wxBitmap_Delete)(void* _obj)
+{
+	delete (wxBitmap*)_obj;
+}
+
+EWXWEXPORT(void, wxBitmap_GetSubBitmap)(void* _obj, int x, int y, int w, int h, void* bitmap)
+{
+	(*(wxBitmap*)bitmap) = ((wxBitmap*)_obj)->GetSubBitmap(wxRect(x, y, w, h));
+}
+
+EWXWEXPORT(int, wxBitmap_LoadFile)(void* _obj, void* name, int type)
+{
+#if wxVERSION_NUMBER >= 2400
+	return (int)((wxBitmap*)_obj)->LoadFile((wxChar*)name, (wxBitmapType)type);
+#else
+	return (int)((wxBitmap*)_obj)->LoadFile((wxChar*)name, (long)type);
+#endif
+}
+
+EWXWEXPORT(int, wxBitmap_SaveFile)(void* _obj, void* name, int type, void* cmap)
+{
+#if wxVERSION_NUMBER >= 2400
+	return (int)((wxBitmap*)_obj)->SaveFile((wxChar*) name, (wxBitmapType)type, (wxPalette*) cmap);
+#else
+	return (int)((wxBitmap*)_obj)->SaveFile((wxChar*) name, type, (wxPalette*) cmap);
+#endif
+}
+
+EWXWEXPORT(void*, wxBitmap_GetMask)(void* _obj)
+{
+	return (void*)((wxBitmap*)_obj)->GetMask();
+}
+
+EWXWEXPORT(void, wxBitmap_SetMask)(void* _obj, void* mask)
+{
+	((wxBitmap*)_obj)->SetMask((wxMask*) mask);
+}
+
+/**/
+EWXWEXPORT(void, wxBitmap_AddHandler)(void* handler)
+{
+#ifdef __WIN32__
+	wxBitmap::AddHandler((wxGDIImageHandler*) handler);
+#endif
+}
+
+EWXWEXPORT(void, wxBitmap_InsertHandler)(void* handler)
+{
+#ifdef __WIN32__
+	wxBitmap::InsertHandler((wxGDIImageHandler*) handler);
+#endif
+}
+
+EWXWEXPORT(int, wxBitmap_RemoveHandler)(void* name)
+{
+#ifdef __WIN32__
+	return (int) wxBitmap::RemoveHandler((wxChar*) name);
+#else
+	return 0;
+#endif
+}
+
+EWXWEXPORT(void*, wxBitmap_FindHandlerByName)(void* name)
+{
+#ifdef __WIN32__
+	return (void*)wxBitmap::FindHandler((wxChar*) name);
+#else
+	return NULL;
+#endif
+}
+
+EWXWEXPORT(void*, wxBitmap_FindHandlerByExtension)(void* extension, int type)
+{
+#ifdef __WIN32__
+	return (void*)wxBitmap::FindHandler((wxChar*)extension, (long)type);
+#else
+	return NULL;
+#endif
+}
+
+EWXWEXPORT(void*, wxBitmap_FindHandlerByType)(int type)
+{
+#ifdef __WIN32__
+	return (void*)wxBitmap::FindHandler((long)type);
+#else
+	return NULL;
+#endif
+}
+
+EWXWEXPORT(void, wxBitmap_InitStandardHandlers)()
+{
+#ifdef __WIN32__
+	wxBitmap::InitStandardHandlers();
+#endif
+}
+
+EWXWEXPORT(void, wxBitmap_CleanUpHandlers)()
+{
+#ifdef __WIN32__
+	wxBitmap::CleanUpHandlers();
+#endif
+}
+
+/**/
+EWXWEXPORT(int, wxBitmap_Ok)(void* _obj)
+{
+	return (int)((wxBitmap*)_obj)->Ok();
+}
+
+EWXWEXPORT(int, wxBitmap_GetWidth)(void* _obj)
+{
+	return ((wxBitmap*)_obj)->GetWidth();
+}
+
+EWXWEXPORT(int, wxBitmap_GetHeight)(void* _obj)
+{
+	return ((wxBitmap*)_obj)->GetHeight();
+}
+
+EWXWEXPORT(int, wxBitmap_GetDepth)(void* _obj)
+{
+	return ((wxBitmap*)_obj)->GetDepth();
+}
+
+EWXWEXPORT(void, wxBitmap_SetWidth)(void* _obj, int w)
+{
+	((wxBitmap*)_obj)->SetWidth(w);
+}
+
+EWXWEXPORT(void, wxBitmap_SetHeight)(void* _obj, int h)
+{
+	((wxBitmap*)_obj)->SetHeight(h);
+}
+
+EWXWEXPORT(void, wxBitmap_SetDepth)(void* _obj, int d)
+{
+	((wxBitmap*)_obj)->SetDepth(d);
+}
+
+EWXWEXPORT(void*, wxStaticBitmap_Create) (void* _prt, int _id, void* bitmap, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxStaticBitmap ((wxWindow*)_prt, _id, *((wxBitmap*)bitmap), wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void, wxStaticBitmap_SetIcon)(void* _obj, void* icon)
+{
+	((wxStaticBitmap*)_obj)->SetIcon(*((wxIcon*)icon));
+}
+
+EWXWEXPORT(void, wxStaticBitmap_SetBitmap)(void* _obj, void* bitmap)
+{
+	((wxStaticBitmap*)_obj)->SetBitmap(*((wxBitmap*)bitmap));
+}
+
+EWXWEXPORT(void, wxStaticBitmap_GetIcon)(void* _obj, void* _ref)
+{
+	*((wxIcon*)_ref) = ((wxStaticBitmap*)_obj)->GetIcon();
+}
+
+EWXWEXPORT(void, wxStaticBitmap_GetBitmap)(void* _obj, void* _ref)
+{
+	*((wxBitmap*)_ref) = ((wxStaticBitmap*)_obj)->GetBitmap();
+}
+
+EWXWEXPORT(void, wxStaticBitmap_Delete)(void* _obj)
+{
+	delete (wxStaticBitmap*)_obj;
+}
+
+}
diff --git a/wxc/src/eljbrush.cpp b/wxc/src/eljbrush.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljbrush.cpp
@@ -0,0 +1,105 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxBrush_CreateDefault) ()
+{
+	return (void*) new wxBrush();
+}
+
+EWXWEXPORT(void*, wxBrush_CreateFromBitmap) (void* bitmap)
+{
+	return (void*) new wxBrush(*((wxBitmap*)bitmap));
+}
+
+EWXWEXPORT(void*, wxBrush_CreateFromColour) (void* col, int style)
+{
+	return (void*) new wxBrush(*((wxColour*)col), style);
+}
+
+EWXWEXPORT(void*, wxBrush_CreateFromStock) (int id)
+{
+	switch (id)
+	{
+		case 0:
+			return (void*)wxBLUE_BRUSH;
+		case 1:
+			return (void*)wxGREEN_BRUSH;
+		case 2:
+			return (void*)wxWHITE_BRUSH;
+		case 3:
+			return (void*)wxBLACK_BRUSH;
+		case 4:
+			return (void*)wxGREY_BRUSH;
+		case 5:
+			return (void*)wxMEDIUM_GREY_BRUSH;
+		case 6:
+			return (void*)wxLIGHT_GREY_BRUSH;
+		case 7:
+			return (void*)wxTRANSPARENT_BRUSH;
+		case 8:
+			return (void*)wxCYAN_BRUSH;
+		case 9:
+			return (void*)wxRED_BRUSH;
+	}
+	
+	return NULL;
+}
+
+EWXWEXPORT(void, wxBrush_Delete) (void* _obj)
+{
+	delete (wxBrush*)_obj;
+}
+
+EWXWEXPORT(void, wxBrush_SetColour)(void* _obj, void* col)
+{
+	((wxBrush*)_obj)->SetColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(void, wxBrush_SetColourSingle)(void* _obj, char r, char g, char b)
+{
+	((wxBrush*)_obj)->SetColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
+}
+	
+EWXWEXPORT(void, wxBrush_SetStyle)(void* _obj, int style)
+{
+	((wxBrush*)_obj)->SetStyle(style);
+}
+	
+EWXWEXPORT(void, wxBrush_SetStipple)(void* _obj, void* stipple)
+{
+	((wxBrush*)_obj)->SetStipple(*((wxBitmap*)stipple));
+}
+	
+EWXWEXPORT(void, wxBrush_Assign)(void* _obj, void* brush)
+{
+	*((wxBrush*)_obj) = *((wxBrush*)brush);
+}
+	
+EWXWEXPORT(int, wxBrush_IsEqual)(void* _obj, void* brush)
+{
+	return (int)(*((wxBrush*)_obj) == *((wxBrush*)brush));
+}
+	
+EWXWEXPORT(void, wxBrush_GetColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxBrush*)_obj)->GetColour();
+}
+	
+EWXWEXPORT(int, wxBrush_GetStyle)(void* _obj)
+{
+	return ((wxBrush*)_obj)->GetStyle();
+}
+	
+EWXWEXPORT(void, wxBrush_GetStipple)(void* _obj, void* _ref)
+{
+	*((wxBitmap*)_ref) = (*((wxBrush*)_obj)->GetStipple());
+}
+	
+EWXWEXPORT(int, wxBrush_Ok)(void* _obj)
+{
+	return (int)((wxBrush*)_obj)->Ok();
+}
+	
+}
diff --git a/wxc/src/eljbusyinfo.cpp b/wxc/src/eljbusyinfo.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljbusyinfo.cpp
@@ -0,0 +1,32 @@
+#include "wrapper.h"
+#include "wx/busyinfo.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxBusyInfo_Create) (void* _txt)
+{
+	return (void*) new wxBusyInfo ((wxChar*)_txt);
+}
+
+EWXWEXPORT(void, wxBusyInfo_Delete) (void* _obj)
+{
+	delete (wxBusyInfo*)_obj;
+}
+
+EWXWEXPORT(void*, wxBusyCursor_Create) ()
+{
+	return (void*) new wxBusyCursor ();
+}
+
+EWXWEXPORT(void*, wxBusyCursor_CreateWithCursor) (void* _cur)
+{
+	return (void*) new wxBusyCursor ((wxCursor*)_cur);
+}
+
+EWXWEXPORT(void, wxBusyCursor_Delete) (void* _obj)
+{
+	delete (wxBusyCursor*)_obj;
+}
+
+}
diff --git a/wxc/src/eljbutton.cpp b/wxc/src/eljbutton.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljbutton.cpp
@@ -0,0 +1,81 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxButton_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxButton ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
+}
+
+EWXWEXPORT(int, wxButton_SetBackgroundColour)(void* _obj, void* colour)
+{
+	return (int)((wxButton*)_obj)->SetBackgroundColour(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxButton_SetDefault)(void* _obj)
+{
+	((wxButton*)_obj)->SetDefault();
+}
+
+EWXWEXPORT(void*, wxBitmapButton_Create) (void* _prt, int _id, void* _bmp, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxBitmapButton ((wxWindow*)_prt, _id, *((wxBitmap*)_bmp), wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
+}
+
+EWXWEXPORT(void, wxBitmapButton_GetBitmapLabel)(void* _obj, void* _ref)
+{
+	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapLabel();
+}
+	
+EWXWEXPORT(void, wxBitmapButton_GetBitmapSelected)(void* _obj, void* _ref)
+{
+	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapSelected();
+}
+	
+EWXWEXPORT(void, wxBitmapButton_GetBitmapFocus)(void* _obj, void* _ref)
+{
+	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapFocus();
+}
+	
+EWXWEXPORT(void, wxBitmapButton_GetBitmapDisabled)(void* _obj, void* _ref)
+{
+	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapDisabled();
+}
+	
+EWXWEXPORT(void, wxBitmapButton_SetBitmapSelected)(void* _obj, void* sel)
+{
+	((wxBitmapButton*)_obj)->SetBitmapSelected(*((wxBitmap*)sel));
+}
+	
+EWXWEXPORT(void, wxBitmapButton_SetBitmapFocus)(void* _obj, void* focus)
+{
+	((wxBitmapButton*)_obj)->SetBitmapFocus(*((wxBitmap*)focus));
+}
+	
+EWXWEXPORT(void, wxBitmapButton_SetBitmapDisabled)(void* _obj, void* disabled)
+{
+	((wxBitmapButton*)_obj)->SetBitmapDisabled(*((wxBitmap*)disabled));
+}
+	
+EWXWEXPORT(void, wxBitmapButton_SetBitmapLabel)(void* _obj, void* bitmap)
+{
+	((wxBitmapButton*)_obj)->SetBitmapLabel(*((wxBitmap*)bitmap));
+}
+	
+EWXWEXPORT(void, wxBitmapButton_SetMargins)(void* _obj, int x, int y)
+{
+	((wxBitmapButton*)_obj)->SetMargins(x, y);
+}
+	
+EWXWEXPORT(int, wxBitmapButton_GetMarginX)(void* _obj)
+{
+	return ((wxBitmapButton*)_obj)->GetMarginX();
+}
+	
+EWXWEXPORT(int, wxBitmapButton_GetMarginY)(void* _obj)
+{
+	return ((wxBitmapButton*)_obj)->GetMarginY();
+}
+	
+}
diff --git a/wxc/src/eljcalendarctrl.cpp b/wxc/src/eljcalendarctrl.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcalendarctrl.cpp
@@ -0,0 +1,207 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxCalendarCtrl_Create) (void* _prt, int _id, void* _dat, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxCalendarCtrl ((wxWindow*)_prt, _id, *((wxDateTime*)_dat), wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void, wxCalendarCtrl_SetDate)(void* _obj, void* date)
+{
+	((wxCalendarCtrl*)_obj)->SetDate(*((wxDateTime*)date));
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_GetDate)(void* _obj, void* date)
+{
+	*((wxDateTime*)date) = ((wxCalendarCtrl*)_obj)->GetDate();
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_EnableYearChange)(void* _obj, int enable)
+{
+	((wxCalendarCtrl*)_obj)->EnableYearChange(enable != 0);
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_EnableMonthChange)(void* _obj, int enable)
+{
+	((wxCalendarCtrl*)_obj)->EnableMonthChange(enable != 0);
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_EnableHolidayDisplay)(void* _obj, int display)
+{
+	((wxCalendarCtrl*)_obj)->EnableHolidayDisplay(display != 0);
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_SetHeaderColours)(void* _obj, void* colFg, void* colBg)
+{
+	((wxCalendarCtrl*)_obj)->SetHeaderColours(*((wxColour*)colFg), *((wxColour*)colBg));
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_GetHeaderColourFg)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHeaderColourFg();
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_GetHeaderColourBg)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHeaderColourBg();
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_SetHighlightColours)(void* _obj, void* colFg, void* colBg)
+{
+	((wxCalendarCtrl*)_obj)->SetHighlightColours(*((wxColour*)colFg), *((wxColour*)colBg));
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_GetHighlightColourFg)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHighlightColourFg();
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_GetHighlightColourBg)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHighlightColourBg();
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_SetHolidayColours)(void* _obj, void* colFg, void* colBg)
+{
+	((wxCalendarCtrl*)_obj)->SetHolidayColours(*((wxColour*)colFg), *((wxColour*)colBg));
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_GetHolidayColourFg)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHolidayColourFg();
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_GetHolidayColourBg)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHolidayColourBg();
+}
+	
+EWXWEXPORT(void*, wxCalendarCtrl_GetAttr)(void* _obj, int day)
+{
+	return (void*)((wxCalendarCtrl*)_obj)->GetAttr((size_t)day);
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_SetAttr)(void* _obj, int day, void* attr)
+{
+	((wxCalendarCtrl*)_obj)->SetAttr((size_t)day, (wxCalendarDateAttr*)attr);
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_SetHoliday)(void* _obj, int day)
+{
+	((wxCalendarCtrl*)_obj)->SetHoliday((size_t)day);
+}
+	
+EWXWEXPORT(void, wxCalendarCtrl_ResetAttr)(void* _obj, int day)
+{
+	((wxCalendarCtrl*)_obj)->ResetAttr((size_t)day);
+}
+	
+EWXWEXPORT(int, wxCalendarCtrl_HitTest)(void* _obj, int x, int y, void* date, void* wd)
+{
+	return (int)((wxCalendarCtrl*)_obj)->HitTest(wxPoint(x, y), (wxDateTime*)date, (wxDateTime::WeekDay*)wd);
+}
+	
+
+EWXWEXPORT(void*, wxCalendarDateAttr_Create)(void* _ctxt, void* _cbck, void* _cbrd, void* _fnt, int _brd)
+{
+	return (void*) new wxCalendarDateAttr(*((wxColour*)_ctxt), *((wxColour*)_cbck), *((wxColour*)_cbrd), *((wxFont*)_fnt), (wxCalendarDateBorder)_brd);
+}
+
+EWXWEXPORT(void*, wxCalendarDateAttr_CreateDefault)()
+{
+	return (void*) new wxCalendarDateAttr();
+}
+
+EWXWEXPORT(void, wxCalendarDateAttr_Delete)(void* _obj)
+{
+	delete (wxCalendarDateAttr*)_obj;
+}
+
+EWXWEXPORT(void, wxCalendarDateAttr_SetTextColour)(void* _obj, void* col)
+{
+	((wxCalendarDateAttr*)_obj)->SetTextColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_SetBackgroundColour)(void* _obj, void* col)
+{
+	((wxCalendarDateAttr*)_obj)->SetBackgroundColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_SetBorderColour)(void* _obj, void* col)
+{
+	((wxCalendarDateAttr*)_obj)->SetBorderColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_SetFont)(void* _obj, void* font)
+{
+	((wxCalendarDateAttr*)_obj)->SetFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_SetBorder)(void* _obj, int border)
+{
+	((wxCalendarDateAttr*)_obj)->SetBorder((wxCalendarDateBorder)border);
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_SetHoliday)(void* _obj, int holiday)
+{
+	((wxCalendarDateAttr*)_obj)->SetHoliday(holiday != 0);
+}
+	
+EWXWEXPORT(int, wxCalendarDateAttr_HasTextColour)(void* _obj)
+{
+	return (int)((wxCalendarDateAttr*)_obj)->HasTextColour();
+}
+	
+EWXWEXPORT(int, wxCalendarDateAttr_HasBackgroundColour)(void* _obj)
+{
+	return (int)((wxCalendarDateAttr*)_obj)->HasBackgroundColour();
+}
+	
+EWXWEXPORT(int, wxCalendarDateAttr_HasBorderColour)(void* _obj)
+{
+	return (int)((wxCalendarDateAttr*)_obj)->HasBorderColour();
+}
+	
+EWXWEXPORT(int, wxCalendarDateAttr_HasFont)(void* _obj)
+{
+	return (int)((wxCalendarDateAttr*)_obj)->HasFont();
+}
+	
+EWXWEXPORT(int, wxCalendarDateAttr_HasBorder)(void* _obj)
+{
+	return (int)((wxCalendarDateAttr*)_obj)->HasBorder();
+}
+	
+EWXWEXPORT(int, wxCalendarDateAttr_IsHoliday)(void* _obj)
+{
+	return (int)((wxCalendarDateAttr*)_obj)->IsHoliday();
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_GetTextColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxCalendarDateAttr*)_obj)->GetTextColour();
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_GetBackgroundColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxCalendarDateAttr*)_obj)->GetBackgroundColour();
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_GetBorderColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxCalendarDateAttr*)_obj)->GetBorderColour();
+}
+	
+EWXWEXPORT(void, wxCalendarDateAttr_GetFont)(void* _obj, void* _ref)
+{
+	*((wxFont*)_ref) = ((wxCalendarDateAttr*)_obj)->GetFont();
+}
+	
+EWXWEXPORT(int, wxCalendarDateAttr_GetBorder)(void* _obj)
+{
+	return (int)((wxCalendarDateAttr*)_obj)->GetBorder();
+}
+
+}
diff --git a/wxc/src/eljcaret.cpp b/wxc/src/eljcaret.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcaret.cpp
@@ -0,0 +1,67 @@
+#include "wrapper.h"
+#include "wx/caret.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxCaret_Create)(void* _wnd, int _wth, int _hgt)
+{
+	return new wxCaret((wxWindow*)_wnd, _wth, _hgt);
+}
+
+EWXWEXPORT(int,wxCaret_IsOk)(void* _obj)
+{
+	return (int)((wxCaret*)_obj)->IsOk();
+}
+	
+EWXWEXPORT(int,wxCaret_IsVisible)(void* _obj)
+{
+	return (int)((wxCaret*)_obj)->IsVisible();
+}
+	
+EWXWEXPORT(void,wxCaret_GetPosition)(void* _obj, void* x, void* y)
+{
+	((wxCaret*)_obj)->GetPosition((int*)x, (int*)y);
+}
+	
+EWXWEXPORT(void,wxCaret_GetSize)(void* _obj, void* width, void* height)
+{
+	((wxCaret*)_obj)->GetSize((int*)width, (int*)height);
+}
+	
+EWXWEXPORT(void*,wxCaret_GetWindow)(void* _obj)
+{
+	return (void*)((wxCaret*)_obj)->GetWindow();
+}
+	
+EWXWEXPORT(void,wxCaret_SetSize)(void* _obj, int width, int height)
+{
+	((wxCaret*)_obj)->SetSize(width, height);
+}
+	
+EWXWEXPORT(void,wxCaret_Move)(void* _obj, int x, int y)
+{
+	((wxCaret*)_obj)->Move(x, y);
+}
+	
+EWXWEXPORT(void,wxCaret_Show)(void* _obj)
+{
+	((wxCaret*)_obj)->Show();
+}
+	
+EWXWEXPORT(void,wxCaret_Hide)(void* _obj)
+{
+	((wxCaret*)_obj)->Hide();
+}
+	
+EWXWEXPORT(int,wxCaret_GetBlinkTime)()
+{
+	return wxCaret::GetBlinkTime();
+}
+	
+EWXWEXPORT(void,wxCaret_SetBlinkTime)(int milliseconds)
+{
+	wxCaret::SetBlinkTime(milliseconds);
+}
+	
+}
diff --git a/wxc/src/eljcheckbox.cpp b/wxc/src/eljcheckbox.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcheckbox.cpp
@@ -0,0 +1,21 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxCheckBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxCheckBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
+}
+
+EWXWEXPORT(void, wxCheckBox_SetValue)(void* _obj, int value)
+{
+	((wxCheckBox*)_obj)->SetValue(value != 0);
+}
+	
+EWXWEXPORT(int, wxCheckBox_GetValue)(void* _obj)
+{
+	return (int)((wxCheckBox*)_obj)->GetValue();
+}
+
+} 
diff --git a/wxc/src/eljchecklistbox.cpp b/wxc/src/eljchecklistbox.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljchecklistbox.cpp
@@ -0,0 +1,26 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxCheckListBox_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
+{
+	wxCheckListBox* result = new wxCheckListBox ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), 0, NULL, _stl, wxDefaultValidator);
+
+	for (int i = 0; i < _n; i++)
+		result->Append(((wxChar**)_str)[i]);
+
+	return (void*) result;
+}
+
+EWXWEXPORT(void, wxCheckListBox_Check)(void* _obj, int item, int check)
+{
+	((wxCheckListBox*)_obj)->Check(item, check != 0);
+}
+	
+EWXWEXPORT(int, wxCheckListBox_IsChecked)(void* _obj, int item)
+{
+	return (int)((wxCheckListBox*)_obj)->IsChecked(item);
+}
+
+}
diff --git a/wxc/src/eljchoice.cpp b/wxc/src/eljchoice.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljchoice.cpp
@@ -0,0 +1,66 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxChoice_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
+{
+	wxString* list = new wxString[_n];
+
+	for (int i = 0; i < _n; i++)
+		list[i] = ((wxChar**)_str)[i];
+
+	wxChoice* result = new wxChoice ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _n, list, _stl, wxDefaultValidator);
+
+	delete [] list;
+
+	return result;
+}
+
+EWXWEXPORT(void, wxChoice_Append)(void* _obj, wxChar* item)
+{
+	((wxChoice*)_obj)->Append(item);
+}
+	
+EWXWEXPORT(void, wxChoice_Delete)(void* _obj, int n)
+{
+	((wxChoice*)_obj)->Delete(n);
+}
+	
+EWXWEXPORT(void, wxChoice_Clear)(void* _obj)
+{
+	((wxChoice*)_obj)->Clear();
+}
+	
+EWXWEXPORT(int, wxChoice_GetCount)(void* _obj)
+{
+	return ((wxChoice*)_obj)->GetCount();
+}
+	
+EWXWEXPORT(int, wxChoice_GetSelection)(void* _obj)
+{
+	return ((wxChoice*)_obj)->GetSelection();
+}
+	
+EWXWEXPORT(void, wxChoice_SetSelection)(void* _obj, int n)
+{
+	((wxChoice*)_obj)->SetSelection(n);
+}
+	
+EWXWEXPORT(int, wxChoice_FindString)(void* _obj, wxChar* s)
+{
+	return ((wxChoice*)_obj)->FindString(s);
+}
+	
+EWXWEXPORT(int, wxChoice_GetString)(void* _obj, int n, void* _buf)
+{
+	wxString result = ((wxChoice*)_obj)->GetString(n);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxChoice_SetString)(void* _obj, int n, wxChar* s)
+{
+	((wxChoice*)_obj)->SetString(n, s);
+}
+	
+} 
diff --git a/wxc/src/eljclipboard.cpp b/wxc/src/eljclipboard.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljclipboard.cpp
@@ -0,0 +1,66 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxClipboard_Create)()
+{
+	return wxTheClipboard;
+}
+
+EWXWEXPORT(void, wxClipboard_Delete)(void* _obj)
+{
+	// delete (wxClipboard*)_obj;
+}
+
+EWXWEXPORT(int, wxClipboard_Open)(void* _obj)
+{
+	return (int)((wxClipboard*)_obj)->Open();
+}
+
+EWXWEXPORT(void, wxClipboard_Close)(void* _obj)
+{
+	((wxClipboard*)_obj)->Close();
+}
+
+EWXWEXPORT(int, wxClipboard_IsOpened)(void* _obj)
+{
+	return (int)((wxClipboard*)_obj)->IsOpened();
+}
+
+EWXWEXPORT(int, wxClipboard_SetData)(void* _obj, wxDataObject* data)
+{
+	return (int)((wxClipboard*)_obj)->SetData(data);
+}
+
+EWXWEXPORT(int, wxClipboard_AddData)(void* _obj, wxDataObject* data)
+{
+	return (int)((wxClipboard*)_obj)->AddData(data);
+}
+
+EWXWEXPORT(int, wxClipboard_IsSupported)(void* _obj, wxDataFormat* format)
+{
+	return (int)((wxClipboard*)_obj)->IsSupported(*format);
+}
+
+EWXWEXPORT(int, wxClipboard_GetData)(void* _obj, wxDataObject* data)
+{
+	return (int)((wxClipboard*)_obj)->GetData(*data);
+}
+
+EWXWEXPORT(void, wxClipboard_Clear)(void* _obj)
+{
+	((wxClipboard*)_obj)->Clear();
+}
+
+EWXWEXPORT(int, wxClipboard_Flush)(void* _obj)
+{
+	return (int)((wxClipboard*)_obj)->Flush();
+}
+
+EWXWEXPORT(void, wxClipboard_UsePrimarySelection)(void* _obj, int primary)
+{
+	((wxClipboard*)_obj)->UsePrimarySelection (primary != 0);
+}
+
+}
diff --git a/wxc/src/eljcoldata.cpp b/wxc/src/eljcoldata.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcoldata.cpp
@@ -0,0 +1,46 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxColourData_Create) ()
+{
+	return (void*) new wxColourData();
+}
+
+EWXWEXPORT(void, wxColourData_Delete) (void* _obj)
+{
+	delete (wxColourData*)_obj;
+}
+
+EWXWEXPORT(void, wxColourData_SetChooseFull)(void* _obj, int flag)
+{
+	((wxColourData*)_obj)->SetChooseFull(flag != 0);
+}
+	
+EWXWEXPORT(int, wxColourData_GetChooseFull)(void* _obj)
+{
+	return (int)((wxColourData*)_obj)->GetChooseFull();
+}
+	
+EWXWEXPORT(void, wxColourData_SetColour)(void* _obj, void* colour)
+{
+	((wxColourData*)_obj)->SetColour(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxColourData_GetColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxColourData*)_obj)->GetColour();
+}
+	
+EWXWEXPORT(void, wxColourData_SetCustomColour)(void* _obj, int i, void* colour)
+{
+	((wxColourData*)_obj)->SetCustomColour(i, *((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxColourData_GetCustomColour)(void* _obj, int i, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxColourData*)_obj)->GetCustomColour(i);
+}
+	
+} 
diff --git a/wxc/src/eljcolour.cpp b/wxc/src/eljcolour.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcolour.cpp
@@ -0,0 +1,116 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxColour_CreateEmpty) ()
+{
+	return (void*) new wxColour();
+}
+
+EWXWEXPORT(void*, wxColour_CreateRGB) (char _red, char _green, char _blue)
+{
+	return (void*) new wxColour(_red, _green, _blue);
+}
+
+EWXWEXPORT(void*, wxColour_CreateByName) (void* _name)
+{
+	return (void*) new wxColour((wxChar*)_name);
+}
+
+EWXWEXPORT(void*, wxColour_CreateFromStock) (int _id)
+{
+	switch (_id)
+	{
+		case 0:
+			return (void*)wxBLACK;
+		case 1:
+			return (void*)wxWHITE;
+		case 2:
+			return (void*)wxRED;
+		case 3:
+			return (void*)wxBLUE;
+		case 4:
+			return (void*)wxGREEN;
+		case 5:
+			return (void*)wxCYAN;
+		case 6:
+			return (void*)wxLIGHT_GREY;
+	}
+
+	return NULL;
+}
+
+EWXWEXPORT(void, wxColour_Delete)(void* _obj)
+{
+	delete (wxColour*)_obj;
+}
+
+EWXWEXPORT(void, wxColour_Set)(void* _obj, char _red, char _green, char _blue)
+{
+	((wxColour*)_obj)->Set(_red, _green, _blue);
+}
+	
+EWXWEXPORT(void, wxColour_Assign)(void* _obj, void* other)
+{
+	*((wxColour*)_obj) = *((wxColour*)other);
+}
+	
+EWXWEXPORT(int, wxColour_Ok)(void* _obj)
+{
+	return (int)((wxColour*)_obj)->Ok();
+}
+	
+EWXWEXPORT(char, wxColour_Red)(void* _obj)
+{
+	return ((wxColour*)_obj)->Red();
+}
+	
+EWXWEXPORT(char, wxColour_Green)(void* _obj)
+{
+	return ((wxColour*)_obj)->Green();
+}
+	
+EWXWEXPORT(char, wxColour_Blue)(void* _obj)
+{
+	return ((wxColour*)_obj)->Blue();
+}
+
+// FIXME: the return type on this is platform dependent
+// and thus evil.  If you really want a GetPixel method,
+// please hack this code and throw in the relevant 
+// ifdefs, cuz I don't want to deal with it.
+//   Windows - WXCOLORREF
+//   GTK     - int
+//   X11     - long
+//   Mac     - (WXCOLORREF&)
+// EWXWEXPORT(WXCOLORREF, wxColour_GetPixel)(void* _obj)
+// {
+// 	return ((wxColour*)_obj)->GetPixel();
+// }
+
+EWXWEXPORT(void, wxColour_Copy)(void* _obj, void* _other)
+{
+	(*((wxColour*)_obj)) = (*((wxColour*)_other));
+}
+
+EWXWEXPORT(void, wxColour_SetByName)(void* _obj, void* _name)
+{
+	(*((wxColour*)_obj)) = (wxChar*)_name;
+}
+
+EWXWEXPORT(int, wxColour_ValidName)(wxChar* _name)
+{
+#if (wxVERSION_NUMBER < 2600)
+  return (wxTheColourDatabase->FindColour (wxString(_name))) != NULL;
+#else
+  wxColour col = (wxTheColourDatabase->Find (wxString(_name)));
+#if (wxVERSION_NUMBER < 2800)
+  return col.Ok();
+#else
+  return col.IsOk();
+#endif
+#endif
+}
+
+}
diff --git a/wxc/src/eljcolourdlg.cpp b/wxc/src/eljcolourdlg.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcolourdlg.cpp
@@ -0,0 +1,16 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxColourDialog_Create) (void* _prt, void* col)
+{
+	return (void*) new wxColourDialog ((wxWindow*)_prt, (wxColourData*) col);
+}
+
+EWXWEXPORT(void, wxColourDialog_GetColourData)(void* _obj, void* col)
+{
+	*((wxColourData*)col) = ((wxColourDialog*)_obj)->GetColourData();
+}
+
+}
diff --git a/wxc/src/eljcombobox.cpp b/wxc/src/eljcombobox.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcombobox.cpp
@@ -0,0 +1,181 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxComboBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
+{
+	wxString* list = new wxString[_n];
+
+	for (int i = 0; i < _n; i++)
+		list[i] = ((wxChar**)_str)[i];
+
+	wxComboBox* result = new wxComboBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _n, list, _stl, wxDefaultValidator);
+
+	delete [] list;
+#if wxVERSION_NUMBER < 2400
+	if ((result->Number()) && (result->GetSelection() == -1)) result->SetSelection(0);
+#else
+	if ((result->GetCount()) && (result->GetSelection() == -1)) result->SetSelection(0);
+#endif
+	
+	return (void*) result;
+}
+
+EWXWEXPORT(void, wxComboBox_Copy)(void* _obj)
+{
+	((wxComboBox*)_obj)->Copy();
+}
+	
+EWXWEXPORT(void, wxComboBox_Cut)(void* _obj)
+{
+	((wxComboBox*)_obj)->Cut();
+}
+	
+EWXWEXPORT(void, wxComboBox_Paste)(void* _obj)
+{
+	((wxComboBox*)_obj)->Paste();
+}
+	
+EWXWEXPORT(void, wxComboBox_SetInsertionPoint)(void* _obj, int pos)
+{
+	((wxComboBox*)_obj)->SetInsertionPoint(pos);
+}
+	
+EWXWEXPORT(void, wxComboBox_SetInsertionPointEnd)(void* _obj)
+{
+	((wxComboBox*)_obj)->SetInsertionPointEnd();
+}
+	
+EWXWEXPORT(int, wxComboBox_GetInsertionPoint)(void* _obj)
+{
+	return ((wxComboBox*)_obj)->GetInsertionPoint();
+}
+	
+EWXWEXPORT(int, wxComboBox_GetLastPosition)(void* _obj)
+{
+	return ((wxComboBox*)_obj)->GetLastPosition();
+}
+	
+EWXWEXPORT(void, wxComboBox_Replace)(void* _obj, int from, int to, wxChar* value)
+{
+	((wxComboBox*)_obj)->Replace(from, to, value);
+}
+	
+EWXWEXPORT(void, wxComboBox_Remove)(void* _obj, int from, int to)
+{
+	((wxComboBox*)_obj)->Remove(from, to);
+#if wxVERSION_NUMBER < 2400
+	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#else
+	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#endif
+}
+	
+EWXWEXPORT(void, wxComboBox_SetTextSelection)(void* _obj, int from, int to)
+{
+	((wxComboBox*)_obj)->SetSelection(from, to);
+}
+	
+EWXWEXPORT(void, wxComboBox_SetEditable)(void* _obj, int editable)
+{
+	((wxComboBox*)_obj)->SetEditable(editable != 0);
+}
+	
+EWXWEXPORT(int, wxComboBox_GetStringSelection)(void* _obj, void* _buf)
+{
+        wxString result = ((wxComboBox*)_obj)->GetStringSelection();
+        return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxComboBox_GetValue)(void* _obj, void* _buf)
+{
+        wxString result = ((wxComboBox*)_obj)->GetValue();
+        return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxComboBox_Append)(void* _obj, wxChar* item)
+{
+	((wxComboBox*)_obj)->Append(item);
+#if wxVERSION_NUMBER < 2400
+	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#else
+	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#endif
+}
+	
+EWXWEXPORT(void, wxComboBox_AppendData)(void* _obj, wxChar* item, void* d)
+{
+#if defined(__WXMAC__)
+    ((wxComboBox*)_obj)->Append(item);
+#else
+    ((wxComboBox*)_obj)->Append(item, d);
+#endif
+
+#if wxVERSION_NUMBER < 2400
+	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#else
+	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#endif
+}
+	
+EWXWEXPORT(void, wxComboBox_Delete)(void* _obj, int n)
+{
+	((wxComboBox*)_obj)->Delete(n);
+#if wxVERSION_NUMBER < 2400
+	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#else
+	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
+#endif
+}
+	
+EWXWEXPORT(void, wxComboBox_Clear)(void* _obj)
+{
+	((wxComboBox*)_obj)->Clear();
+}
+	
+EWXWEXPORT(int, wxComboBox_GetCount)(void* _obj)
+{
+#if wxVERSION_NUMBER < 2400
+	return ((wxComboBox*)_obj)->Number();
+#else
+	return ((wxComboBox*)_obj)->GetCount();
+#endif
+}
+	
+EWXWEXPORT(int, wxComboBox_GetSelection)(void* _obj)
+{
+	return ((wxComboBox*)_obj)->GetSelection();
+}
+	
+EWXWEXPORT(void, wxComboBox_SetSelection)(void* _obj, int n)
+{
+	((wxComboBox*)_obj)->SetSelection(n);
+}
+	
+EWXWEXPORT(int, wxComboBox_FindString)(void* _obj, wxChar* s)
+{
+	return ((wxComboBox*)_obj)->FindString(s);
+}
+	
+EWXWEXPORT(int, wxComboBox_GetString)(void* _obj, int n, void* _buf)
+{
+        wxString result = ((wxComboBox*)_obj)->GetString(n);
+        return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxComboBox_SetString)(void* _obj, int n, char* s)
+{
+}
+	
+EWXWEXPORT(void, wxComboBox_SetClientData)(void* _obj, int n, void* clientData)
+{
+	((wxComboBox*)_obj)->SetClientData( n, clientData );
+}
+	
+EWXWEXPORT(void*, wxComboBox_GetClientData)(void* _obj, int n)
+{
+	return ((wxComboBox*)_obj)->GetClientData(n);
+}
+
+}
diff --git a/wxc/src/eljcommand.cpp b/wxc/src/eljcommand.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcommand.cpp
@@ -0,0 +1,132 @@
+#include "wrapper.h"
+#include "wx/docview.h"
+
+extern "C"
+{
+
+typedef int _cdecl (*TGetResp) (void* _obj, int _und);
+
+}
+
+class ELJCommand : public wxCommand
+{
+	private:
+		TGetResp func;
+		void*    EiffelObject;
+	
+	public:
+		ELJCommand (bool _und, const wxString& _nme, void* _obj, void* _clb) : wxCommand(_und, _nme)
+		{
+			func = (TGetResp)_clb;
+			EiffelObject = _obj;
+		}
+		
+		bool Do()
+		{return func (EiffelObject, 0) != 0;}
+
+		bool Undo()
+		{return func (EiffelObject, 1) != 0;}
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*,ELJCommand_Create)(int _und, void* _nme, void* _obj, void* _clb)
+{
+	return (void*)new ELJCommand(_und != 0, (const char*)_nme, _obj, _clb);
+}
+
+EWXWEXPORT(void,ELJCommand_Delete)(void* _obj)
+{
+	delete (ELJCommand*)_obj;
+}
+
+EWXWEXPORT(int,ELJCommand_GetName)(void* _obj, void* _buf)
+{
+	return copyStrToBuf(_buf, ((ELJCommand*)_obj)->GetName());
+}
+
+EWXWEXPORT(int,ELJCommand_CanUndo)(void* _obj)
+{
+	return (int)((ELJCommand*)_obj)->CanUndo();
+}
+	
+
+EWXWEXPORT(void*,wxCommandProcessor_wxCommandProcessor)(int maxCommands)
+{
+	return (void*)new wxCommandProcessor(maxCommands);
+}
+	
+EWXWEXPORT(void,wxCommandProcessor_Delete)(void* _obj)
+{
+	delete (wxCommandProcessor*)_obj;
+}
+
+EWXWEXPORT(int,wxCommandProcessor_Submit)(void* _obj, void* command, int storeIt)
+{
+	return (int)((wxCommandProcessor*)_obj)->Submit((wxCommand*)command, storeIt != 0);
+}
+	
+EWXWEXPORT(int,wxCommandProcessor_Undo)(void* _obj)
+{
+	return (int)((wxCommandProcessor*)_obj)->Undo();
+}
+	
+EWXWEXPORT(int,wxCommandProcessor_Redo)(void* _obj)
+{
+	return (int)((wxCommandProcessor*)_obj)->Redo();
+}
+	
+EWXWEXPORT(int,wxCommandProcessor_CanUndo)(void* _obj)
+{
+	return (int)((wxCommandProcessor*)_obj)->CanUndo();
+}
+	
+EWXWEXPORT(int,wxCommandProcessor_CanRedo)(void* _obj)
+{
+	return (int)((wxCommandProcessor*)_obj)->CanRedo();
+}
+	
+EWXWEXPORT(void,wxCommandProcessor_SetEditMenu)(void* _obj, void* menu)
+{
+	((wxCommandProcessor*)_obj)->SetEditMenu((wxMenu*)menu);
+}
+	
+EWXWEXPORT(void*,wxCommandProcessor_GetEditMenu)(void* _obj)
+{
+	return (void*)((wxCommandProcessor*)_obj)->GetEditMenu();
+}
+	
+EWXWEXPORT(void,wxCommandProcessor_SetMenuStrings)(void* _obj)
+{
+	((wxCommandProcessor*)_obj)->SetMenuStrings();
+}
+	
+EWXWEXPORT(void,wxCommandProcessor_Initialize)(void* _obj)
+{
+	((wxCommandProcessor*)_obj)->Initialize();
+}
+	
+EWXWEXPORT(int,wxCommandProcessor_GetCommands)(void* _obj, void* _ref)
+{
+	wxList lst = ((wxCommandProcessor*)_obj)->GetCommands();
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < lst.GetCount(); i++)
+			((void**)_ref)[i] = (void*)lst.Item(i);
+	}
+	
+	return lst.GetCount();
+}
+	
+EWXWEXPORT(int,wxCommandProcessor_GetMaxCommands)(void* _obj)
+{
+	return ((wxCommandProcessor*)_obj)->GetMaxCommands();
+}
+	
+EWXWEXPORT(void,wxCommandProcessor_ClearCommands)(void* _obj)
+{
+	((wxCommandProcessor*)_obj)->ClearCommands();
+}
+	
+}
diff --git a/wxc/src/eljconfigbase.cpp b/wxc/src/eljconfigbase.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljconfigbase.cpp
@@ -0,0 +1,234 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxConfigBase_Create)()
+{
+	return (void*) wxConfigBase::Create();
+}
+	
+EWXWEXPORT(void, wxConfigBase_Delete)(void* _obj)
+{
+	delete (wxConfigBase*)_obj;
+}
+
+EWXWEXPORT(void, wxConfigBase_SetPath)(void* _obj, void* strPath)
+{
+	((wxConfigBase*)_obj)->SetPath((wxChar*) strPath);
+}
+	
+EWXWEXPORT(int, wxConfigBase_GetPath)(void* _obj, void* _buf)
+{
+	wxString result = ((wxConfigBase*)_obj)->GetPath();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(wxString*, wxConfigBase_GetFirstGroup)(wxConfigBase* _obj, long* lIndex)
+{
+	wxString* tmp;
+        tmp = new wxString(wxT(""));
+        if (_obj->GetFirstGroup(*tmp, *lIndex)) {
+          *lIndex = -1;
+        }         
+	return tmp;
+}
+	
+EWXWEXPORT(wxString*, wxConfigBase_GetNextGroup) (wxConfigBase* _obj, long* lIndex )
+{
+	wxString* tmp;
+        tmp = new wxString(wxT(""));
+        if (_obj->GetNextGroup(*tmp, *lIndex)) {
+          *lIndex = -1;
+        }         
+	return tmp;
+}
+
+	
+EWXWEXPORT(wxString*, wxConfigBase_GetFirstEntry)(wxConfigBase* _obj, long* lIndex)
+{
+	wxString* tmp;
+        tmp = new wxString(wxT(""));
+        if (_obj->GetFirstEntry(*tmp, *lIndex)) {
+          *lIndex = -1;
+        }         
+	return tmp;
+}
+	
+EWXWEXPORT(wxString*, wxConfigBase_GetNextEntry) (wxConfigBase* _obj, long* lIndex)
+{
+	wxString* tmp;
+        tmp = new wxString(wxT(""));
+        if (_obj->GetNextEntry(*tmp, *lIndex)) {
+          *lIndex = -1;
+        }         
+	return tmp;
+}
+	
+EWXWEXPORT(int, wxConfigBase_GetNumberOfEntries)(void* _obj, int bRecursive)
+{
+	return (int)((wxConfigBase*)_obj)->GetNumberOfEntries(bRecursive != 0);
+}
+	
+EWXWEXPORT(int, wxConfigBase_GetNumberOfGroups)(void* _obj, int bRecursive)
+{
+	return (int)((wxConfigBase*)_obj)->GetNumberOfGroups(bRecursive != 0);
+}
+	
+EWXWEXPORT(int, wxConfigBase_HasGroup)(void* _obj, void* strName)
+{
+	return (int)((wxConfigBase*)_obj)->HasGroup((wxChar*)strName);
+}
+	
+EWXWEXPORT(int, wxConfigBase_HasEntry)(void* _obj, void* strName)
+{
+	return (int)((wxConfigBase*)_obj)->HasEntry((wxChar*)strName);
+}
+	
+EWXWEXPORT(int, wxConfigBase_Exists)(void* _obj, void* strName)
+{
+	return (int)((wxConfigBase*)_obj)->Exists((wxChar*)strName);
+}
+	
+EWXWEXPORT(int, wxConfigBase_GetEntryType)(void* _obj, void* name)
+{
+	return (int)((wxConfigBase*)_obj)->GetEntryType((wxChar*)name);
+}
+	
+EWXWEXPORT(wxString*, wxConfigBase_ReadString)(wxConfigBase* _obj, void* key, void* defVal)
+{
+	wxString tmp;
+        tmp = ((wxConfigBase*)_obj)->Read((wxChar*)key, (wxChar*)defVal);
+	return new wxString(tmp);
+}
+	
+EWXWEXPORT(int, wxConfigBase_ReadInteger)(void* _obj, void* key, int defVal)
+{
+	return ((wxConfigBase*)_obj)->Read((wxChar*)key, defVal);
+}
+	
+EWXWEXPORT(double, wxConfigBase_ReadDouble)(void* _obj, void* key, double defVal)
+{
+    double val;
+	if (((wxConfigBase*)_obj)->Read((wxChar*) key, &val, defVal))
+ 		return val;
+ 	return 0.0;
+}
+	
+EWXWEXPORT(int, wxConfigBase_ReadBool)(void* _obj, void* key, int defVal)
+{
+	bool val;
+	if (((wxConfigBase*)_obj)->Read((wxChar*) key, &val, defVal != 0))
+		return (int)val;
+	return 0;
+}
+	
+EWXWEXPORT(int, wxConfigBase_WriteString)(void* _obj, void* key, void* value)
+{
+	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, (wxChar*)value);
+}
+	
+EWXWEXPORT(int, wxConfigBase_WriteInteger)(void* _obj, void* key, int value)
+{
+	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, (long)value);
+}
+	
+EWXWEXPORT(int, wxConfigBase_WriteDouble)(void* _obj, void* key, double value)
+{
+	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, value);
+}
+	
+EWXWEXPORT(int, wxConfigBase_WriteBool)(void* _obj, void* key, int value)
+{
+	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, value != 0);
+}
+	
+EWXWEXPORT(int, wxConfigBase_Flush)(void* _obj, int bCurrentOnly)
+{
+	return (int)((wxConfigBase*)_obj)->Flush(bCurrentOnly != 0);
+}
+	
+EWXWEXPORT(int, wxConfigBase_RenameEntry)(void* _obj, void* oldName, void* newName)
+{
+	return (int)((wxConfigBase*)_obj)->RenameEntry((wxChar*)oldName, (wxChar*)newName);
+}
+	
+EWXWEXPORT(int, wxConfigBase_RenameGroup)(void* _obj, void* oldName, void* newName)
+{
+	return (int)((wxConfigBase*)_obj)->RenameGroup((wxChar*)oldName, (wxChar*)newName);
+}
+	
+EWXWEXPORT(int, wxConfigBase_DeleteEntry)(void* _obj, void* key, int bDeleteGroupIfEmpty)
+{
+	return (int)((wxConfigBase*)_obj)->DeleteEntry((wxChar*)key, bDeleteGroupIfEmpty != 0);
+}
+	
+EWXWEXPORT(int, wxConfigBase_DeleteGroup)(void* _obj, void* key)
+{
+	return (int)((wxConfigBase*)_obj)->DeleteGroup((wxChar*)key);
+}
+	
+EWXWEXPORT(int, wxConfigBase_DeleteAll)(void* _obj)
+{
+	return (int)((wxConfigBase*)_obj)->DeleteAll();
+}
+	
+EWXWEXPORT(int, wxConfigBase_IsExpandingEnvVars)(void* _obj)
+{
+	return (int)((wxConfigBase*)_obj)->IsExpandingEnvVars();
+}
+	
+EWXWEXPORT(void, wxConfigBase_SetExpandEnvVars)(void* _obj, int bDoIt)
+{
+	((wxConfigBase*)_obj)->SetExpandEnvVars(bDoIt != 0);
+}
+	
+EWXWEXPORT(void, wxConfigBase_SetRecordDefaults)(void* _obj, int bDoIt)
+{
+	((wxConfigBase*)_obj)->SetRecordDefaults(bDoIt != 0);
+}
+	
+EWXWEXPORT(int, wxConfigBase_IsRecordingDefaults)(void* _obj)
+{
+	return (int)((wxConfigBase*)_obj)->IsRecordingDefaults();
+}
+	
+EWXWEXPORT(int, wxConfigBase_ExpandEnvVars)(void* _obj, void* str, void* _buf)
+{
+	wxString result = ((wxConfigBase*)_obj)->ExpandEnvVars((wxChar*)str);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxConfigBase_GetAppName)(void* _obj, void* _buf)
+{
+	wxString result = ((wxConfigBase*)_obj)->GetAppName();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxConfigBase_GetVendorName)(void* _obj, void* _buf)
+{
+	wxString result = ((wxConfigBase*)_obj)->GetVendorName();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxConfigBase_SetAppName)(void* _obj, void* appName)
+{
+	((wxConfigBase*)_obj)->SetAppName((wxChar*)appName);
+}
+	
+EWXWEXPORT(void, wxConfigBase_SetVendorName)(void* _obj, void* vendorName)
+{
+	((wxConfigBase*)_obj)->SetVendorName((wxChar*)vendorName);
+}
+	
+EWXWEXPORT(void, wxConfigBase_SetStyle)(void* _obj, int style)
+{
+	((wxConfigBase*)_obj)->SetStyle((long)style);
+}
+	
+EWXWEXPORT(int, wxConfigBase_GetStyle)(void* _obj)
+{
+	return (int)((wxConfigBase*)_obj)->GetStyle();
+}
+	
+}
diff --git a/wxc/src/eljcontrol.cpp b/wxc/src/eljcontrol.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcontrol.cpp
@@ -0,0 +1,22 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void, wxControl_SetLabel)(void* _obj, wxChar* text)
+{
+	((wxControl*)_obj)->SetLabel(text);
+}
+	
+EWXWEXPORT(int, wxControl_GetLabel)(void* _obj, void* _buf)
+{
+	wxString result = ((wxControl*)_obj)->GetLabel();
+	return copyStrToBuf(_buf, result); 
+}
+
+EWXWEXPORT(void, wxControl_Command)(void* _obj, void* event)
+{
+	((wxControl*)_obj)->Command(*((wxCommandEvent*) event));
+}
+
+}
diff --git a/wxc/src/eljctxhelp.cpp b/wxc/src/eljctxhelp.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljctxhelp.cpp
@@ -0,0 +1,99 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+#include "wx/cshelp.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxContextHelp_Create)(void* win, int beginHelp)
+{
+	return (void*)new wxContextHelp((wxWindow*)win, beginHelp != 0);
+}
+	
+EWXWEXPORT(void,wxContextHelp_Delete)(void* _obj)
+{
+	delete (wxContextHelp*)_obj;
+}
+	
+EWXWEXPORT(int,wxContextHelp_BeginContextHelp)(void* _obj, void* win)
+{
+	return (int)((wxContextHelp*)_obj)->BeginContextHelp((wxWindow*)win);
+}
+	
+EWXWEXPORT(int,wxContextHelp_EndContextHelp)(void* _obj)
+{
+	return (int)((wxContextHelp*)_obj)->EndContextHelp();
+}
+	
+
+EWXWEXPORT(void*,wxContextHelpButton_Create)(void* parent, int id, int x, int y, int w, int h, long style)
+{
+	return (void*)new wxContextHelpButton((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), style);
+}
+
+
+EWXWEXPORT(void*,wxHelpProvider_Get)()
+{
+	return (void*)wxHelpProvider::Get();
+}
+	
+EWXWEXPORT(void*,wxHelpProvider_Set)(void* helpProvider)
+{
+	return (void*)wxHelpProvider::Set((wxHelpProvider*)helpProvider);
+}
+	
+EWXWEXPORT(int,wxHelpProvider_GetHelp)(void* _obj, void* window, void* _ref)
+{
+        wxString result = ((wxHelpProvider*)_obj)->GetHelp((wxWindowBase*)window);
+        return copyStrToBuf( _ref, result );
+}
+	
+EWXWEXPORT(int,wxHelpProvider_ShowHelp)(void* _obj, void* window)
+{
+	return (int)((wxHelpProvider*)_obj)->ShowHelp((wxWindowBase*)window);
+}
+	
+EWXWEXPORT(void,wxHelpProvider_AddHelp)(void* _obj, void* window, void* text)
+{
+	((wxHelpProvider*)_obj)->AddHelp((wxWindowBase*)window, (wxChar*)text);
+}
+	
+EWXWEXPORT(void,wxHelpProvider_AddHelpById)(void* _obj, int id, void* text)
+{
+	((wxHelpProvider*)_obj)->AddHelp((wxWindowID)id, (wxChar*)text);
+}
+	
+EWXWEXPORT(void,wxHelpProvider_RemoveHelp)(void* _obj, void* window)
+{
+	((wxHelpProvider*)_obj)->RemoveHelp((wxWindowBase*)window);
+}
+	
+EWXWEXPORT(void,wxHelpProvider_Delete)(void* _obj)
+{
+	delete (wxHelpProvider*)_obj;
+}
+
+
+EWXWEXPORT(void*,wxSimpleHelpProvider_Create)()
+{
+	return (void*)new wxSimpleHelpProvider();
+}
+	
+
+EWXWEXPORT(void*,wxHelpControllerHelpProvider_Create)(void* ctr)
+{
+	return (void*)new wxHelpControllerHelpProvider((wxHelpControllerBase*)ctr);
+}
+	
+EWXWEXPORT(void,wxHelpControllerHelpProvider_SetHelpController)(void* _obj, void* hc)
+{
+	((wxHelpControllerHelpProvider*)_obj)->SetHelpController((wxHelpControllerBase*)hc);
+}
+	
+EWXWEXPORT(void*,wxHelpControllerHelpProvider_GetHelpController)(void* _obj)
+{
+	return (void*)((wxHelpControllerHelpProvider*)_obj)->GetHelpController();
+}
+	
+}
+#endif
diff --git a/wxc/src/eljcursor.cpp b/wxc/src/eljcursor.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljcursor.cpp
@@ -0,0 +1,26 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, Cursor_CreateFromStock)(int _id)
+{
+	return (void*) new wxCursor(_id);
+}
+
+EWXWEXPORT(void*, Cursor_CreateFromImage)(wxImage* image)
+{
+	return (void*) new wxCursor(*image);
+}
+
+EWXWEXPORT(void*, Cursor_CreateLoad) (const wxString* name, long type, int width, int height)
+{
+#ifdef __WXGTK__
+// See http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/45999
+	return NULL;
+#else
+	return (void*) new wxCursor(*name, type, width, height);
+#endif
+}
+
+}
diff --git a/wxc/src/eljdataformat.cpp b/wxc/src/eljdataformat.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdataformat.cpp
@@ -0,0 +1,51 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxDataFormat_CreateFromId) (void* name)
+{
+	return (void*) new wxDataFormat ((wxChar*)name);
+}
+
+EWXWEXPORT(void*, wxDataFormat_CreateFromType) (int typ)
+{
+	return (void*) new wxDataFormat ((wxDataFormat::NativeFormat)typ);
+}
+
+EWXWEXPORT(void, wxDataFormat_Delete) (void* _obj)
+{
+	delete (wxDataFormat*)_obj;
+}
+
+EWXWEXPORT(int, wxDataFormat_IsEqual) (void* _obj, void* other)
+{
+	return (int) (*(wxDataFormat*)_obj == *(wxDataFormat*)other);
+}
+
+EWXWEXPORT(int, wxDataFormat_GetId) (void* _obj, void* _buf)
+{
+        wxString result = ((wxDataFormat*)_obj)->GetId();
+        return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(int, wxDataFormat_GetType) (void* _obj)
+{
+	return (int)((wxDataFormat*)_obj)->GetType();
+}
+
+EWXWEXPORT(void, wxDataFormat_SetId) (void* _obj, void* id)
+{
+	((wxDataFormat*)_obj)->SetId((wxChar*) id);
+}
+
+EWXWEXPORT(void, wxDataFormat_SetType) (void* _obj, int typ)
+{
+#ifdef __WIN32__
+	((wxDataFormat*)_obj)->SetType((wxDataFormat::NativeFormat)typ);
+#else
+	((wxDataFormat*)_obj)->SetType((wxDataFormatId)typ);
+#endif
+}
+
+}
diff --git a/wxc/src/eljdatetime.cpp b/wxc/src/eljdatetime.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdatetime.cpp
@@ -0,0 +1,478 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxDateTime_Create)()
+{
+	return (void*) new wxDateTime();
+}
+
+EWXWEXPORT(void, wxDateTime_SetCountry)(int country)
+{
+	wxDateTime::SetCountry((wxDateTime::Country)country);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetCountry)()
+{
+	return (int)wxDateTime::GetCountry();
+}
+	
+EWXWEXPORT(int, wxDateTime_IsWestEuropeanCountry)(int country)
+{
+	return (int)wxDateTime::IsWestEuropeanCountry((wxDateTime::Country)country);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetCurrentYear)(int cal)
+{
+	return wxDateTime::GetCurrentYear((wxDateTime::Calendar)cal);
+}
+	
+EWXWEXPORT(int, wxDateTime_ConvertYearToBC)(int year)
+{
+	return wxDateTime::ConvertYearToBC(year);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetCurrentMonth)(int cal)
+{
+	return (int)wxDateTime::GetCurrentMonth((wxDateTime::Calendar)cal);
+}
+	
+EWXWEXPORT(int, wxDateTime_IsLeapYear)(int year, int cal)
+{
+	return (int)wxDateTime::IsLeapYear(year, (wxDateTime::Calendar)cal);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetCentury)(int year)
+{
+	return wxDateTime::GetCentury(year);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetNumberOfDays)(int year, int cal)
+{
+	return (int)wxDateTime::GetNumberOfDays(year, (wxDateTime::Calendar)cal);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetNumberOfDaysMonth)(int month, int year, int cal)
+{
+	return wxDateTime::GetNumberOfDays((wxDateTime::Month)month, year, (wxDateTime::Calendar)cal);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetMonthName)(int month, int flags, void* _buf)
+{
+	wxString result = wxDateTime::GetMonthName((wxDateTime::Month)month, (wxDateTime::NameFlags)flags);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetWeekDayName)(int weekday, int flags, void* _buf)
+{
+	wxString result = wxDateTime::GetWeekDayName((wxDateTime::WeekDay)weekday, (wxDateTime::NameFlags)flags);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetAmString)(void* _buf)
+{
+	wxString am;
+	wxString pm;
+	wxDateTime::GetAmPmStrings(&am, &pm);
+	return copyStrToBuf(_buf, am);
+}
+	
+EWXWEXPORT(int, wxDateTime_GetPmString)(void* _buf)
+{
+	wxString am;
+	wxString pm;
+	wxDateTime::GetAmPmStrings(&am, &pm);
+	return copyStrToBuf(_buf, pm);
+}
+	
+EWXWEXPORT(int, wxDateTime_IsDSTApplicable)(int year, int country)
+{
+	return (int)wxDateTime::IsDSTApplicable(year, (wxDateTime::Country)country);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetBeginDST)(int year, int country, void* dt)
+{
+	*((wxDateTime*)dt) = wxDateTime::GetBeginDST(year, (wxDateTime::Country)country);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetEndDST)(int year, int country, void* dt)
+{
+	*((wxDateTime*)dt) = wxDateTime::GetEndDST(year, (wxDateTime::Country)country);
+}
+	
+EWXWEXPORT(void, wxDateTime_Now)(void* dt)
+{
+	*((wxDateTime*)dt) = wxDateTime::Now();
+}
+	
+EWXWEXPORT(void, wxDateTime_UNow)(void* dt)
+{
+	*((wxDateTime*)dt) = wxDateTime::UNow();
+}
+	
+EWXWEXPORT(void, wxDateTime_Today)(void* dt)
+{
+	*((wxDateTime*)dt) = wxDateTime::Today();
+}
+	
+EWXWEXPORT(void, wxDateTime_SetToCurrent)(void* _obj)
+{
+	((wxDateTime*)_obj)->SetToCurrent();
+}
+	
+EWXWEXPORT(void, wxDateTime_SetTime)(void* _obj, int hour, int minute, int second, int millisec)
+{
+	((wxDateTime*)_obj)->Set((wxDateTime::wxDateTime_t)hour, (wxDateTime::wxDateTime_t)minute, (wxDateTime::wxDateTime_t)second, (wxDateTime::wxDateTime_t)millisec);
+}
+	
+EWXWEXPORT(void, wxDateTime_Set)(void* _obj, int day, int month, int year, int hour,  int minute, int second, int millisec)
+{
+	((wxDateTime*)_obj)->Set((wxDateTime::wxDateTime_t)day, (wxDateTime::Month)month, year, (wxDateTime::wxDateTime_t)hour,  (wxDateTime::wxDateTime_t)minute, (wxDateTime::wxDateTime_t)second, (wxDateTime::wxDateTime_t)millisec);
+}
+	
+EWXWEXPORT(void, wxDateTime_ResetTime)(void* _obj)
+{
+	((wxDateTime*)_obj)->ResetTime();
+}
+	
+EWXWEXPORT(void, wxDateTime_SetYear)(void* _obj, int year)
+{
+	((wxDateTime*)_obj)->SetYear(year);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetMonth)(void* _obj, int month)
+{
+	((wxDateTime*)_obj)->SetMonth((wxDateTime::Month)month);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetDay)(void* _obj, int day)
+{
+	((wxDateTime*)_obj)->SetDay((wxDateTime::wxDateTime_t)day);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetHour)(void* _obj, int hour)
+{
+	((wxDateTime*)_obj)->SetHour((wxDateTime::wxDateTime_t)hour);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetMinute)(void* _obj, int minute)
+{
+	((wxDateTime*)_obj)->SetMinute((wxDateTime::wxDateTime_t)minute);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetSecond)(void* _obj, int second)
+{
+	((wxDateTime*)_obj)->SetSecond((wxDateTime::wxDateTime_t)second);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetMillisecond)(void* _obj, int millisecond)
+{
+	((wxDateTime*)_obj)->SetMillisecond((wxDateTime::wxDateTime_t)millisecond);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetToWeekDayInSameWeek)(void* _obj, int weekday)
+{
+	((wxDateTime*)_obj)->SetToWeekDayInSameWeek((wxDateTime::WeekDay)weekday);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetWeekDayInSameWeek)(void* _obj, int weekday, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetWeekDayInSameWeek((wxDateTime::WeekDay)weekday);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetToNextWeekDay)(void* _obj, int weekday)
+{
+	((wxDateTime*)_obj)->SetToNextWeekDay((wxDateTime::WeekDay)weekday);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetNextWeekDay)(void* _obj, int weekday, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetNextWeekDay((wxDateTime::WeekDay)weekday);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetToPrevWeekDay)(void* _obj, int weekday)
+{
+	((wxDateTime*)_obj)->SetToPrevWeekDay((wxDateTime::WeekDay)weekday);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetPrevWeekDay)(void* _obj, int weekday, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetPrevWeekDay((wxDateTime::WeekDay)weekday);
+}
+	
+EWXWEXPORT(int, wxDateTime_SetToWeekDay)(void* _obj, int weekday, int n, int month, int year)
+{
+	return (int)((wxDateTime*)_obj)->SetToWeekDay((wxDateTime::WeekDay)weekday, n, (wxDateTime::Month)month, year);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetWeekDay)(void* _obj, int weekday, int n, int month, int year, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetWeekDay((wxDateTime::WeekDay)weekday, n, (wxDateTime::Month)month, year);
+}
+	
+EWXWEXPORT(int, wxDateTime_SetToLastWeekDay)(void* _obj, int weekday, int month, int year)
+{
+	return (int)((wxDateTime*)_obj)->SetToLastWeekDay((wxDateTime::WeekDay)weekday, (wxDateTime::Month)month, year);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetLastWeekDay)(void* _obj, int weekday, int month, int year, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetLastWeekDay((wxDateTime::WeekDay)weekday, (wxDateTime::Month)month, year);
+}
+	
+EWXWEXPORT(void, wxDateTime_SetToLastMonthDay)(void* _obj, int month, int year)
+{
+	((wxDateTime*)_obj)->SetToLastMonthDay((wxDateTime::Month)month, year);
+}
+	
+EWXWEXPORT(void, wxDateTime_GetLastMonthDay)(void* _obj, int month, int year, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetLastMonthDay((wxDateTime::Month)month, year);
+}
+	
+EWXWEXPORT(void, wxDateTime_ToTimezone)(void* _obj, int tz, int noDST)
+{
+	((wxDateTime*)_obj)->ToTimezone(wxDateTime::TimeZone((wxDateTime::TZ)tz), noDST != 0);
+}
+	
+EWXWEXPORT(void, wxDateTime_MakeTimezone)(void* _obj, int tz, int noDST)
+{
+	((wxDateTime*)_obj)->MakeTimezone(wxDateTime::TimeZone((wxDateTime::TZ)tz), noDST != 0);
+}
+	
+EWXWEXPORT(void, wxDateTime_ToGMT)(void* _obj, int noDST)
+{
+	((wxDateTime*)_obj)->ToGMT(noDST != 0);
+}
+	
+EWXWEXPORT(void, wxDateTime_MakeGMT)(void* _obj, int noDST)
+{
+	((wxDateTime*)_obj)->MakeGMT(noDST != 0);
+}
+	
+EWXWEXPORT(int, wxDateTime_IsDST)(void* _obj, int country)
+{
+	return ((wxDateTime*)_obj)->IsDST((wxDateTime::Country)country);
+}
+	
+EWXWEXPORT(int, wxDateTime_IsValid)(void* _obj)
+{
+	return (int)((wxDateTime*)_obj)->IsValid();
+}
+	
+EWXWEXPORT(time_t, wxDateTime_GetTicks)(void* _obj)
+{
+	return ((wxDateTime*)_obj)->GetTicks();
+}
+	
+EWXWEXPORT(int, wxDateTime_GetYear)(void* _obj, int tz)
+{
+	return ((wxDateTime*)_obj)->GetYear(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetMonth)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetMonth(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetDay)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetDay(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetWeekDayTZ)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetWeekDay(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetHour)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetHour(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetMinute)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetMinute(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetSecond)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetSecond(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetMillisecond)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetMillisecond(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetDayOfYear)(void* _obj, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetDayOfYear(wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetWeekOfYear)(void* _obj, int flags, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetWeekOfYear((wxDateTime::WeekFlags)flags, wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_GetWeekOfMonth)(void* _obj, int flags, int tz)
+{
+	return (int)((wxDateTime*)_obj)->GetWeekOfMonth((wxDateTime::WeekFlags)flags, wxDateTime::TimeZone((wxDateTime::TZ)tz));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsWorkDay)(void* _obj, int country)
+{
+	return (int)((wxDateTime*)_obj)->IsWorkDay((wxDateTime::Country)country);
+}
+	
+/*
+EWXWEXPORT(int, wxDateTime_IsGregorianDate)(void* _obj, int country)
+{
+	return (int)((wxDateTime*)_obj)->IsGregorianDate((wxDateTime::GregorianAdoption)country);
+}
+*/
+	
+EWXWEXPORT(int, wxDateTime_IsEqualTo)(void* _obj, void* datetime)
+{
+	return (int)((wxDateTime*)_obj)->IsEqualTo(*((wxDateTime*)datetime));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsEarlierThan)(void* _obj, void* datetime)
+{
+	return (int)((wxDateTime*)_obj)->IsEarlierThan(*((wxDateTime*)datetime));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsLaterThan)(void* _obj, void* datetime)
+{
+	return (int)((wxDateTime*)_obj)->IsLaterThan(*((wxDateTime*)datetime));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsStrictlyBetween)(void* _obj, void* t1, void* t2)
+{
+	return (int)((wxDateTime*)_obj)->IsStrictlyBetween(*((wxDateTime*)t1), *((wxDateTime*)t2));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsBetween)(void* _obj, void* t1, void* t2)
+{
+	return (int)((wxDateTime*)_obj)->IsBetween(*((wxDateTime*)t1), *((wxDateTime*)t2));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsSameDate)(void* _obj, void* dt)
+{
+	return (int)((wxDateTime*)_obj)->IsSameDate(*((wxDateTime*)dt));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsSameTime)(void* _obj, void* dt)
+{
+	return (int)((wxDateTime*)_obj)->IsSameTime(*((wxDateTime*)dt));
+}
+	
+EWXWEXPORT(int, wxDateTime_IsEqualUpTo)(void* _obj, void* dt, void* ts)
+{
+	return (int)((wxDateTime*)_obj)->IsEqualUpTo(*((wxDateTime*)dt), *((wxTimeSpan*)ts));
+}
+	
+EWXWEXPORT(void, wxDateTime_AddTime)(void* _obj,  void* diff, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Add(*((wxTimeSpan*)diff));
+}
+	
+EWXWEXPORT(void, wxDateTime_SubtractTime)(void* _obj, void* diff, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Subtract(*((wxTimeSpan*)diff));
+}
+	
+EWXWEXPORT(void, wxDateTime_AddDate)(void* _obj, void* diff, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Add(*((wxDateSpan*)diff));
+}
+	
+EWXWEXPORT(void, wxDateTime_SubtractDate)(void* _obj, void* diff, void* _ref)
+{
+	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Subtract(*((wxDateSpan*)diff));
+}
+	
+EWXWEXPORT(void*, wxDateTime_ParseRfc822Date)(void* _obj, void* date)
+{
+	return (void*)((wxDateTime*)_obj)->ParseRfc822Date((const wxChar*)date);
+}
+	
+EWXWEXPORT(void*, wxDateTime_ParseFormat)(void* _obj, void* date, void* format, void* dateDef)
+{
+	return (void*)((wxDateTime*)_obj)->ParseFormat((const wxChar*)date, (const wxChar*)format, *((wxDateTime*)dateDef));
+}
+	
+EWXWEXPORT(void*, wxDateTime_ParseDateTime)(void* _obj, void* datetime)
+{
+	return (void*)((wxDateTime*)_obj)->ParseDateTime((const wxChar*)datetime);
+}
+	
+EWXWEXPORT(void*, wxDateTime_ParseDate)(void* _obj, void* date)
+{
+	return (void*)((wxDateTime*)_obj)->ParseDate((const wxChar*)date);
+}
+	
+EWXWEXPORT(void*, wxDateTime_ParseTime)(void* _obj, void* time)
+{
+	return (void*)((wxDateTime*)_obj)->ParseTime((const wxChar*)time);
+}
+	
+EWXWEXPORT(int, wxDateTime_Format)(void* _obj, void* format, int tz, void* _buf)
+{
+	wxString result = ((wxDateTime*)_obj)->Format((const wxChar*)format, wxDateTime::TimeZone((wxDateTime::TZ)tz));
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDateTime_FormatDate)(void* _obj, void* _buf)
+{
+	wxString result = ((wxDateTime*)_obj)->FormatDate();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDateTime_FormatTime)(void* _obj, void* _buf)
+{
+	wxString result = ((wxDateTime*)_obj)->FormatTime();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDateTime_FormatISODate)(void* _obj, void* _buf)
+{
+	wxString result = ((wxDateTime*)_obj)->FormatISODate();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDateTime_FormatISOTime)(void* _obj, void* _buf)
+{
+	wxString result = ((wxDateTime*)_obj)->FormatISOTime();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void*, wxDateTime_wxDateTime)(long hi_long, unsigned long lo_long)
+{
+	return (void*) new wxDateTime(wxLongLong(hi_long, lo_long));
+}
+	
+EWXWEXPORT(void, wxDateTime_GetValue)(void* _obj, long* hi_long, unsigned long* lo_long)
+{
+	wxLongLong val = ((wxDateTime*)_obj)->GetValue();
+	*hi_long = val.GetHi();
+	*lo_long = val.GetLo();
+}
+	
+EWXWEXPORT(int, wxDateTime_GetTimeNow)()
+{
+	return (int)wxDateTime::GetTimeNow();
+}
+	
+EWXWEXPORT(void, wxDateTime_AddTimeValues)(void* _obj,  int _hrs, int _min, int _sec, int _mls)
+{
+	((wxDateTime*)_obj)->Add(wxTimeSpan((long)_hrs, (long)_min, (long)_sec, (long)_mls));
+}
+	
+EWXWEXPORT(void, wxDateTime_AddDateValues)(void* _obj,  int _yrs, int _mnt, int _wek, int _day)
+{
+	((wxDateTime*)_obj)->Add(wxDateSpan((long)_yrs, (long)_mnt, (long)_wek, (long)_day));
+}
+	
+}
diff --git a/wxc/src/eljdc.cpp b/wxc/src/eljdc.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdc.cpp
@@ -0,0 +1,590 @@
+#include "wrapper.h"
+#include "wx/metafile.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void, wxDC_Delete) (void* _obj)
+{
+	delete (wxDC*) _obj;
+}
+
+EWXWEXPORT(void, wxDC_BeginDrawing)(void* _obj)
+{
+	((wxDC*)_obj)->BeginDrawing();
+}
+	
+EWXWEXPORT(void, wxDC_EndDrawing)(void* _obj)
+{
+	((wxDC*)_obj)->EndDrawing();
+}
+	
+EWXWEXPORT(void, wxDC_FloodFill)(void* _obj, int x, int y, void* col, int style)
+{
+	((wxDC*)_obj)->FloodFill((wxCoord)x, (wxCoord)y, *((wxColour*)col), style);
+}
+	
+EWXWEXPORT(int, wxDC_GetPixel)(void* _obj, int x, int y, void* col)
+{
+	return ((wxDC*)_obj)->GetPixel((wxCoord)x, (wxCoord)y, (wxColour*)col);
+}
+	
+EWXWEXPORT(void, wxDC_DrawLine)(void* _obj, int x1, int y1, int x2, int y2)
+{
+	((wxDC*)_obj)->DrawLine((wxCoord)x1, (wxCoord)y1, (wxCoord)x2, (wxCoord)y2);
+}
+	
+EWXWEXPORT(void, wxDC_CrossHair)(void* _obj, int x, int y)
+{
+	((wxDC*)_obj)->CrossHair((wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(void, wxDC_DrawArc)(void* _obj, int x1, int y1, int x2, int y2, int xc, int yc)
+{
+	((wxDC*)_obj)->DrawArc((wxCoord)x1, (wxCoord)y1, (wxCoord)x2, (wxCoord)y2, (wxCoord)xc, (wxCoord)yc);
+}
+	
+EWXWEXPORT(void, wxDC_DrawCheckMark)(void* _obj, int x, int y, int width, int height)
+{
+	((wxDC*)_obj)->DrawCheckMark((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(void, wxDC_DrawEllipticArc)(void* _obj, int x, int y, int w, int h, double sa, double ea)
+{
+	((wxDC*)_obj)->DrawEllipticArc((wxCoord)x, (wxCoord)y, (wxCoord)w, (wxCoord)h, sa, ea);
+}
+	
+EWXWEXPORT(void, wxDC_DrawPoint)(void* _obj, int x, int y)
+{
+	((wxDC*)_obj)->DrawPoint((wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(void, wxDC_DrawLines)(void* _obj, int n, void* x, void* y, int xoffset, int yoffset)
+{
+	wxPoint* lst = (wxPoint*)malloc (n * sizeof(wxPoint));
+	
+	for (int i = 0; i < n; i++)
+		lst[i] = wxPoint((int)((intptr_t*)x)[i], (int)((intptr_t*)y)[i]);
+	
+	((wxDC*)_obj)->DrawLines(n, lst, (wxCoord)xoffset, (wxCoord)yoffset);
+	
+	free (lst);
+}
+	
+EWXWEXPORT(void, wxDC_DrawPolygon)(void* _obj, int n, void* x, void* y, int xoffset, int yoffset, int fillStyle)
+{
+	wxPoint* lst = (wxPoint*)malloc (n * sizeof(wxPoint));
+	
+	for (int i = 0; i < n; i++)
+		lst[i] = wxPoint(((intptr_t*)x)[i], ((intptr_t*)y)[i]);
+	
+	((wxDC*)_obj)->DrawPolygon(n, lst, (wxCoord)xoffset, (wxCoord)yoffset, fillStyle);
+	
+	free (lst);
+}
+	
+EWXWEXPORT(void, wxDC_DrawRectangle)(void* _obj, int x, int y, int width, int height)
+{
+	((wxDC*)_obj)->DrawRectangle((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(void, wxDC_DrawRoundedRectangle)(void* _obj, int x, int y, int width, int height, double radius)
+{
+	((wxDC*)_obj)->DrawRoundedRectangle((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height, radius);
+}
+	
+EWXWEXPORT(void, wxDC_DrawCircle)(void* _obj, int x, int y, int radius)
+{
+	((wxDC*)_obj)->DrawCircle((wxCoord)x, (wxCoord)y, (wxCoord)radius);
+}
+	
+EWXWEXPORT(void, wxDC_DrawEllipse)(void* _obj, int x, int y, int width, int height)
+{
+	((wxDC*)_obj)->DrawEllipse((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(void, wxDC_DrawIcon)(void* _obj, void* icon, int x, int y)
+{
+	((wxDC*)_obj)->DrawIcon(*((wxIcon*)icon), (wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(void, wxDC_DrawBitmap)(void* _obj, void* bmp, int x, int y, int useMask)
+{
+	((wxDC*)_obj)->DrawBitmap(*((wxBitmap*)bmp), (wxCoord)x, (wxCoord)y, useMask != 0);
+}
+	
+EWXWEXPORT(void, wxDC_DrawText)(void* _obj, void* text, int x, int y)
+{
+	((wxDC*)_obj)->DrawText((wxChar*)text, (wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(void, wxDC_DrawRotatedText)(void* _obj, void* text, int x, int y, double angle)
+{
+	((wxDC*)_obj)->DrawRotatedText((wxChar*)text, (wxCoord)x, (wxCoord)y, angle);
+}
+	
+EWXWEXPORT(int, wxDC_Blit)(void* _obj, int xdest, int ydest, int width, int height, void* source, int xsrc, int ysrc, int rop, int useMask)
+{
+	return (int)((wxDC*)_obj)->Blit((wxCoord)xdest, (wxCoord)ydest, (wxCoord)width, (wxCoord)height, (wxDC*)source, (wxCoord)xsrc, (wxCoord)ysrc, rop, useMask != 0);
+}
+	
+EWXWEXPORT(void, wxDC_Clear)(void* _obj)
+{
+	((wxDC*)_obj)->Clear();
+}
+	
+EWXWEXPORT(int, wxDC_StartDoc)(void* _obj, void* msg)
+{
+	return (int)((wxDC*)_obj)->StartDoc((wxChar*)msg);
+}
+	
+EWXWEXPORT(void, wxDC_EndDoc)(void* _obj)
+{
+	((wxDC*)_obj)->EndDoc();
+}
+	
+EWXWEXPORT(void, wxDC_StartPage)(void* _obj)
+{
+	((wxDC*)_obj)->StartPage();
+}
+	
+EWXWEXPORT(void, wxDC_EndPage)(void* _obj)
+{
+	((wxDC*)_obj)->EndPage();
+}
+	
+EWXWEXPORT(void, wxDC_SetFont)(void* _obj, void* font)
+{
+	((wxDC*)_obj)->SetFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(void, wxDC_SetPen)(void* _obj, void* pen)
+{
+	((wxDC*)_obj)->SetPen(*((wxPen*)pen));
+}
+	
+EWXWEXPORT(void, wxDC_SetBrush)(void* _obj, void* brush)
+{
+	((wxDC*)_obj)->SetBrush(*((wxBrush*)brush));
+}
+	
+EWXWEXPORT(void, wxDC_SetBackground)(void* _obj, void* brush)
+{
+	((wxDC*)_obj)->SetBackground(*((wxBrush*)brush));
+}
+	
+EWXWEXPORT(void, wxDC_SetBackgroundMode)(void* _obj, int mode)
+{
+	((wxDC*)_obj)->SetBackgroundMode(mode);
+}
+	
+EWXWEXPORT(void, wxDC_SetPalette)(void* _obj, void* palette)
+{
+	((wxDC*)_obj)->SetPalette(*((wxPalette*)palette));
+}
+	
+EWXWEXPORT(void, wxDC_SetClippingRegion)(void* _obj, int x, int y, int width, int height)
+{
+	((wxDC*)_obj)->SetClippingRegion((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(void, wxDC_SetClippingRegionFromRegion)(void* _obj, void* region)
+{
+	((wxDC*)_obj)->SetClippingRegion(*((wxRegion*)region));
+}
+	
+EWXWEXPORT(void, wxDC_DestroyClippingRegion)(void* _obj)
+{
+	((wxDC*)_obj)->DestroyClippingRegion();
+}
+	
+EWXWEXPORT(void, wxDC_GetClippingBox)(void* _obj, void* x, void* y, void* w, void* h)
+{
+	((wxDC*)_obj)->GetClippingBox((wxCoord*)x, (wxCoord*)y, (wxCoord*)w, (wxCoord*)h);
+}
+	
+EWXWEXPORT(int, wxDC_GetCharHeight)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->GetCharHeight();
+}
+	
+EWXWEXPORT(int, wxDC_GetCharWidth)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->GetCharWidth();
+}
+	
+EWXWEXPORT(void, wxDC_GetTextExtent)(void* _obj, void* string, void* x, void* y, void* descent, void* externalLeading, void* theFont)
+{
+	((wxDC*)_obj)->GetTextExtent((wxChar*)string, (wxCoord*)x, (wxCoord*)y, (wxCoord*)descent, (wxCoord*)externalLeading, (wxFont*)theFont);
+}
+	
+EWXWEXPORT(void, wxDC_GetSize)(void* _obj, void* width, void* height)
+{
+	((wxDC*)_obj)->GetSize((int*)width, (int*)height);
+}
+	
+EWXWEXPORT(void, wxDC_GetSizeMM)(void* _obj, void* width, void* height)
+{
+	((wxDC*)_obj)->GetSizeMM((int*)width, (int*)height);
+}
+	
+EWXWEXPORT(int, wxDC_DeviceToLogicalX)(void* _obj, int x)
+{
+	return (int)((wxDC*)_obj)->DeviceToLogicalX((wxCoord)x);
+}
+	
+EWXWEXPORT(int, wxDC_DeviceToLogicalY)(void* _obj, int y)
+{
+	return (int)((wxDC*)_obj)->DeviceToLogicalY((wxCoord)y);
+}
+	
+EWXWEXPORT(int, wxDC_DeviceToLogicalXRel)(void* _obj, int x)
+{
+	return (int)((wxDC*)_obj)->DeviceToLogicalXRel((wxCoord)x);
+}
+	
+EWXWEXPORT(int, wxDC_DeviceToLogicalYRel)(void* _obj, int y)
+{
+	return (int)((wxDC*)_obj)->DeviceToLogicalYRel((wxCoord)y);
+}
+	
+EWXWEXPORT(int, wxDC_LogicalToDeviceX)(void* _obj, int x)
+{
+	return (int)((wxDC*)_obj)->LogicalToDeviceX((wxCoord)x);
+}
+	
+EWXWEXPORT(int, wxDC_LogicalToDeviceY)(void* _obj, int y)
+{
+	return (int)((wxDC*)_obj)->LogicalToDeviceY((wxCoord)y);
+}
+	
+EWXWEXPORT(int, wxDC_LogicalToDeviceXRel)(void* _obj, int x)
+{
+	return (int)((wxDC*)_obj)->LogicalToDeviceXRel((wxCoord)x);
+}
+	
+EWXWEXPORT(int, wxDC_LogicalToDeviceYRel)(void* _obj, int y)
+{
+	return (int)((wxDC*)_obj)->LogicalToDeviceYRel((wxCoord)y);
+}
+	
+EWXWEXPORT(int, wxDC_CanDrawBitmap)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->CanDrawBitmap();
+}
+	
+EWXWEXPORT(int, wxDC_CanGetTextExtent)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->CanGetTextExtent();
+}
+	
+EWXWEXPORT(int, wxDC_GetDepth)(void* _obj)
+{
+	return ((wxDC*)_obj)->GetDepth();
+}
+	
+EWXWEXPORT(void, wxDC_GetPPI)(void* _obj, void* width, void* height)
+{
+	wxSize result = ((wxDC*)_obj)->GetPPI();
+	*((int*)width)  = result.x;
+	*((int*)height) = result.y;
+}
+	
+EWXWEXPORT(int, wxDC_Ok)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->Ok();
+}
+	
+EWXWEXPORT(int, wxDC_GetBackgroundMode)(void* _obj)
+{
+	return ((wxDC*)_obj)->GetBackgroundMode();
+}
+	
+EWXWEXPORT(void, wxDC_GetBackground)(void* _obj, void* _ref)
+{
+	*((wxBrush*)_ref) = ((wxDC*)_obj)->GetBackground();
+}
+	
+EWXWEXPORT(void, wxDC_GetBrush)(void* _obj, void* _ref)
+{
+	*((wxBrush*)_ref) = ((wxDC*)_obj)->GetBrush();
+}
+	
+EWXWEXPORT(void, wxDC_GetFont)(void* _obj, void* _ref)
+{
+	*((wxFont*)_ref) = ((wxDC*)_obj)->GetFont();
+}
+	
+EWXWEXPORT(void, wxDC_GetPen)(void* _obj, void* _ref)
+{
+	*((wxPen*)_ref) = ((wxDC*)_obj)->GetPen();
+}
+	
+EWXWEXPORT(void, wxDC_GetTextBackground)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxDC*)_obj)->GetTextBackground();
+}
+	
+EWXWEXPORT(void, wxDC_GetTextForeground)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxDC*)_obj)->GetTextForeground();
+}
+	
+EWXWEXPORT(void, wxDC_SetTextForeground)(void* _obj, void* colour)
+{
+	((wxDC*)_obj)->SetTextForeground(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxDC_SetTextBackground)(void* _obj, void* colour)
+{
+	((wxDC*)_obj)->SetTextBackground(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(int, wxDC_GetMapMode)(void* _obj)
+{
+	return ((wxDC*)_obj)->GetMapMode();
+}
+	
+EWXWEXPORT(void, wxDC_SetMapMode)(void* _obj, int mode)
+{
+	((wxDC*)_obj)->SetMapMode(mode);
+}
+	
+EWXWEXPORT(void, wxDC_GetUserScale)(void* _obj, void* x, void* y)
+{
+	((wxDC*)_obj)->GetUserScale((double*)x, (double*)y);
+}
+	
+EWXWEXPORT(void, wxDC_SetUserScale)(void* _obj, double x, double y)
+{
+	((wxDC*)_obj)->SetUserScale(x, y);
+}
+	
+EWXWEXPORT(void, wxDC_GetLogicalScale)(void* _obj, void* x, void* y)
+{
+	((wxDC*)_obj)->GetLogicalScale((double*)x, (double*)y);
+}
+	
+EWXWEXPORT(void, wxDC_SetLogicalScale)(void* _obj, double x, double y)
+{
+	((wxDC*)_obj)->SetLogicalScale(x, y);
+}
+	
+EWXWEXPORT(void, wxDC_GetLogicalOrigin)(void* _obj, void* x, void* y)
+{
+	((wxDC*)_obj)->GetLogicalOrigin((wxCoord*)x, (wxCoord*)y);
+}
+	
+EWXWEXPORT(void, wxDC_SetLogicalOrigin)(void* _obj, int x, int y)
+{
+	((wxDC*)_obj)->SetLogicalOrigin((wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(void, wxDC_GetDeviceOrigin)(void* _obj, void* x, void* y)
+{
+	((wxDC*)_obj)->GetDeviceOrigin((wxCoord*)x, (wxCoord*)y);
+}
+	
+EWXWEXPORT(void, wxDC_SetDeviceOrigin)(void* _obj, int x, int y)
+{
+	((wxDC*)_obj)->SetDeviceOrigin((wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(void, wxDC_SetAxisOrientation)(void* _obj, int xLeftRight, int yBottomUp)
+{
+	((wxDC*)_obj)->SetAxisOrientation(xLeftRight != 0, yBottomUp != 0);
+}
+	
+EWXWEXPORT(int, wxDC_GetLogicalFunction)(void* _obj)
+{
+	return ((wxDC*)_obj)->GetLogicalFunction();
+}
+	
+EWXWEXPORT(void, wxDC_SetLogicalFunction)(void* _obj, int function)
+{
+	((wxDC*)_obj)->SetLogicalFunction(function);
+}
+	
+EWXWEXPORT(void, wxDC_CalcBoundingBox)(void* _obj, int x, int y)
+{
+	((wxDC*)_obj)->CalcBoundingBox((wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(void, wxDC_ResetBoundingBox)(void* _obj)
+{
+	((wxDC*)_obj)->ResetBoundingBox();
+}
+	
+EWXWEXPORT(int, wxDC_MinX)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->MinX();
+}
+	
+EWXWEXPORT(int, wxDC_MaxX)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->MaxX();
+}
+	
+EWXWEXPORT(int, wxDC_MinY)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->MinY();
+}
+	
+EWXWEXPORT(int, wxDC_MaxY)(void* _obj)
+{
+	return (int)((wxDC*)_obj)->MaxY();
+}
+
+EWXWEXPORT(void*, wxWindowDC_Create) (void* win)
+{
+	return (void*) new wxWindowDC((wxWindow*)win);
+}
+
+EWXWEXPORT(void, wxWindowDC_Delete) (void* _obj)
+{
+	delete (wxWindowDC*)_obj;
+}
+
+EWXWEXPORT(void*, wxClientDC_Create) (void* win)
+{
+	return (void*) new wxClientDC((wxWindow*)win);
+}
+
+EWXWEXPORT(void, wxClientDC_Delete) (void* _obj)
+{
+	delete (wxClientDC*)_obj;
+}
+
+EWXWEXPORT(void*, wxPaintDC_Create) (void* win)
+{
+	return (void*) new wxPaintDC((wxWindow*)win);
+}
+
+EWXWEXPORT(void, wxPaintDC_Delete) (void* _obj)
+{
+	delete (wxPaintDC*)_obj;
+}
+
+EWXWEXPORT(void*, wxMemoryDC_Create) ()
+{
+	return (void*) new wxMemoryDC();
+}
+
+EWXWEXPORT(void*, wxMemoryDC_CreateCompatible) (void* dc)
+{
+	return (void*) new wxMemoryDC((wxDC*) dc);
+}
+
+EWXWEXPORT(void, wxMemoryDC_Delete) (void* _obj)
+{
+	delete (wxMemoryDC*)_obj;
+}
+
+EWXWEXPORT(void, wxMemoryDC_SelectObject)(void* _obj, void* bitmap)
+{
+	((wxMemoryDC*)_obj)->SelectObject(*((wxBitmap*)bitmap));
+}
+	
+EWXWEXPORT(void*, wxScreenDC_Create) ()
+{
+	return (void*) new wxScreenDC();
+}
+
+EWXWEXPORT(void, wxScreenDC_Delete) (void* _obj)
+{
+	delete (wxScreenDC*)_obj;
+}
+
+EWXWEXPORT(int, wxScreenDC_StartDrawingOnTopOfWin)(void* _obj, void* win)
+{
+	return (int)((wxScreenDC*)_obj)->StartDrawingOnTop((wxWindow*)win);
+}
+	
+EWXWEXPORT(int, wxScreenDC_StartDrawingOnTop)(void* _obj, int l, int t, int w, int h)
+{
+	wxRect rect(l, t, w, h);
+	return (int)((wxScreenDC*)_obj)->StartDrawingOnTop(&rect);
+}
+	
+EWXWEXPORT(int, wxScreenDC_EndDrawingOnTop)(void* _obj)
+{
+	return (int)((wxScreenDC*)_obj)->EndDrawingOnTop();
+}
+	
+EWXWEXPORT(void*,wxMetafileDC_Create)(void* _file)
+{
+#if defined(__WXGTK__) || defined(__WXMAC__) 
+	return NULL;
+#else
+	wxString file;
+	
+	if (_file) file = (wxChar*)_file;
+
+    return (void*)new wxMetafileDC(file);
+#endif
+}
+
+EWXWEXPORT(void*, wxMetafileDC_Close) (void* _obj)
+{
+#if defined(__WXGTK__)
+	return NULL;
+#else
+	return (void*)((wxMetafileDC*)_obj)->Close();
+#endif
+}
+
+EWXWEXPORT(void, wxMetafileDC_Delete) (void* _obj)
+{
+#if !defined(__WXGTK__)
+	delete (wxMetafileDC*)_obj;
+#endif
+}
+
+EWXWEXPORT(void*,wxMetafile_Create)(void* _file)
+{
+#if defined(__WXGTK__)
+	return NULL;
+#else
+	wxString file;
+	
+	if (_file) file = (wxChar*)_file;
+
+    return (void*)new wxMetafile(file);
+#endif
+}
+
+EWXWEXPORT(int,wxMetafile_SetClipboard)(void* _obj, int width, int height)
+{
+#if defined(__WXGTK__)
+	return 0;
+#else
+	return (int)((wxMetafile*)_obj)->SetClipboard(width, height);
+#endif
+}
+	
+EWXWEXPORT(int,wxMetafile_Play)(void* _obj, void* _dc)
+{
+#if defined(__WXGTK__)
+	return 0;
+#else
+	return (int)((wxMetafile*)_obj)->Play((wxDC*)_dc);
+#endif
+}
+	
+EWXWEXPORT(int,wxMetafile_Ok)(void* _obj)
+{
+#if defined(__WXGTK__)
+	return 0;
+#else
+	return (int)((wxMetafile*)_obj)->Ok();
+#endif
+}
+	
+EWXWEXPORT(void, wxMetafile_Delete) (void* _obj)
+{
+#if !defined(__WXGTK__)
+	delete (wxMetafile*)_obj;
+#endif
+}
+
+}
diff --git a/wxc/src/eljdcsvg.cpp b/wxc/src/eljdcsvg.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdcsvg.cpp
@@ -0,0 +1,32 @@
+#include "wrapper.h"
+#include "wx/svg/dcsvg.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxSVGFileDC_Create)(void* a_filename)
+{
+	return (void*) new wxSVGFileDC((char*)a_filename);
+}
+
+EWXWEXPORT(void*, wxSVGFileDC_CreateWithSize)(void* a_filename, int a_width, int a_height)
+{
+	return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height);
+}
+
+EWXWEXPORT(void*, wxSVGFileDC_CreateWithSizeAndResolution)(void* a_filename, int a_width, int a_height, float a_dpi)
+{
+	return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height, a_dpi);
+}
+
+EWXWEXPORT(void, wxSVGFileDC_Delete) (void* _obj)
+{
+	delete (wxSVGFileDC*)_obj;
+}
+
+EWXWEXPORT(void, wxSVGFileDC_ComputeScaleAndOrigin) (void* _obj)
+{
+	((wxSVGFileDC*)_obj)->ComputeScaleAndOrigin();
+}
+
+}
diff --git a/wxc/src/eljdialog.cpp b/wxc/src/eljdialog.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdialog.cpp
@@ -0,0 +1,43 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxDialog_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxDialog ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(int, wxDialog_IsModal)(void* _obj)
+{
+	return (int)((wxDialog*)_obj)->IsModal();
+}
+	
+EWXWEXPORT(int, wxDialog_ShowModal)(void* _obj)
+{
+	return ((wxDialog*)_obj)->ShowModal();
+}
+	
+EWXWEXPORT(void, wxDialog_EndModal)(void* _obj, int retCode)
+{
+	((wxDialog*)_obj)->EndModal(retCode);
+}
+	
+EWXWEXPORT(void, wxDialog_SetReturnCode)(void* _obj, int returnCode)
+{
+	((wxDialog*)_obj)->SetReturnCode(returnCode);
+}
+	
+EWXWEXPORT(int, wxDialog_GetReturnCode)(void* _obj)
+{
+	return ((wxDialog*)_obj)->GetReturnCode();
+}
+	
+#if wxVERSION_NUMBER >= 2400
+EWXWEXPORT(void, wxDialog_SetIcons)(void* _obj, void* _icons)
+{
+	((wxDialog*)_obj)->SetIcons(*((wxIconBundle*)_icons));
+}
+#endif
+
+}
diff --git a/wxc/src/eljdialup.cpp b/wxc/src/eljdialup.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdialup.cpp
@@ -0,0 +1,102 @@
+#include "wrapper.h"
+#include "wx/dialup.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxDialUpManager_Create)()
+{
+	return (void*) wxDialUpManager::Create();
+}
+
+EWXWEXPORT(void,wxDialUpManager_Delete)(void* _obj)
+{
+	delete (wxDialUpManager*)_obj;
+}
+
+EWXWEXPORT(int,wxDialUpManager_IsOk)(void* _obj)
+{
+	return (int)((wxDialUpManager*)_obj)->IsOk();
+}
+	
+EWXWEXPORT(int,wxDialUpManager_GetISPNames)(void* _obj, void* _lst)
+{
+	wxArrayString arr;
+	((wxDialUpManager*)_obj)->GetISPNames(arr);
+
+	if (_lst)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((wxChar**)_lst)[i] = wxStrdup(arr.Item(i).c_str());
+	}
+
+	return arr.GetCount();
+}
+	
+EWXWEXPORT(int,wxDialUpManager_Dial)(void* _obj, void* nameOfISP, void* username, void* password, int async)
+{
+	return (int)((wxDialUpManager*)_obj)->Dial((const wxChar*)nameOfISP, (const wxChar*)username, (const wxChar*)password, async != 0);
+}
+	
+EWXWEXPORT(int,wxDialUpManager_IsDialing)(void* _obj)
+{
+	return (int)((wxDialUpManager*)_obj)->IsDialing();
+}
+	
+EWXWEXPORT(int,wxDialUpManager_CancelDialing)(void* _obj)
+{
+	return (int)((wxDialUpManager*)_obj)->CancelDialing();
+}
+	
+EWXWEXPORT(int,wxDialUpManager_HangUp)(void* _obj)
+{
+	return (int)((wxDialUpManager*)_obj)->HangUp();
+}
+	
+EWXWEXPORT(int,wxDialUpManager_IsAlwaysOnline)(void* _obj)
+{
+	return (int)((wxDialUpManager*)_obj)->IsAlwaysOnline();
+}
+	
+EWXWEXPORT(int,wxDialUpManager_IsOnline)(void* _obj)
+{
+	return (int)((wxDialUpManager*)_obj)->IsOnline();
+}
+	
+EWXWEXPORT(void,wxDialUpManager_SetOnlineStatus)(void* _obj, int isOnline)
+{
+	((wxDialUpManager*)_obj)->SetOnlineStatus(isOnline != 0);
+}
+	
+EWXWEXPORT(int,wxDialUpManager_EnableAutoCheckOnlineStatus)(void* _obj, int nSeconds)
+{
+	return (int)((wxDialUpManager*)_obj)->EnableAutoCheckOnlineStatus((size_t)nSeconds);
+}
+	
+EWXWEXPORT(void,wxDialUpManager_DisableAutoCheckOnlineStatus)(void* _obj)
+{
+	((wxDialUpManager*)_obj)->DisableAutoCheckOnlineStatus();
+}
+	
+EWXWEXPORT(void,wxDialUpManager_SetWellKnownHost)(void* _obj, void* hostname, int portno)
+{
+	((wxDialUpManager*)_obj)->SetWellKnownHost((const wxChar*)hostname, portno);
+}
+	
+EWXWEXPORT(void,wxDialUpManager_SetConnectCommand)(void* _obj, void* commandDial, void* commandHangup)
+{
+	((wxDialUpManager*)_obj)->SetConnectCommand((const wxChar*)commandDial, (const wxChar*)commandHangup);
+}
+	
+
+EWXWEXPORT(int,wxDialUpEvent_IsConnectedEvent)(void* _obj)
+{
+	return (int)((wxDialUpEvent*)_obj)->IsConnectedEvent();
+}
+	
+EWXWEXPORT(int,wxDialUpEvent_IsOwnEvent)(void* _obj)
+{
+	return (int)((wxDialUpEvent*)_obj)->IsOwnEvent();
+}
+	
+}
diff --git a/wxc/src/eljdirdlg.cpp b/wxc/src/eljdirdlg.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdirdlg.cpp
@@ -0,0 +1,43 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxDirDialog_Create) (void* _prt, void* _msg, void* _dir, int _lft, int _top, int _stl)
+{
+	return (void*) new wxDirDialog ((wxWindow*)_prt, (wxChar*)_msg, (wxChar*) _dir, _stl, wxPoint(_lft, _top));
+}
+
+EWXWEXPORT(void, wxDirDialog_SetMessage)(void* _obj, void* msg)
+{
+	((wxDirDialog*)_obj)->SetMessage((wxChar*)msg);
+}
+	
+EWXWEXPORT(void, wxDirDialog_SetPath)(void* _obj, void* pth)
+{
+	((wxDirDialog*)_obj)->SetPath((wxChar*) pth);
+}
+	
+EWXWEXPORT(void, wxDirDialog_SetStyle)(void* _obj, int style)
+{
+	((wxDirDialog*)_obj)->SetStyle((long)style);
+}
+	
+EWXWEXPORT(int, wxDirDialog_GetMessage)(void* _obj, void* _buf)
+{
+	wxString result =((wxDirDialog*)_obj)->GetMessage();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDirDialog_GetPath)(void* _obj, void* _buf)
+{
+	wxString result =((wxDirDialog*)_obj)->GetPath();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxDirDialog_GetStyle)(void* _obj)
+{
+	return (int)((wxDirDialog*)_obj)->GetStyle();
+}
+	
+}
diff --git a/wxc/src/eljdnd.cpp b/wxc/src/eljdnd.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdnd.cpp
@@ -0,0 +1,392 @@
+#include "wrapper.h"
+
+wxDragResult ELJTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_data_func)
+		return (wxDragResult) on_data_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxTextDropTarget::OnData(x, y, def);
+}
+
+bool ELJTextDropTarget::OnDrop(wxCoord x, wxCoord y)
+{
+	if (on_drop_func)
+		return (bool) on_drop_func(obj, (long)x, (long)y);
+	else
+		return wxTextDropTarget::OnDrop(x, y);
+}
+
+wxDragResult ELJTextDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_enter_func)
+		return (wxDragResult) on_enter_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxTextDropTarget::OnEnter(x, y, def);
+}
+
+wxDragResult ELJTextDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_drag_func)
+		return (wxDragResult) on_drag_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxTextDropTarget::OnDragOver(x, y, def);
+}
+
+void ELJTextDropTarget::OnLeave()
+{
+	if (on_leave_func)
+		on_leave_func(obj);
+	else
+		wxTextDropTarget::OnLeave();
+}
+
+wxDragResult ELJFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_data_func)
+		return (wxDragResult) on_data_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxFileDropTarget::OnData(x, y, def);
+}
+
+bool ELJFileDropTarget::OnDrop(wxCoord x, wxCoord y)
+{
+	if (on_drop_func)
+		return (bool) on_drop_func(obj, (long)x, (long)y);
+	else
+		return wxFileDropTarget::OnDrop(x, y);
+}
+
+wxDragResult ELJFileDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_enter_func)
+		return (wxDragResult) on_enter_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxFileDropTarget::OnEnter(x, y, def);
+}
+
+wxDragResult ELJFileDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_drag_func)
+		return (wxDragResult) on_drag_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxFileDropTarget::OnDragOver(x, y, def);
+}
+
+void ELJFileDropTarget::OnLeave()
+{
+	if (on_leave_func)
+		on_leave_func(obj);
+	else
+		wxFileDropTarget::OnLeave();
+}
+
+wxDragResult ELJDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_data_func)
+		return (wxDragResult) on_data_func(obj, (long)x, (long)y, (int) def);
+	else
+	{
+		GetData();
+		return def;
+	}
+}
+
+bool ELJDropTarget::OnDrop(wxCoord x, wxCoord y)
+{
+	if (on_drop_func)
+		return (bool) on_drop_func(obj, (long)x, (long)y);
+	else
+		return wxDropTarget::OnDrop(x, y);
+}
+
+wxDragResult ELJDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_enter_func)
+		return (wxDragResult) on_enter_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxDropTarget::OnEnter(x, y, def);
+}
+
+wxDragResult ELJDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (on_drag_func)
+		return (wxDragResult) on_drag_func(obj, (long)x, (long)y, (int) def);
+	else
+		return wxDropTarget::OnDragOver(x, y, def);
+}
+
+void ELJDropTarget::OnLeave()
+{
+	if (on_leave_func)
+		on_leave_func(obj);
+	else
+		wxDropTarget::OnLeave();
+}
+
+bool ELJFileDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
+{
+	bool result = false;
+	const wxChar** arr = (const wxChar**)malloc (sizeof(wxChar*) * filenames.GetCount());
+	
+	for (unsigned int i = 0; i < filenames.GetCount(); i++)
+		arr[i] = filenames.Item(i).c_str();
+	
+	result = func(obj, (long)x, (long)y, (void*)arr, (int)filenames.GetCount()) != 0;
+	free(arr);
+	
+	return result;
+}
+
+bool ELJTextDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& text)
+{
+	return func(obj, (long)x, (long)y, (void*)text.c_str()) != 0;
+}
+
+extern "C"
+{
+
+EWXWEXPORT(void*, ELJFileDropTarget_Create)(void* _obj, void* _func)
+{
+	return (void*) new ELJFileDropTarget(_obj, (FileDropFunc)_func);
+}
+
+EWXWEXPORT(void, ELJFileDropTarget_Delete)(void* _obj)
+{
+	delete (ELJFileDropTarget*)_obj;
+}
+
+EWXWEXPORT(void*, ELJTextDropTarget_Create)(void* _obj, void* _func)
+{
+	return (void*) new ELJTextDropTarget(_obj, (TextDropFunc)_func);
+}
+
+EWXWEXPORT(void, ELJTextDropTarget_Delete)(void* _obj)
+{
+	delete (ELJTextDropTarget*)_obj;
+}
+
+EWXWEXPORT(void*, TextDataObject_Create)(void* _txt)
+{
+	return (void*) new wxTextDataObject((wxChar*)_txt);
+}
+
+EWXWEXPORT(void, TextDataObject_Delete)(void* _obj)
+{
+	delete (wxTextDataObject*)_obj;
+}
+
+EWXWEXPORT(size_t, TextDataObject_GetTextLength)(void* _obj)
+{
+	return ((wxTextDataObject*)_obj)->GetTextLength();
+}
+
+EWXWEXPORT(int, TextDataObject_GetText)(void* _obj, void* _buf)
+{
+	wxString result =((wxTextDataObject*)_obj)->GetText();
+	return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(void, TextDataObject_SetText)(void* _obj, const wxString* strText)
+{
+	((wxTextDataObject*)_obj)->SetText(*strText);
+}
+
+EWXWEXPORT(void*, FileDataObject_Create)(int _cnt, void* _lst )
+{
+	wxFileDataObject* result = new wxFileDataObject();
+	if (_cnt)
+	{
+		for (int i = 0; i < _cnt; i++)
+			result->AddFile(((wxChar**)_lst)[i]);
+	}
+	return (void*) result;
+}
+
+EWXWEXPORT(void, FileDataObject_Delete)(void* _obj)
+{
+	delete (wxFileDataObject*)_obj;
+}
+
+EWXWEXPORT(void, FileDataObject_AddFile)(void* _obj, void* _fle)
+{
+	((wxFileDataObject*)_obj)->AddFile((wxChar*)_fle);
+}
+
+EWXWEXPORT(int, FileDataObject_GetFilenames)(void* _obj, void* _lst)
+{
+	wxArrayString arr = ((wxFileDataObject*)_obj)->GetFilenames();
+	if (_lst)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((const wxChar**)_lst)[i] = wxStrdup (arr.Item(i).c_str());
+	}
+	return arr.GetCount();
+}
+
+
+EWXWEXPORT(void*, BitmapDataObject_Create)(void* _bmp)
+{
+	return (void*) new wxBitmapDataObject(*((wxBitmap*)_bmp));
+}
+
+EWXWEXPORT(void*, BitmapDataObject_CreateEmpty)()
+{
+	return (void*) new wxBitmapDataObject();
+}
+
+EWXWEXPORT(void, BitmapDataObject_Delete)(void* _obj)
+{
+	delete (wxBitmapDataObject*)_obj;
+}
+
+EWXWEXPORT(void, BitmapDataObject_SetBitmap)(void* _obj, void* _bmp)
+{
+	((wxBitmapDataObject*)_obj)->SetBitmap (*((wxBitmap*)_bmp));
+}
+
+EWXWEXPORT(void, BitmapDataObject_GetBitmap)(void* _obj, void* _bmp)
+{
+	*((wxBitmap*)_bmp) = ((wxBitmapDataObject*)_obj)->GetBitmap ();
+}
+
+
+EWXWEXPORT(void*, DropSource_Create)(wxDataObject* data, void* win, void* copy, void* move, void* none)
+{
+#if (wxCHECK_VERSION(2,5,0) && defined(__WXMAC__)) || defined(__WIN32__)
+	return (void*) new wxDropSource(*data, (wxWindow*)win, *((wxCursor*)copy), *((wxCursor*)move), *((wxCursor*)none));
+#else
+	return (void*) new wxDropSource(*data, (wxWindow*)win, *((wxIcon*)copy), *((wxIcon*)move), *((wxIcon*)none));
+#endif
+}
+
+EWXWEXPORT(void, DropSource_Delete)(void* _obj)
+{
+	delete (wxDropSource*)_obj;
+}
+
+EWXWEXPORT(int, DropSource_DoDragDrop)(void* _obj, int _move)
+{
+	return (int)((wxDropSource*)_obj)->DoDragDrop(_move != 0);
+}
+
+EWXWEXPORT(void*, ELJDropTarget_Create)(void* _obj)
+{
+	return (void*) new ELJDropTarget(_obj);
+}
+
+EWXWEXPORT(void, ELJDropTarget_Delete)(void* _obj)
+{
+	delete (ELJDropTarget*)_obj;
+}
+
+EWXWEXPORT(void, ELJFileDropTarget_SetOnData)(void* _obj, void* _func)
+{
+	((ELJFileDropTarget*)_obj)->SetOnData((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJFileDropTarget_SetOnDrop)(void* _obj, void* _func)
+{
+	((ELJFileDropTarget*)_obj)->SetOnDrop((DragTwoFunc)_func);
+}
+
+EWXWEXPORT(void, ELJFileDropTarget_SetOnEnter)(void* _obj, void* _func)
+{
+	((ELJFileDropTarget*)_obj)->SetOnEnter((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJFileDropTarget_SetOnDragOver)(void* _obj, void* _func)
+{
+	((ELJFileDropTarget*)_obj)->SetOnDragOver((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJFileDropTarget_SetOnLeave)(void* _obj, void* _func)
+{
+	((ELJFileDropTarget*)_obj)->SetOnLeave((DragZeroFunc)_func);
+}
+
+EWXWEXPORT(void, ELJTextDropTarget_SetOnData)(void* _obj, void* _func)
+{
+	((ELJTextDropTarget*)_obj)->SetOnData((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJTextDropTarget_SetOnDrop)(void* _obj, void* _func)
+{
+	((ELJTextDropTarget*)_obj)->SetOnDrop((DragTwoFunc)_func);
+}
+
+EWXWEXPORT(void, ELJTextDropTarget_SetOnEnter)(void* _obj, void* _func)
+{
+	((ELJTextDropTarget*)_obj)->SetOnEnter((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJTextDropTarget_SetOnDragOver)(void* _obj, void* _func)
+{
+	((ELJTextDropTarget*)_obj)->SetOnDragOver((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJTextDropTarget_SetOnLeave)(void* _obj, void* _func)
+{
+	((ELJTextDropTarget*)_obj)->SetOnLeave((DragZeroFunc)_func);
+}
+
+EWXWEXPORT(void, ELJDropTarget_SetOnData)(void* _obj, void* _func)
+{
+	((ELJDropTarget*)_obj)->SetOnData((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJDropTarget_SetOnDrop)(void* _obj, void* _func)
+{
+	((ELJDropTarget*)_obj)->SetOnDrop((DragTwoFunc)_func);
+}
+
+EWXWEXPORT(void, ELJDropTarget_SetOnEnter)(void* _obj, void* _func)
+{
+	((ELJDropTarget*)_obj)->SetOnEnter((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJDropTarget_SetOnDragOver)(void* _obj, void* _func)
+{
+	((ELJDropTarget*)_obj)->SetOnDragOver((DragThreeFunc)_func);
+}
+
+EWXWEXPORT(void, ELJDropTarget_SetOnLeave)(void* _obj, void* _func)
+{
+	((ELJDropTarget*)_obj)->SetOnLeave((DragZeroFunc)_func);
+}
+
+EWXWEXPORT(void, wxDropTarget_GetData)(void* _obj)
+{
+	((wxDropTarget*)_obj)->GetData();
+}
+
+EWXWEXPORT(void, wxDropTarget_SetDataObject)(void* _obj, void* _dat)
+{
+	((wxDropTarget*)_obj)->SetDataObject((wxDataObject*)_dat);
+}
+
+EWXWEXPORT(void*, ELJDragDataObject_Create)(void* _obj, void* _fmt, void* _func1, void* _func2, void* _func3)
+{
+	return (void*) new ELJDragDataObject(_obj, (wxChar*)_fmt, (DataGetDataSize)_func1, (DataGetDataHere)_func2, (DataSetData)_func3);
+}
+
+EWXWEXPORT(void, ELJDragDataObject_Delete)(void* _obj)
+{
+	delete (ELJDragDataObject*)_obj;
+}
+
+EWXWEXPORT(void*, wxDataObjectComposite_Create)()
+{
+	return (void*) new wxDataObjectComposite();
+}
+
+EWXWEXPORT(void, wxDataObjectComposite_Delete)(void* _obj)
+{
+	delete (wxDataObjectComposite*)_obj;
+}
+
+EWXWEXPORT(void, wxDataObjectComposite_Add)(void* _obj, void* _dat, int _preferred)
+{
+	((wxDataObjectComposite*)_obj)->Add((wxDataObjectSimple*)_dat, _preferred != 0);
+}
+
+}
diff --git a/wxc/src/eljdrawing.cpp b/wxc/src/eljdrawing.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljdrawing.cpp
@@ -0,0 +1,16 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxDrawWindow_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxWindow ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void*, wxDrawControl_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxControl ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+}
diff --git a/wxc/src/eljfiledialog.cpp b/wxc/src/eljfiledialog.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljfiledialog.cpp
@@ -0,0 +1,110 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxFileDialog_Create) (void* _prt, void* _msg, void* _dir, void* _fle, void* _wcd, int _lft, int _top, int _stl)
+{
+	return (void*) new wxFileDialog ((wxWindow*)_prt, (wxChar*)_msg, (wxChar*) _dir, (wxChar*) _fle, (wxChar*) _wcd, _stl, wxPoint(_lft, _top));
+}
+
+EWXWEXPORT(void, wxFileDialog_SetMessage)(void* _obj, void* message)
+{
+	((wxFileDialog*)_obj)->SetMessage((wxChar*)message);
+}
+	
+EWXWEXPORT(void, wxFileDialog_SetPath)(void* _obj, void* path)
+{
+	((wxFileDialog*)_obj)->SetPath((wxChar*)path);
+}
+	
+EWXWEXPORT(void, wxFileDialog_SetDirectory)(void* _obj, void* dir)
+{
+	((wxFileDialog*)_obj)->SetDirectory((wxChar*)dir);
+}
+	
+EWXWEXPORT(void, wxFileDialog_SetFilename)(void* _obj, void* name)
+{
+	((wxFileDialog*)_obj)->SetFilename((wxChar*)name);
+}
+	
+EWXWEXPORT(void, wxFileDialog_SetWildcard)(void* _obj, void* wildCard)
+{
+	((wxFileDialog*)_obj)->SetWildcard((wxChar*)wildCard);
+}
+	
+EWXWEXPORT(void, wxFileDialog_SetStyle)(void* _obj, int style)
+{
+	((wxFileDialog*)_obj)->SetStyle((long)style);
+}
+	
+EWXWEXPORT(void, wxFileDialog_SetFilterIndex)(void* _obj, int filterIndex)
+{
+	((wxFileDialog*)_obj)->SetFilterIndex(filterIndex);
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetMessage)(void* _obj, void* _buf)
+{
+	wxString result = ((wxFileDialog*)_obj)->GetMessage();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetPath)(void* _obj, void* _buf)
+{
+	wxString result = ((wxFileDialog*)_obj)->GetPath();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetPaths)(void* _obj, void* paths)
+{
+	wxArrayString arr;
+	((wxFileDialog*)_obj)->GetPaths(arr);
+	if (paths)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((const wxChar**)paths)[i] = wxStrdup (arr.Item(i).c_str());
+	}
+	return arr.GetCount();
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetDirectory)(void* _obj, void* _buf)
+{
+	wxString result =((wxFileDialog*)_obj)->GetDirectory();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetFilename)(void* _obj, void* _buf)
+{
+	wxString result =((wxFileDialog*)_obj)->GetFilename();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetFilenames)(void* _obj, void* paths)
+{
+	wxArrayString arr;
+	((wxFileDialog*)_obj)->GetFilenames(arr);
+	if (paths)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((const wxChar**)paths)[i] = wxStrdup (arr.Item(i).c_str());
+	}
+	return arr.GetCount();
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetWildcard)(void* _obj, void* _buf)
+{
+	wxString result =((wxFileDialog*)_obj)->GetWildcard();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetStyle)(void* _obj)
+{
+	return (int)((wxFileDialog*)_obj)->GetStyle();
+}
+	
+EWXWEXPORT(int, wxFileDialog_GetFilterIndex)(void* _obj)
+{
+	return ((wxFileDialog*)_obj)->GetFilterIndex();
+}
+	
+}
diff --git a/wxc/src/eljfilehist.cpp b/wxc/src/eljfilehist.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljfilehist.cpp
@@ -0,0 +1,87 @@
+#include "wrapper.h"
+#include "wx/docview.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxFileHistory_Create)(int maxFiles)
+{
+	return (void*)new wxFileHistory(maxFiles);
+}
+	
+EWXWEXPORT(void,wxFileHistory_Delete)(void* _obj)
+{
+	delete (wxFileHistory*)_obj;
+}
+	
+EWXWEXPORT(void,wxFileHistory_AddFileToHistory)(void* _obj, void* file)
+{
+	((wxFileHistory*)_obj)->AddFileToHistory((const wxChar*)file);
+}
+	
+EWXWEXPORT(void,wxFileHistory_RemoveFileFromHistory)(void* _obj, int i)
+{
+	((wxFileHistory*)_obj)->RemoveFileFromHistory(i);
+}
+	
+EWXWEXPORT(int,wxFileHistory_GetMaxFiles)(void* _obj)
+{
+	return ((wxFileHistory*)_obj)->GetMaxFiles();
+}
+	
+EWXWEXPORT(void,wxFileHistory_UseMenu)(void* _obj, void* menu)
+{
+	((wxFileHistory*)_obj)->UseMenu((wxMenu*)menu);
+}
+	
+EWXWEXPORT(void,wxFileHistory_RemoveMenu)(void* _obj, void* menu)
+{
+	((wxFileHistory*)_obj)->RemoveMenu((wxMenu*)menu);
+}
+	
+EWXWEXPORT(void,wxFileHistory_Load)(void* _obj, void* config)
+{
+	((wxFileHistory*)_obj)->Load(*((wxConfigBase*)config));
+}
+	
+EWXWEXPORT(void,wxFileHistory_Save)(void* _obj, void* config)
+{
+	((wxFileHistory*)_obj)->Save(*((wxConfigBase*)config));
+}
+	
+EWXWEXPORT(void,wxFileHistory_AddFilesToMenu)(void* _obj, void* menu)
+{
+	if (menu)
+		((wxFileHistory*)_obj)->AddFilesToMenu((wxMenu*)menu);
+	else
+		((wxFileHistory*)_obj)->AddFilesToMenu();
+}
+	
+EWXWEXPORT(int,wxFileHistory_GetHistoryFile)(void* _obj, int i, void* _buf)
+{
+	wxString tmp = ((wxFileHistory*)_obj)->GetHistoryFile(i);
+	return copyStrToBuf(_buf, tmp);
+}
+	
+EWXWEXPORT(int,wxFileHistory_GetCount)(void* _obj)
+{
+#if (wxVERSION_NUMBER <= 2600)
+	return ((wxFileHistory*)_obj)->GetNoHistoryFiles();
+#else
+	return ((wxFileHistory*)_obj)->GetCount();
+#endif
+}
+	
+EWXWEXPORT(int,wxFileHistory_GetMenus)(void* _obj, void* _ref)
+{
+	wxList lst = ((wxFileHistory*)_obj)->GetMenus();
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < lst.GetCount(); i++)
+			((void**)_ref)[i] = (void*)lst.Item(i);
+	}
+	
+	return lst.GetCount();
+}
+	
+}
diff --git a/wxc/src/eljfindrepldlg.cpp b/wxc/src/eljfindrepldlg.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljfindrepldlg.cpp
@@ -0,0 +1,116 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+#include "wx/fdrepdlg.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxFindReplaceData_CreateDefault)()
+{
+	return (void*)new wxFindReplaceData();
+}
+	
+EWXWEXPORT(void*,wxFindReplaceData_Create)(int flags)
+{
+	return (void*)new wxFindReplaceData((wxUint32)flags);
+}
+
+EWXWEXPORT(void,wxFindReplaceData_Delete)(void* _obj)
+{
+	delete (wxFindReplaceData*)_obj;
+}
+	
+EWXWEXPORT(int,wxFindReplaceData_GetFindString)(void* _obj, void* _ref)
+{
+	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
+        return copyStrToBuf(_ref, tmp);
+}
+	
+EWXWEXPORT(int,wxFindReplaceData_GetReplaceString)(void* _obj, void* _ref)
+{
+	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
+        return copyStrToBuf(_ref, tmp);
+}
+	
+EWXWEXPORT(int,wxFindReplaceData_GetFlags)(void* _obj)
+{
+	return ((wxFindReplaceData*)_obj)->GetFlags();
+}
+	
+EWXWEXPORT(void,wxFindReplaceData_SetFlags)(void* _obj, int flags)
+{
+	((wxFindReplaceData*)_obj)->SetFlags((wxUint32)flags);
+}
+	
+EWXWEXPORT(void,wxFindReplaceData_SetFindString)(void* _obj, void* str)
+{
+	((wxFindReplaceData*)_obj)->SetFindString((wxChar*)str);
+}
+	
+EWXWEXPORT(void,wxFindReplaceData_SetReplaceString)(void* _obj, void* str)
+{
+	((wxFindReplaceData*)_obj)->SetReplaceString((wxChar*)str);
+}
+	
+
+EWXWEXPORT(int,wxFindDialogEvent_GetFlags)(void* _obj)
+{
+	return ((wxFindDialogEvent*)_obj)->GetFlags();
+}
+	
+EWXWEXPORT(int,wxFindDialogEvent_GetFindString)(void* _obj, void* _ref)
+{
+	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
+        return copyStrToBuf(_ref, tmp);
+}
+	
+EWXWEXPORT(int,wxFindDialogEvent_GetReplaceString)(void* _obj, void* _ref)
+{
+	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
+        return copyStrToBuf(_ref, tmp);
+}
+	
+
+EWXWEXPORT(void*,wxFindReplaceDialog_Create)(void* parent, void* data, void* title, int style)
+{
+	return (void*)new wxFindReplaceDialog((wxWindow*)parent, (wxFindReplaceData*)data, (wxChar*)title, style);
+}
+	
+EWXWEXPORT(void*,wxFindReplaceDialog_GetData)(void* _obj)
+{
+	return (void*)((wxFindReplaceDialog*)_obj)->GetData();
+}
+	
+EWXWEXPORT(void,wxFindReplaceDialog_SetData)(void* _obj, void* data)
+{
+	((wxFindReplaceDialog*)_obj)->SetData((wxFindReplaceData*)data);
+}
+	
+
+EWXWEXPORT(int,expEVT_COMMAND_FIND)()
+{
+	return (int)wxEVT_COMMAND_FIND;
+}
+
+EWXWEXPORT(int,expEVT_COMMAND_FIND_NEXT)()
+{
+	return (int)wxEVT_COMMAND_FIND_NEXT;
+}
+
+EWXWEXPORT(int,expEVT_COMMAND_FIND_REPLACE)()
+{
+	return (int)wxEVT_COMMAND_FIND_REPLACE;
+}
+
+EWXWEXPORT(int,expEVT_COMMAND_FIND_REPLACE_ALL)()
+{
+	return (int)wxEVT_COMMAND_FIND_REPLACE_ALL;
+}
+
+EWXWEXPORT(int,expEVT_COMMAND_FIND_CLOSE)()
+{
+	return (int)wxEVT_COMMAND_FIND_CLOSE;
+}
+
+}
+#endif
diff --git a/wxc/src/eljfl.cpp b/wxc/src/eljfl.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljfl.cpp
@@ -0,0 +1,1550 @@
+#include "wrapper.h"
+#include "wx/fl/toolwnd.h"
+#include "wx/fl/antiflickpl.h"
+#include "wx/fl/bardragpl.h"
+#include "wx/fl/barhintspl.h"
+#include "wx/fl/cbcustom.h"
+#include "wx/fl/dyntbar.h"
+#include "wx/fl/dyntbarhnd.h"
+#include "wx/fl/gcupdatesmgr.h"
+#include "wx/fl/hintanimpl.h"
+#include "wx/fl/newbmpbtn.h"
+#include "wx/fl/panedrawpl.h"
+#include "wx/fl/rowdragpl.h"
+#include "wx/fl/rowlayoutpl.h"
+
+typedef void (*TButtonClick)(void* _obj, int _btn);
+typedef int  (*TTitleClick)(void* _obj, void* _evt);
+typedef void (*TMiniDraw)(void* _obj, void* _dct);
+
+class ELJToolWindow : public wxToolWindow
+{
+    private:
+        void*        EifObj;
+        TButtonClick BtnCb;
+        TTitleClick  TtlCb;
+    public:
+        ELJToolWindow(void* _obj, void* _btn, void* _ttl) : wxToolWindow()
+        {
+        	EifObj = _obj;
+        	BtnCb = (TButtonClick)_btn;
+        	TtlCb = (TTitleClick)_ttl;
+        }
+    
+    virtual void OnMiniButtonClicked( int btnIdx ) {BtnCb (EifObj, btnIdx);}
+    virtual bool HandleTitleClick( wxMouseEvent& event ) { return TtlCb (EifObj, (void*)&event) != 0; }
+};
+
+class ELJMiniButton : public cbMiniButton
+{
+    private:
+        void*     EifObj;
+        TMiniDraw DrwCb;
+	public:
+        ELJMiniButton(void* _obj, void* _drw) : cbMiniButton()
+        {
+        	EifObj = _obj;
+        	DrwCb = (TMiniDraw)_drw;
+		}
+		
+		virtual void Draw(wxDC& dc) {DrwCb(EifObj, (void*)&dc);}
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxToolWindow_Create)(void* _obj, void* _btn, void* _ttl)
+{
+    return (void*) new ELJToolWindow(_obj, _btn, _ttl);
+}
+EWXWEXPORT(void, wxToolWindow_SetClient)(void* _obj, void* _wnd)
+{
+	((ELJToolWindow*)_obj)->SetClient((wxWindow*)_wnd);
+}
+
+EWXWEXPORT(void*, wxToolWindow_GetClient)(void* _obj)
+{
+	return (void*)((ELJToolWindow*)_obj)->GetClient();
+}
+
+EWXWEXPORT(void, wxToolWindow_SetTitleFont)(void* _obj, void* _fnt)
+{
+	((ELJToolWindow*)_obj)->SetTitleFont (*((wxFont*)_fnt));
+}
+
+EWXWEXPORT(void, wxToolWindow_AddMiniButton)(void* _obj, void* _btn)
+{
+	((ELJToolWindow*)_obj)->AddMiniButton((cbMiniButton*)_btn);
+}
+
+EWXWEXPORT(void*,cbMiniButton_Create)()
+{
+	return (void*) new cbMiniButton();
+}
+	
+EWXWEXPORT(void,cbMiniButton_Delete)(void* _obj)
+{
+	delete (cbMiniButton*)_obj;
+}
+	
+EWXWEXPORT(void,cbMiniButton_Pos)(void* _obj, void* x, void* y)
+{
+	wxPoint pos = ((cbMiniButton*)_obj)->mPos;
+	*((int*)x) = pos.x;
+	*((int*)y) = pos.y;
+}
+	
+EWXWEXPORT(void,cbMiniButton_Dim)(void* _obj, void* w, void* h)
+{
+	wxSize size = ((cbMiniButton*)_obj)->mDim;
+	*((int*)w) = size.x;
+	*((int*)h) = size.y;
+}
+	
+EWXWEXPORT(int,cbMiniButton_Visible)(void* _obj)
+{
+	return (int)((cbMiniButton*)_obj)->mVisible;
+}
+	
+EWXWEXPORT(int,cbMiniButton_Enabled)(void* _obj)
+{
+	return (int)((cbMiniButton*)_obj)->mEnabled;
+}
+	
+EWXWEXPORT(void*,cbMiniButton_Layout)(void* _obj)
+{
+	return (void*)((cbMiniButton*)_obj)->mpLayout;
+}
+	
+EWXWEXPORT(void*,cbMiniButton_Pane)(void* _obj)
+{
+	return (void*)((cbMiniButton*)_obj)->mpPane;
+}
+	
+EWXWEXPORT(void*,cbMiniButton_Plugin)(void* _obj)
+{
+	return (void*)((cbMiniButton*)_obj)->mpPlugin;
+}
+	
+EWXWEXPORT(void*,cbMiniButton_Wnd)(void* _obj)
+{
+	return (void*)((cbMiniButton*)_obj)->mpWnd;
+}
+	
+EWXWEXPORT(int,cbMiniButton_DragStarted)(void* _obj)
+{
+	return (int)((cbMiniButton*)_obj)->mDragStarted;
+}
+	
+EWXWEXPORT(int,cbMiniButton_Pressed)(void* _obj)
+{
+	return (int)((cbMiniButton*)_obj)->mPressed;
+}
+	
+EWXWEXPORT(void,cbMiniButton_SetPos)(void* _obj, int x, int y)
+{
+	((cbMiniButton*)_obj)->SetPos(wxPoint(x, y));
+}
+	
+EWXWEXPORT(int,cbMiniButton_HitTest)(void* _obj,  int x, int y)
+{
+	return (int)((cbMiniButton*)_obj)->HitTest(wxPoint(x, y));
+}
+	
+EWXWEXPORT(void,cbMiniButton_Refresh)(void* _obj)
+{
+	((cbMiniButton*)_obj)->Refresh();
+}
+	
+EWXWEXPORT(int,cbMiniButton_WasClicked)(void* _obj)
+{
+	return (int)((cbMiniButton*)_obj)->WasClicked();
+}
+	
+EWXWEXPORT(void,cbMiniButton_Reset)(void* _obj)
+{
+	((cbMiniButton*)_obj)->Reset();
+}
+	
+EWXWEXPORT(void,cbMiniButton_Enable)(void* _obj,  int enable)
+{
+	((cbMiniButton*)_obj)->Enable(enable != 0);
+}
+	
+EWXWEXPORT(int,cbMiniButton_IsPressed)(void* _obj)
+{
+	return (int)((cbMiniButton*)_obj)->IsPressed();
+}
+	
+EWXWEXPORT(void*,cbCloseBox_Create)()
+{
+	return (void*) new cbCloseBox();
+}
+	
+EWXWEXPORT(void*,cbCollapseBox_Create)()
+{
+	return (void*) new cbCollapseBox();
+}
+	
+EWXWEXPORT(void*,cbDockBox_Create)()
+{
+	return (void*) new cbDockBox();
+}
+	
+EWXWEXPORT(void*,cbFloatedBarWindow_Create)(void* _obj)
+{
+	return (void*) new cbFloatedBarWindow();
+}
+	
+EWXWEXPORT(void,cbFloatedBarWindow_SetBar)(void* _obj, void* _bar)
+{
+	((cbFloatedBarWindow*)_obj)->SetBar((cbBarInfo*)_bar);
+}
+	
+EWXWEXPORT(void,cbFloatedBarWindow_SetLayout)(void* _obj, void* _layout)
+{
+	((cbFloatedBarWindow*)_obj)->SetLayout((wxFrameLayout*)_layout);
+}
+	
+EWXWEXPORT(void*,cbFloatedBarWindow_GetBar)(void* _obj)
+{
+	return (void*)((cbFloatedBarWindow*)_obj)->GetBar();
+}
+	
+EWXWEXPORT(void,cbFloatedBarWindow_PositionFloatedWnd)(void* _obj, int _x, int _y, int _w, int _h)
+{
+	((cbFloatedBarWindow*)_obj)->PositionFloatedWnd(_x, _y, _w, _h);
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_Create)(void* pParentFrame, void* pFrameClient, int activateNow)
+{
+	return (void*) new wxFrameLayout((wxWindow*)pParentFrame, (wxWindow*)pFrameClient, activateNow != 0);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_Delete)(void* _obj)
+{
+	delete (wxFrameLayout*)_obj;
+}
+
+EWXWEXPORT(void,wxFrameLayout_EnableFloating)(void* _obj, int enable)
+{
+	((wxFrameLayout*)_obj)->EnableFloating(enable != 0);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_Activate)(void* _obj)
+{
+	((wxFrameLayout*)_obj)->Activate();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_Deactivate)(void* _obj)
+{
+	((wxFrameLayout*)_obj)->Deactivate();
+}
+
+EWXWEXPORT(void,wxFrameLayout_HideBarWindows)(void* _obj)
+{
+	((wxFrameLayout*)_obj)->HideBarWindows();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_DestroyBarWindows)(void* _obj)
+{
+	return ((wxFrameLayout*)_obj)->DestroyBarWindows();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_SetFrameClient)(void* _obj, void* pFrameClient)
+{
+	((wxFrameLayout*)_obj)->SetFrameClient((wxWindow*)pFrameClient);
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_GetFrameClient)(void* _obj)
+{
+	return (void*)((wxFrameLayout*)_obj)->GetFrameClient();
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_GetParentFrame)(void* _obj)
+{
+	return (void*)((wxFrameLayout*)_obj)->mpFrame;
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_GetPane)(void* _obj, int alignment)
+{
+	return (void*)((wxFrameLayout*)_obj)->GetPane(alignment);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_AddBar)(void* _obj, void* pBarWnd, void* dimInfo, int alignment, int rowNo, int columnPos, void* name, int spyEvents, int state)
+{
+	((wxFrameLayout*)_obj)->AddBar((wxWindow*)pBarWnd, *((cbDimInfo*)dimInfo), alignment, rowNo, columnPos, (char*)name, spyEvents != 0, state);
+}
+	
+EWXWEXPORT(int,wxFrameLayout_RedockBar)(void* _obj, void* pBar, int x, int y, int w, int h, void* pToPane, int updateNow)
+{
+	return (int)((wxFrameLayout*)_obj)->RedockBar((cbBarInfo*)pBar, wxRect(x, y, w, h), (cbDockPane*)pToPane, updateNow != 0);
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_FindBarByName)(void* _obj, void* name)
+{
+	return (void*)((wxFrameLayout*)_obj)->FindBarByName((char*)name);
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_FindBarByWindow)(void* _obj, void* pWnd)
+{
+	return (void*)((wxFrameLayout*)_obj)->FindBarByWindow((wxWindow*)pWnd);
+}
+	
+EWXWEXPORT(int,wxFrameLayout_GetBars)(void* _obj, void* _ref)
+{
+	BarArrayT arr = ((wxFrameLayout*)_obj)->GetBars();
+	
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((void**)_ref)[i] = arr.Item(i);
+	}
+	
+	return arr.GetCount();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_SetBarState)(void* _obj, void* pBar, int newStatem, int updateNow)
+{
+	((wxFrameLayout*)_obj)->SetBarState((cbBarInfo*)pBar, newStatem, updateNow != 0);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_InverseVisibility)(void* _obj, void* pBar)
+{
+	((wxFrameLayout*)_obj)->InverseVisibility((cbBarInfo*)pBar);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_ApplyBarProperties)(void* _obj, void* pBar)
+{
+	((wxFrameLayout*)_obj)->ApplyBarProperties((cbBarInfo*)pBar);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_RemoveBar)(void* _obj, void* pBar)
+{
+	((wxFrameLayout*)_obj)->RemoveBar((cbBarInfo*)pBar);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_RecalcLayout)(void* _obj, int repositionBarsNow)
+{
+	((wxFrameLayout*)_obj)->RecalcLayout(repositionBarsNow != 0);
+}
+	
+EWXWEXPORT(int,wxFrameLayout_GetClientHeight)(void* _obj)
+{
+	return ((wxFrameLayout*)_obj)->GetClientHeight();
+}
+	
+EWXWEXPORT(int,wxFrameLayout_GetClientWidth)(void* _obj)
+{
+	return ((wxFrameLayout*)_obj)->GetClientWidth();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_GetClientRect)(void* _obj, void* x, void* y, void* w, void* h)
+{
+	wxRect rect = ((wxFrameLayout*)_obj)->GetClientRect();
+	*((int*)x) = rect.x;
+	*((int*)y) = rect.y;
+	*((int*)w) = rect.width;
+	*((int*)h) = rect.height;
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_GetUpdatesManager)(void* _obj)
+{
+	return (void*)((wxFrameLayout*)_obj)->mpUpdatesMgr;
+}
+	
+EWXWEXPORT(void,wxFrameLayout_SetUpdatesManager)(void* _obj, void* pUMgr)
+{
+	((wxFrameLayout*)_obj)->SetUpdatesManager((cbUpdatesManagerBase*)pUMgr);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_GetPaneProperties)(void* _obj, void* props, int alignment)
+{
+	((wxFrameLayout*)_obj)->GetPaneProperties(*((cbCommonPaneProperties*)props), alignment);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_SetPaneProperties)(void* _obj, void* props, int paneMask)
+{
+	((wxFrameLayout*)_obj)->SetPaneProperties(*((cbCommonPaneProperties*)props), paneMask);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_SetMargins)(void* _obj, int top, int bottom, int left, int right, int paneMask)
+{
+	((wxFrameLayout*)_obj)->SetMargins(top, bottom, left, right, paneMask);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_SetPaneBackground)(void* _obj, void* colour)
+{
+	((wxFrameLayout*)_obj)->SetPaneBackground(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_RefreshNow)(void* _obj, int recalcLayout)
+{
+	((wxFrameLayout*)_obj)->RefreshNow(recalcLayout != 0);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_OnSize)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->OnSize(*((wxSizeEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_OnLButtonDown)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->OnLButtonDown(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_OnLDblClick)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->OnLDblClick(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_OnLButtonUp)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->OnLButtonUp(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_OnRButtonDown)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->OnRButtonDown(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_OnRButtonUp)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->OnRButtonUp(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_OnMouseMove)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->OnMouseMove(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_FirePluginEvent)(void* _obj, void* event)
+{
+	((wxFrameLayout*)_obj)->FirePluginEvent(*((cbPluginEvent*)event));
+}
+	
+EWXWEXPORT(void,wxFrameLayout_CaptureEventsForPlugin)(void* _obj, void* pPlugin)
+{
+	((wxFrameLayout*)_obj)->CaptureEventsForPlugin((cbPluginBase*)pPlugin);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_ReleaseEventsFromPlugin)(void* _obj, void* pPlugin)
+{
+	((wxFrameLayout*)_obj)->ReleaseEventsFromPlugin((cbPluginBase*)pPlugin);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_CaptureEventsForPane)(void* _obj, void* toPane)
+{
+	((wxFrameLayout*)_obj)->CaptureEventsForPane((cbDockPane*)toPane);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_ReleaseEventsFromPane)(void* _obj, void* fromPane)
+{
+	((wxFrameLayout*)_obj)->ReleaseEventsFromPane((cbDockPane*)fromPane);
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_GetTopPlugin)(void* _obj)
+{
+	return (void*)((wxFrameLayout*)_obj)->mpTopPlugin;
+}
+	
+EWXWEXPORT(void,wxFrameLayout_SetTopPlugin)(void* _obj, void* pPlugin)
+{
+	((wxFrameLayout*)_obj)->SetTopPlugin((cbPluginBase*)pPlugin);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_PushPlugin)(void* _obj, void* pPugin)
+{
+	((wxFrameLayout*)_obj)->PushPlugin((cbPluginBase*)pPugin);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_PopPlugin)(void* _obj)
+{
+	((wxFrameLayout*)_obj)->PopPlugin();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_PopAllPlugins)(void* _obj)
+{
+	((wxFrameLayout*)_obj)->PopAllPlugins();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_PushDefaultPlugins)(void* _obj)
+{
+	((wxFrameLayout*)_obj)->PushDefaultPlugins();
+}
+	
+EWXWEXPORT(void,wxFrameLayout_AddPlugin)(void* _obj, void* pPlInfo, int paneMask)
+{
+	((wxFrameLayout*)_obj)->AddPlugin((wxClassInfo*)pPlInfo, paneMask);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_AddPluginBefore)(void* _obj, void* pNextPlInfo, void* pPlInfo, int paneMask)
+{
+	((wxFrameLayout*)_obj)->AddPluginBefore((wxClassInfo*)pNextPlInfo, (wxClassInfo*)pPlInfo, paneMask);
+}
+	
+EWXWEXPORT(void,wxFrameLayout_RemovePlugin)(void* _obj, void* pPlInfo)
+{
+	((wxFrameLayout*)_obj)->RemovePlugin((wxClassInfo*)pPlInfo);
+}
+	
+EWXWEXPORT(void*,wxFrameLayout_FindPlugin)(void* _obj, void* pPlInfo )
+{
+	return (void*)((wxFrameLayout*)_obj)->FindPlugin((wxClassInfo*)pPlInfo);
+}
+	
+EWXWEXPORT(int,wxFrameLayout_HasTopPlugin)(void* _obj)
+{
+	return (int)((wxFrameLayout*)_obj)->HasTopPlugin();
+}
+	
+EWXWEXPORT(void*,cbDimInfo_CreateDefault)()
+{
+	return (void*) new cbDimInfo();
+}
+	
+EWXWEXPORT(void*,cbDimInfo_CreateWithHandler)(void* pDimHandler, int isFixed)
+{
+	return (void*) new cbDimInfo((cbBarDimHandlerBase*)pDimHandler, isFixed != 0);
+}
+	
+EWXWEXPORT(void*,cbDimInfo_CreateWithInfo)(int dh_x, int dh_y, int dv_x, int dv_y, int f_x, int f_y, int isFixed, int horizGap, int vertGap, void* pDimHandler)
+{
+	return (void*) new cbDimInfo(dh_x, dh_y, dv_x, dv_y, f_x, f_y, isFixed != 0, horizGap, vertGap, (cbBarDimHandlerBase*)pDimHandler);
+}
+	
+EWXWEXPORT(void*,cbDimInfo_Create)(int x, int y, bool isFixed, int gap, void* pDimHandler)
+{
+	return (void*) new cbDimInfo(x, y, isFixed != 0, gap, (cbBarDimHandlerBase*)pDimHandler);
+}
+	
+EWXWEXPORT(void,cbDimInfo_Delete)(void* _obj)
+{
+	delete (cbDimInfo*)_obj;
+}
+
+EWXWEXPORT(void,cbDimInfo_Assign)(void* _obj, void* other)
+{
+	*((cbDimInfo*)_obj) = *((cbDimInfo*)other);
+}
+	
+EWXWEXPORT(void*,cbDimInfo_GetDimHandler)(void* _obj)
+{
+	return (void*)((cbDimInfo*)_obj)->GetDimHandler();
+}
+	
+EWXWEXPORT(void*,cbBarInfo_Create)()
+{
+	return (void*) new cbBarInfo();
+}
+	
+EWXWEXPORT(void,cbBarInfo_Delete)(void* _obj)
+{
+	delete (cbBarInfo*)_obj;
+}
+	
+EWXWEXPORT(int,cbBarInfo_IsFixed)(void* _obj)
+{
+	return (int)((cbBarInfo*)_obj)->IsFixed();
+}
+	
+EWXWEXPORT(int,cbBarInfo_IsExpanded)(void* _obj)
+{
+	return (int)((cbBarInfo*)_obj)->IsExpanded();
+}
+	
+EWXWEXPORT(void*,cbBarSpy_CreateDefault)()
+{
+	return (void*) new cbBarSpy();
+}
+	
+EWXWEXPORT(void*,cbBarSpy_Create)(void* pPanel)
+{
+	return (void*) new cbBarSpy((wxFrameLayout*)pPanel);
+}
+	
+EWXWEXPORT(void,cbBarSpy_Delete)(void* _obj)
+{
+	delete (cbBarSpy*)_obj;
+}
+	
+EWXWEXPORT(void,cbBarSpy_SetBarWindow)(void* _obj, void* pWnd)
+{
+	((cbBarSpy*)_obj)->SetBarWindow((wxWindow*)pWnd);
+}
+	
+EWXWEXPORT(int,cbBarSpy_ProcessEvent)(void* _obj, void* event)
+{
+	return (int)((cbBarSpy*)_obj)->ProcessEvent(*((wxEvent*)event));
+}
+	
+EWXWEXPORT(void*,cbRowInfo_Create)()
+{
+	return (void*) new cbRowInfo();
+}
+	
+EWXWEXPORT(void,cbRowInfo_Delete)(void* _obj)
+{
+	delete (cbRowInfo*)_obj;
+}
+	
+EWXWEXPORT(void*,cbRowInfo_GetFirstBar)(void* _obj)
+{
+	return (void*)((cbRowInfo*)_obj)->GetFirstBar();
+}
+	
+EWXWEXPORT(void*,cbDockPane_CreateDefault)()
+{
+	return (void*) new cbDockPane();
+}
+	
+EWXWEXPORT(void*,cbDockPane_Create)(int alignment, void* pPanel)
+{
+	return (void*) new cbDockPane(alignment, (wxFrameLayout*)pPanel);
+}
+	
+EWXWEXPORT(void,cbDockPane_Delete)(void* _obj)
+{
+	delete (cbDockPane*)_obj;
+}
+	
+EWXWEXPORT(void,cbDockPane_SetMargins)(void* _obj, int top, int bottom, int left, int right)
+{
+	((cbDockPane*)_obj)->SetMargins(top, bottom, left, right);
+}
+	
+EWXWEXPORT(void,cbDockPane_RemoveBar)(void* _obj, void* pBar)
+{
+	((cbDockPane*)_obj)->RemoveBar((cbBarInfo*)pBar);
+}
+	
+EWXWEXPORT(void,cbDockPane_InsertBarByCoord)(void* _obj, void* pBar, int x, int y, int w, int h)
+{
+	((cbDockPane*)_obj)->InsertBar((cbBarInfo*)pBar, wxRect(x, y, w, h));
+}
+	
+EWXWEXPORT(void,cbDockPane_InsertBarToRow)(void* _obj, void* pBar, void* pIntoRow)
+{
+	((cbDockPane*)_obj)->InsertBar((cbBarInfo*)pBar, (cbRowInfo*)pIntoRow);
+}
+	
+EWXWEXPORT(void,cbDockPane_InsertBarByInfo)(void* _obj, void* pBarInfo)
+{
+	((cbDockPane*)_obj)->InsertBar((cbBarInfo*)pBarInfo);
+}
+	
+EWXWEXPORT(void,cbDockPane_RemoveRow)(void* _obj, void* pRow)
+{
+	((cbDockPane*)_obj)->RemoveRow((cbRowInfo*)pRow);
+}
+	
+EWXWEXPORT(void,cbDockPane_InsertRow)(void* _obj, void* pRow, void* pBeforeRow)
+{
+	((cbDockPane*)_obj)->InsertRow((cbRowInfo*)pRow, (cbRowInfo*)pBeforeRow);
+}
+	
+EWXWEXPORT(void,cbDockPane_SetPaneWidth)(void* _obj, int width)
+{
+	((cbDockPane*)_obj)->SetPaneWidth(width);
+}
+	
+EWXWEXPORT(void,cbDockPane_SetBoundsInParent)(void* _obj, int _x, int _y, int _w, int _h)
+{
+	((cbDockPane*)_obj)->SetBoundsInParent(wxRect(_x, _y, _w, _h));
+}
+	
+EWXWEXPORT(void,cbDockPane_GetRealRect)(void* _obj, void* _x, void* _y, void* _w, void* _h)
+{
+	wxRect rect = ((cbDockPane*)_obj)->GetRealRect();
+	*((int*)_x) = rect.x;
+	*((int*)_y) = rect.y;
+	*((int*)_w) = rect.width;
+	*((int*)_h) = rect.height;
+}
+	
+EWXWEXPORT(int,cbDockPane_GetRowList)(void* _obj, void* _ref)
+{
+	RowArrayT arr = ((cbDockPane*)_obj)->GetRowList();
+	
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((void**)_ref)[i] = (void*)arr.Item(i);
+	}
+	
+	return arr.GetCount();
+}
+	
+EWXWEXPORT(void*,cbDockPane_GetFirstRow)(void* _obj)
+{
+	return (void*)((cbDockPane*)_obj)->GetFirstRow();
+}
+	
+EWXWEXPORT(int,cbDockPane_BarPresent)(void* _obj, void* pBar)
+{
+	return (int)((cbDockPane*)_obj)->BarPresent((cbBarInfo*)pBar);
+}
+	
+EWXWEXPORT(int,cbDockPane_GetPaneHeight)(void* _obj)
+{
+	return ((cbDockPane*)_obj)->GetPaneHeight();
+}
+	
+EWXWEXPORT(int,cbDockPane_GetAlignment)(void* _obj)
+{
+	return ((cbDockPane*)_obj)->GetAlignment();
+}
+	
+EWXWEXPORT(int,cbDockPane_MatchesMask)(void* _obj, int paneMask)
+{
+	return (int)((cbDockPane*)_obj)->MatchesMask(paneMask);
+}
+	
+EWXWEXPORT(int,cbDockPane_IsHorizontal)(void* _obj)
+{
+	return (int)((cbDockPane*)_obj)->IsHorizontal();
+}
+	
+EWXWEXPORT(int,cbDockPane_GetDockingState)(void* _obj)
+{
+	return ((cbDockPane*)_obj)->GetDockingState();
+}
+	
+EWXWEXPORT(int,cbDockPane_HitTestPaneItems)(void* _obj, int x, int y, void* ppRow, void* ppBar)
+{
+	return ((cbDockPane*)_obj)->HitTestPaneItems(wxPoint(x, y), (cbRowInfo**)ppRow, (cbBarInfo**)ppBar);
+}
+	
+EWXWEXPORT(void,cbDockPane_GetBarResizeRange)(void* _obj, void* pBar, void* from, void* till, int forLeftHandle)
+{
+	((cbDockPane*)_obj)->GetBarResizeRange((cbBarInfo*)pBar, (int*)from, (int*)till, forLeftHandle != 0);
+}
+	
+EWXWEXPORT(void,cbDockPane_GetRowResizeRange)(void* _obj, void* pRow, void* from, void* till, int forUpperHandle)
+{
+	((cbDockPane*)_obj)->GetRowResizeRange((cbRowInfo*)pRow, (int*)from, (int*)till, forUpperHandle != 0);
+}
+	
+EWXWEXPORT(void*,cbDockPane_GetBarInfoByWindow)(void* _obj, void* pBarWnd)
+{
+	return (void*)((cbDockPane*)_obj)->GetBarInfoByWindow((wxWindow*)pBarWnd);
+}
+	
+EWXWEXPORT(int,cbPluginBase_GetPaneMask)(void* _obj)
+{
+	return ((cbPluginBase*)_obj)->GetPaneMask();
+}
+
+EWXWEXPORT(void,cbPluginBase_Delete)(void* _obj)
+{
+	delete (cbPluginBase*)_obj;
+}
+
+EWXWEXPORT(int,cbPluginBase_IsReady)(void* _obj)
+{
+	return (int)((cbPluginBase*)_obj)->IsReady();
+}
+	
+EWXWEXPORT(int,cbPluginBase_ProcessEvent)(void* _obj, void* event)
+{
+	return (int)((cbPluginBase*)_obj)->ProcessEvent(*((wxEvent*)event));
+}
+	
+EWXWEXPORT(void*,cbPluginEvent_Pane)(void* _obj)
+{
+	return ((cbPluginEvent*)_obj)->mpPane;
+}
+
+EWXWEXPORT(void,cbLeftDownEvent_Pos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbLeftDownEvent*)_obj)->mPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void,cbLeftUpEvent_Pos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbLeftUpEvent*)_obj)->mPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void,cbRightDownEvent_Pos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbRightDownEvent*)_obj)->mPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void,cbRightUpEvent_Pos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbRightUpEvent*)_obj)->mPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void,cbMotionEvent_Pos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbMotionEvent*)_obj)->mPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void,cbLeftDClickEvent_Pos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbLeftDClickEvent*)_obj)->mPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void*,cbLayoutRowEvent_Row)(void* _obj)
+{
+	return (void*)((cbLayoutRowEvent*)_obj)->mpRow;
+}
+
+EWXWEXPORT(void*,cbResizeRowEvent_Row)(void* _obj)
+{
+	return (void*)((cbResizeRowEvent*)_obj)->mpRow;
+}
+
+EWXWEXPORT(int,cbResizeRowEvent_HandleOfs)(void* _obj)
+{
+	return ((cbResizeRowEvent*)_obj)->mHandleOfs;
+}
+	
+EWXWEXPORT(int,cbResizeRowEvent_ForUpperHandle)(void* _obj)
+{
+	return (int)((cbResizeRowEvent*)_obj)->mForUpperHandle;
+}
+	
+EWXWEXPORT(void*,cbInsertBarEvent_Bar)(void* _obj)
+{
+	return (void*)((cbInsertBarEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void*,cbInsertBarEvent_Row)(void* _obj)
+{
+	return (void*)((cbInsertBarEvent*)_obj)->mpRow;
+}
+	
+EWXWEXPORT(void*,cbResizeBarEvent_Bar)(void* _obj)
+{
+	return (void*)((cbResizeBarEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void*,cbResizeBarEvent_Row)(void* _obj)
+{
+	return (void*)((cbResizeBarEvent*)_obj)->mpRow;
+}
+	
+EWXWEXPORT(void*,cbRemoveBarEvent_Bar)(void* _obj)
+{
+	return (void*)((cbRemoveBarEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void*,cbSizeBarWndEvent_Bar)(void* _obj)
+{
+	return (void*)((cbSizeBarWndEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void,cbSizeBarWndEvent_BoundsInParent)(void* _obj, void* _x, void* _y, void* _w, void* _h)
+{
+	wxRect rect = ((cbSizeBarWndEvent*)_obj)->mBoundsInParent;
+	*((int*)_x) = rect.x;
+	*((int*)_y) = rect.y;
+	*((int*)_w) = rect.width;
+	*((int*)_h) = rect.height;
+}
+	
+EWXWEXPORT(void*,cbDrawBarDecorEvent_Bar)(void* _obj)
+{
+	return (void*)((cbDrawBarDecorEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void,cbDrawBarDecorEvent_BoundsInParent)(void* _obj, void* _x, void* _y, void* _w, void* _h)
+{
+	wxRect rect = ((cbDrawBarDecorEvent*)_obj)->mBoundsInParent;
+	*((int*)_x) = rect.x;
+	*((int*)_y) = rect.y;
+	*((int*)_w) = rect.width;
+	*((int*)_h) = rect.height;
+}
+	
+EWXWEXPORT(void*,cbDrawBarDecorEvent_Dc)(void* _obj)
+{
+	return (void*)((cbDrawBarDecorEvent*)_obj)->mpDc;
+}
+	
+EWXWEXPORT(void*,cbDrawRowDecorEvent_Row)(void* _obj)
+{
+	return (void*)((cbDrawRowDecorEvent*)_obj)->mpRow;
+}
+	
+EWXWEXPORT(void*,cbDrawRowDecorEvent_Dc)(void* _obj)
+{
+	return (void*)((cbDrawRowDecorEvent*)_obj)->mpDc;
+}
+	
+EWXWEXPORT(void*,cbDrawPaneDecorEvent_Dc)(void* _obj)
+{
+	return (void*)((cbDrawPaneDecorEvent*)_obj)->mpDc;
+}
+	
+EWXWEXPORT(void*,cbDrawBarHandlesEvent_Bar)(void* _obj)
+{
+	return (void*)((cbDrawBarHandlesEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void*,cbDrawBarHandlesEvent_Dc)(void* _obj)
+{
+	return (void*)((cbDrawBarHandlesEvent*)_obj)->mpDc;
+}
+	
+EWXWEXPORT(void*,cbDrawRowHandlesEvent_Row)(void* _obj)
+{
+	return (void*)((cbDrawRowHandlesEvent*)_obj)->mpRow;
+}
+	
+EWXWEXPORT(void*,cbDrawRowHandlesEvent_Dc)(void* _obj)
+{
+	return (void*)((cbDrawRowHandlesEvent*)_obj)->mpDc;
+}
+	
+EWXWEXPORT(void*,cbDrawRowBkGroundEvent_Row)(void* _obj)
+{
+	return (void*)((cbDrawRowBkGroundEvent*)_obj)->mpRow;
+}
+	
+EWXWEXPORT(void*,cbDrawRowBkGroundEvent_Dc)(void* _obj)
+{
+	return (void*)((cbDrawRowBkGroundEvent*)_obj)->mpDc;
+}
+	
+EWXWEXPORT(void*,cbDrawPaneBkGroundEvent_Dc)(void* _obj)
+{
+	return (void*)((cbDrawPaneBkGroundEvent*)_obj)->mpDc;
+}
+	
+EWXWEXPORT(void*,cbStartBarDraggingEvent_Bar)(void* _obj)
+{
+	return (void*)((cbStartBarDraggingEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void,cbStartBarDraggingEvent_Pos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbStartBarDraggingEvent*)_obj)->mPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void,cbDrawHintRectEvent_Rect)(void* _obj, void* _x, void* _y, void* _w, void* _h)
+{
+	wxRect rect = ((cbDrawHintRectEvent*)_obj)->mRect;
+	*((int*)_x) = rect.x;
+	*((int*)_y) = rect.y;
+	*((int*)_w) = rect.width;
+	*((int*)_h) = rect.height;
+}
+	
+EWXWEXPORT(int,cbDrawHintRectEvent_LastTime)(void* _obj)
+{
+	return (int)((cbDrawHintRectEvent*)_obj)->mLastTime;
+}
+	
+EWXWEXPORT(int,cbDrawHintRectEvent_EraseRect)(void* _obj)
+{
+	return (int)((cbDrawHintRectEvent*)_obj)->mEraseRect;
+}
+	
+EWXWEXPORT(int,cbDrawHintRectEvent_IsInClient)(void* _obj)
+{
+	return (int)((cbDrawHintRectEvent*)_obj)->mIsInClient;
+}
+	
+EWXWEXPORT(void,cbStartDrawInAreaEvent_Area)(void* _obj, void* _x, void* _y, void* _w, void* _h)
+{
+	wxRect rect = ((cbStartDrawInAreaEvent*)_obj)->mArea;
+	*((int*)_x) = rect.x;
+	*((int*)_y) = rect.y;
+	*((int*)_w) = rect.width;
+	*((int*)_h) = rect.height;
+}
+	
+EWXWEXPORT(void,cbFinishDrawInAreaEvent_Area)(void* _obj, void* _x, void* _y, void* _w, void* _h)
+{
+	wxRect rect = ((cbFinishDrawInAreaEvent*)_obj)->mArea;
+	*((int*)_x) = rect.x;
+	*((int*)_y) = rect.y;
+	*((int*)_w) = rect.width;
+	*((int*)_h) = rect.height;
+}
+	
+EWXWEXPORT(void,cbCustomizeBarEvent_ClickPos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbCustomizeBarEvent*)_obj)->mClickPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void*,cbCustomizeBarEvent_Bar)(void* _obj)
+{
+	return (void*)((cbCustomizeBarEvent*)_obj)->mpBar;
+}
+	
+EWXWEXPORT(void,cbCustomizeLayoutEvent_ClickPos)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pos = ((cbCustomizeLayoutEvent*)_obj)->mClickPos;
+	*((int*)_x) = pos.x;
+	*((int*)_y) = pos.y;
+}
+	
+EWXWEXPORT(void*,cbAntiflickerPlugin_CreateDefault)()
+{
+	return (void*) new cbAntiflickerPlugin();
+}
+	
+EWXWEXPORT(void*,cbAntiflickerPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbAntiflickerPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbAntiflickerPlugin_Delete)(void* _obj)
+{
+	delete (cbAntiflickerPlugin*)_obj;
+}
+
+EWXWEXPORT(void*,cbBarDragPlugin_CreateDefault)()
+{
+	return (void*) new cbBarDragPlugin();
+}
+	
+EWXWEXPORT(void*,cbBarDragPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbBarDragPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbBarDragPlugin_Delete)(void* _obj)
+{
+	delete (cbBarDragPlugin*)_obj;
+}
+
+EWXWEXPORT(void*,cbBarHintsPlugin_CreateDefault)()
+{
+	return (void*) new cbBarHintsPlugin();
+}
+	
+EWXWEXPORT(void*,cbBarHintsPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbBarHintsPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbBarHintsPlugin_Delete)(void* _obj)
+{
+	delete (cbBarHintsPlugin*)_obj;
+}
+
+EWXWEXPORT(void,cbBarHintsPlugin_SetGrooveCount)(void* _obj, int nGrooves)
+{
+	((cbBarHintsPlugin*)_obj)->SetGrooveCount(nGrooves);
+}
+	
+EWXWEXPORT(void*,cbSimpleCustomizationPlugin_CreateDefault)()
+{
+	return (void*) new cbSimpleCustomizationPlugin();
+}
+	
+EWXWEXPORT(void*,cbSimpleCustomizationPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbSimpleCustomizationPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbSimpleCustomizationPlugin_Delete)(void* _obj)
+{
+	delete (cbSimpleCustomizationPlugin*)_obj;
+}
+
+EWXWEXPORT(int,wxToolLayoutItem_IsSeparator)(void* _obj)
+{
+	return (int)((wxToolLayoutItem*)_obj)->mIsSeparator;
+}
+	
+EWXWEXPORT(void,wxToolLayoutItem_Rect)(void* _obj, void* _x, void* _y, void* _w, void* _h)
+{
+	wxRect rect = ((wxToolLayoutItem*)_obj)->mRect;
+	*((int*)_x) = rect.x;
+	*((int*)_y) = rect.y;
+	*((int*)_w) = rect.width;
+	*((int*)_h) = rect.height;
+}
+	
+EWXWEXPORT(void*,wxDynToolInfo_pToolWnd)(void* _obj)
+{
+	return (void*)((wxDynToolInfo*)_obj)->mpToolWnd;
+}
+	
+EWXWEXPORT(int,wxDynToolInfo_Index)(void* _obj)
+{
+	return ((wxDynToolInfo*)_obj)->mIndex;
+}
+	
+EWXWEXPORT(void,wxDynToolInfo_RealSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize size = ((wxDynToolInfo*)_obj)->mRealSize;
+	*((int*)_w) = size.x;
+	*((int*)_h) = size.y;
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_CreateDefault)()
+{
+	return (void*) new wxDynamicToolBar();
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_Create)(void* parent, int id, int x, int y, int w, int h, int style, int orientation, int RowsOrColumns)
+{
+	return (void*) new wxDynamicToolBar((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style, orientation, RowsOrColumns);
+}
+
+EWXWEXPORT(void,wxDynamicToolBar_Delete)(void* _obj)
+{
+	delete (wxDynamicToolBar*)_obj;
+}
+
+EWXWEXPORT(int,wxDynamicToolBar_CreateParams)(void* _obj, void* parent, int id, int x, int y, int w, int h, int style, int orientation, int RowsOrColumns)
+{
+	return (int)((wxDynamicToolBar*)_obj)->Create((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style, orientation, RowsOrColumns);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_AddTool)(void* _obj, int toolIndex, void* pToolWindow, int w, int h)
+{
+	((wxDynamicToolBar*)_obj)->AddTool(toolIndex, (wxWindow*)pToolWindow, wxSize(w, h));
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_AddToolImage)(void* _obj, int toolIndex, void* imageFileName, int imageFileType, void* labelText, int alignTextRight, int isFlat)
+{
+	((wxDynamicToolBar*)_obj)->AddTool(toolIndex, (char*)imageFileName, (wxBitmapType)imageFileType, (char*)labelText, alignTextRight != 0, isFlat != 0);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_AddToolLabel)(void* _obj, int toolIndex, void* labelBmp, void* labelText, int alignTextRight, int isFlat)
+{
+	((wxDynamicToolBar*)_obj)->AddTool(toolIndex, *((wxBitmap*)labelBmp), (char*)labelText, alignTextRight != 0, isFlat != 0);
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_AddToolBitmap)(void* _obj, int toolIndex, void* bitmap, void* pushedBitmap, int toggle, int x, int y, void* clientData, void* helpString1, void* helpString2)
+{
+	return (void*)((wxDynamicToolBar*)_obj)->AddTool(toolIndex, *((wxBitmap*)bitmap), *((wxBitmap*)pushedBitmap), toggle != 0, (long)x, (long)y, (wxObject*)clientData, (char*)helpString1, (char*)helpString2);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_AddSeparator)(void* _obj, void* pSepartorWnd)
+{
+	((wxDynamicToolBar*)_obj)->AddSeparator((wxWindow*)pSepartorWnd);
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_GetToolInfo)(void* _obj, int toolIndex)
+{
+	return (void*)((wxDynamicToolBar*)_obj)->GetToolInfo(toolIndex);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_RemoveTool)(void* _obj, int toolIndex)
+{
+	((wxDynamicToolBar*)_obj)->RemveTool(toolIndex);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_DrawSeparator)(void* _obj, void* info, void* dc)
+{
+	((wxDynamicToolBar*)_obj)->DrawSeparator(*((wxDynToolInfo*)info), *((wxDC*)dc));
+}
+	
+EWXWEXPORT(int,wxDynamicToolBar_Layout)(void* _obj)
+{
+	return (int)((wxDynamicToolBar*)_obj)->Layout();
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_GetPreferredDim)(void* _obj, int gw, int gh, void* pw, void* ph)
+{
+	wxSize size;
+	((wxDynamicToolBar*)_obj)->GetPreferredDim(wxSize(gw, gh), size);
+	*((int*)pw) = size.x;
+	*((int*)ph) = size.y;
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_CreateDefaultLayout)(void* _obj)
+{
+	return (void*)((wxDynamicToolBar*)_obj)->CreateDefaultLayout();
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_SetLayout)(void* _obj, void* pLayout)
+{
+	((wxDynamicToolBar*)_obj)->SetLayout((LayoutManagerBase*)pLayout);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_EnableTool)(void* _obj, int toolIndex, int enable)
+{
+	((wxDynamicToolBar*)_obj)->EnableTool(toolIndex, enable != 0);
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_FindToolForPosition)(void* _obj, int x, int y)
+{
+	return (void*)((wxDynamicToolBar*)_obj)->FindToolForPosition((wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(int,wxDynamicToolBar_DoInsertTool)(void* _obj, int pos, void* tool)
+{
+	return (int)((wxDynamicToolBar*)_obj)->DoInsertTool((size_t)pos, (wxToolBarToolBase*)tool);
+}
+	
+EWXWEXPORT(int,wxDynamicToolBar_DoDeleteTool)(void* _obj, int pos, void* tool)
+{
+	return (int)((wxDynamicToolBar*)_obj)->DoDeleteTool((size_t)pos, (wxToolBarToolBase*)tool);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_DoEnableTool)(void* _obj, void* tool, int enable)
+{
+	((wxDynamicToolBar*)_obj)->DoEnableTool((wxToolBarToolBase*)tool, enable != 0);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_DoToggleTool)(void* _obj, void* tool, int toggle)
+{
+	((wxDynamicToolBar*)_obj)->DoToggleTool((wxToolBarToolBase*)tool, toggle != 0);
+}
+	
+EWXWEXPORT(void,wxDynamicToolBar_DoSetToggle)(void* _obj, void* tool, int toggle)
+{
+	((wxDynamicToolBar*)_obj)->DoSetToggle((wxToolBarToolBase*)tool, toggle != 0);
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_CreateTool)(void* _obj, int id, void* label, void* bmpNormal, void* bmpDisabled, int kind, void* clientData, void* shortHelp, void* longHelp)
+{
+	return (void*)((wxDynamicToolBar*)_obj)->CreateTool(id, (char*)label, *((wxBitmap*)bmpNormal), *((wxBitmap*)bmpDisabled), (wxItemKind)kind, (wxObject*)clientData, (char*)shortHelp, (char*)longHelp);
+}
+	
+EWXWEXPORT(void*,wxDynamicToolBar_CreateToolControl)(void* _obj, void* control)
+{
+	return (void*)((wxDynamicToolBar*)_obj)->CreateTool((wxControl*)control);
+}
+	
+EWXWEXPORT(void*,cbDynToolBarDimHandler_Create)()
+{
+	return (void*) new cbDynToolBarDimHandler();
+}
+	
+EWXWEXPORT(void,cbDynToolBarDimHandler_Delete)(void* _obj)
+{
+	delete (cbDynToolBarDimHandler*)_obj;
+}
+
+EWXWEXPORT(void*,cbGCUpdatesMgr_Create)(void* pPanel)
+{
+	return (void*) new cbGCUpdatesMgr((wxFrameLayout*)pPanel);
+}
+	
+EWXWEXPORT(void*,cbGCUpdatesMgr_CreateDefault)()
+{
+	return (void*) new cbGCUpdatesMgr();
+}
+	
+EWXWEXPORT(void,cbGCUpdatesMgr_Delete)(void* _obj)
+{
+	delete (cbGCUpdatesMgr*)_obj;
+}
+	
+EWXWEXPORT(void,cbGCUpdatesMgr_UpdateNow)(void* _obj)
+{
+	((cbGCUpdatesMgr*)_obj)->UpdateNow();
+}
+
+EWXWEXPORT(void*,cbHintAnimationPlugin_CreateDefault)()
+{
+	return (void*) new cbHintAnimationPlugin();
+}
+	
+EWXWEXPORT(void*,cbHintAnimationPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbHintAnimationPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbHintAnimationPlugin_Delete)(void* _obj)
+{
+	delete (cbHintAnimationPlugin*)_obj;
+}
+
+EWXWEXPORT(void*,wxNewBitmapButton_Create)(void* labelBitmap, void* labelText, int alignText, int isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, int isSticky)
+{
+	return (void*) new wxNewBitmapButton(*((wxBitmap*)labelBitmap), (char*)labelText, alignText, isFlat != 0, firedEventType, marginX, marginY, textToLabelGap, isSticky != 0);
+}
+	
+EWXWEXPORT(void*,wxNewBitmapButton_CreateFromFile)(void* bitmapFileName, int bitmapFileType, void* labelText, int alignText, int isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, int isSticky)
+{
+	return (void*) new wxNewBitmapButton((char*)bitmapFileName, (wxBitmapType)bitmapFileType, (char*)labelText, alignText, isFlat != 0, firedEventType, marginX, marginY, textToLabelGap, isSticky != 0);
+}
+
+EWXWEXPORT(void,wxNewBitmapButton_Realize)(void* _obj, void* _prt, int _id, int _x, int _y, int _w, int _h)
+{
+	((wxNewBitmapButton*)_obj)->Create((wxWindow*)_prt, (wxWindowID)_id, wxPoint(_x, _y), wxSize(_w, _h));
+}
+
+EWXWEXPORT(void,wxNewBitmapButton_Delete)(void* _obj)
+{
+	delete (wxNewBitmapButton*)_obj;
+}
+
+EWXWEXPORT(void,wxNewBitmapButton_Reshape)(void* _obj)
+{
+	((wxNewBitmapButton*)_obj)->Reshape();
+}
+	
+EWXWEXPORT(void,wxNewBitmapButton_SetLabel)(void* _obj, void* labelBitmap, void* labelText)
+{
+	((wxNewBitmapButton*)_obj)->SetLabel(*((wxBitmap*)labelBitmap), (char*)labelText);
+}
+	
+EWXWEXPORT(void,wxNewBitmapButton_SetAlignments)(void* _obj, int alignText, int marginX, int marginY, int textToLabelGap)
+{
+	((wxNewBitmapButton*)_obj)->SetAlignments(alignText, marginX, marginY, textToLabelGap);
+}
+	
+EWXWEXPORT(void,wxNewBitmapButton_DrawDecorations)(void* _obj, void* dc)
+{
+	((wxNewBitmapButton*)_obj)->DrawDecorations(*((wxDC*)dc));
+}
+	
+EWXWEXPORT(void,wxNewBitmapButton_DrawLabel)(void* _obj, void* dc)
+{
+	((wxNewBitmapButton*)_obj)->DrawLabel(*((wxDC*)dc));
+}
+	
+EWXWEXPORT(void,wxNewBitmapButton_RenderLabelImage)(void* _obj, void* destBmp, void* srcBmp, int isEnabled, int isPressed)
+{
+	((wxNewBitmapButton*)_obj)->RenderLabelImage((wxBitmap*)destBmp, (wxBitmap*)srcBmp, isEnabled != 0, isPressed != 0);
+}
+	
+EWXWEXPORT(void,wxNewBitmapButton_RenderLabelImages)(void* _obj)
+{
+	((wxNewBitmapButton*)_obj)->RenderLabelImages();
+}
+	
+EWXWEXPORT(void,wxNewBitmapButton_RenderAllLabelImages)(void* _obj)
+{
+	((wxNewBitmapButton*)_obj)->RenderAllLabelImages();
+}
+	
+EWXWEXPORT(int,wxNewBitmapButton_Enable)(void* _obj, int enable)
+{
+	return (int)((wxNewBitmapButton*)_obj)->Enable(enable != 0);
+}
+	
+EWXWEXPORT(void*,cbPaneDrawPlugin_CreateDefault)()
+{
+	return (void*) new cbPaneDrawPlugin();
+}
+	
+EWXWEXPORT(void*,cbPaneDrawPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbPaneDrawPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbPaneDrawPlugin_Delete)(void* _obj)
+{
+	delete (cbPaneDrawPlugin*)_obj;
+}
+
+EWXWEXPORT(void*,cbRowDragPlugin_CreateDefault)()
+{
+	return (void*) new cbRowDragPlugin();
+}
+	
+EWXWEXPORT(void*,cbRowDragPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbRowDragPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbRowDragPlugin_Delete)(void* _obj)
+{
+	delete (cbRowDragPlugin*)_obj;
+}
+
+EWXWEXPORT(void*,cbRowLayoutPlugin_CreateDefault)()
+{
+	return (void*) new cbRowLayoutPlugin();
+}
+	
+EWXWEXPORT(void*,cbRowLayoutPlugin_Create)(void* pPanel, int paneMask)
+{
+	return (void*) new cbRowLayoutPlugin((wxFrameLayout*)pPanel, paneMask);
+}
+	
+EWXWEXPORT(void,cbRowLayoutPlugin_Delete)(void* _obj)
+{
+	delete (cbRowLayoutPlugin*)_obj;
+}
+
+EWXWEXPORT(void*,cbPluginBase_Plugin)(int _swt)
+{
+	switch (_swt)
+	{
+		case 0:
+			return CLASSINFO(cbAntiflickerPlugin);
+		
+		case 1:
+			return CLASSINFO(cbBarDragPlugin);
+		
+		case 2:
+			return CLASSINFO(cbBarHintsPlugin);
+		
+		case 3:
+			return CLASSINFO(cbSimpleCustomizationPlugin);
+		
+		case 4:
+			return CLASSINFO(cbHintAnimationPlugin);
+		
+		case 5:
+			return CLASSINFO(cbPaneDrawPlugin);
+		
+		case 6:
+			return CLASSINFO(cbRowDragPlugin);
+		
+		case 7:
+			return CLASSINFO(cbRowLayoutPlugin);
+		
+		default:
+			return NULL;
+	}
+}
+
+EWXWEXPORT(void*,cbCommonPaneProperties_CreateDefault)()
+{
+	return (void*)new cbCommonPaneProperties();
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_Delete)(void* _obj)
+{
+	delete (cbCommonPaneProperties*)_obj;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_RealTimeUpdatesOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mRealTimeUpdatesOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_OutOfPaneDragOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mOutOfPaneDragOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_ExactDockPredictionOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mExactDockPredictionOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_NonDestructFrictionOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mNonDestructFrictionOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_Show3DPaneBorderOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mShow3DPaneBorderOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_BarFloatingOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mBarFloatingOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_RowProportionsOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mRowProportionsOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_ColProportionsOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mColProportionsOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_BarCollapseIconsOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mBarCollapseIconsOn;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_BarDragHintsOn)(void* _obj)
+{
+	return (int)((cbCommonPaneProperties*)_obj)->mBarDragHintsOn;
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_MinCBarDim)(void* _obj, void* _w, void* _h)
+{
+	wxSize size = ((cbCommonPaneProperties*)_obj)->mMinCBarDim;
+	*((int*)_w) = size.x;
+	*((int*)_h) = size.y;
+}
+	
+EWXWEXPORT(int,cbCommonPaneProperties_ResizeHandleSize)(void* _obj)
+{
+	return ((cbCommonPaneProperties*)_obj)->mResizeHandleSize;
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetRealTimeUpdatesOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mRealTimeUpdatesOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetOutOfPaneDragOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mOutOfPaneDragOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetExactDockPredictionOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mExactDockPredictionOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetNonDestructFrictionOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mNonDestructFrictionOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetShow3DPaneBorderOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mShow3DPaneBorderOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetBarFloatingOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mBarFloatingOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetRowProportionsOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mRowProportionsOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetColProportionsOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mColProportionsOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetBarCollapseIconsOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mBarCollapseIconsOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetBarDragHintsOn)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mBarDragHintsOn = (_val != 0);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetMinCBarDim)(void* _obj, int _w, int _h)
+{
+	((cbCommonPaneProperties*)_obj)->mMinCBarDim = wxSize (_w, _h);
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_SetResizeHandleSize)(void* _obj, int _val)
+{
+	((cbCommonPaneProperties*)_obj)->mResizeHandleSize = _val;
+}
+	
+EWXWEXPORT(void,cbCommonPaneProperties_Assign)(void* _obj, void* _other)
+{
+	*((cbCommonPaneProperties*)_obj) = *((cbCommonPaneProperties*)_other);
+}
+	
+}
diff --git a/wxc/src/eljfont.cpp b/wxc/src/eljfont.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljfont.cpp
@@ -0,0 +1,238 @@
+#include "wrapper.h"
+#include "wx/fontenum.h"
+#include "wx/fontmap.h"
+#include "wx/encconv.h"
+
+extern "C"
+{
+
+typedef int _cdecl (*TTextEnum) (void* _obj, void* _txt);
+
+}
+
+class ELJFontEnumerator : public wxFontEnumerator
+{
+	private:
+		TTextEnum func;
+		void*     EiffelObject;
+	public:
+		ELJFontEnumerator (void* _obj, void* _fnc) : wxFontEnumerator()
+		{
+			func = (TTextEnum)_fnc;
+			EiffelObject = _obj;
+		}
+		
+	    virtual bool OnFacename(const wxString& facename)
+        { 
+			return func(EiffelObject, (void*)facename.c_str()) != 0;
+		}
+		virtual bool OnFontEncoding(const wxString& WXUNUSED(facename), const wxString& encoding)
+        {
+			return func(EiffelObject, (void*)encoding.c_str()) != 0;
+		}
+
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxFont_Create) (int pointSize, int family, int style, int weight, int underlined, wxChar* face, int enc)
+{
+	return new wxFont (pointSize, family, style, weight, underlined != 0, face, (wxFontEncoding)enc);
+}
+
+EWXWEXPORT(void*, wxFont_CreateDefault)()
+{
+	return new wxFont ();
+}
+
+EWXWEXPORT(void, wxFont_Delete)(void* _obj)
+{
+	delete ((wxFont*)_obj);
+}
+
+EWXWEXPORT(int, wxFont_Ok)(void* _obj)
+{
+	return (int)((wxFont*)_obj)->Ok();
+}
+	
+EWXWEXPORT(int, wxFont_GetPointSize)(void* _obj)
+{
+	return ((wxFont*)_obj)->GetPointSize();
+}
+	
+EWXWEXPORT(int, wxFont_GetFamily)(void* _obj)
+{
+	return ((wxFont*)_obj)->GetFamily();
+}
+	
+EWXWEXPORT(int, wxFont_GetStyle)(void* _obj)
+{
+	return ((wxFont*)_obj)->GetStyle();
+}
+	
+EWXWEXPORT(int, wxFont_GetWeight)(void* _obj)
+{
+	return ((wxFont*)_obj)->GetWeight();
+}
+	
+EWXWEXPORT(int, wxFont_GetUnderlined)(void* _obj)
+{
+	return (int)((wxFont*)_obj)->GetUnderlined();
+}
+	
+EWXWEXPORT(int, wxFont_GetFaceName)(void* _obj, void* _buf)
+{
+	wxString result = ((wxFont*)_obj)->GetFaceName();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFont_GetEncoding)(void* _obj)
+{
+	return (int)((wxFont*)_obj)->GetEncoding();
+}
+	
+EWXWEXPORT(void, wxFont_SetPointSize)(void* _obj, int pointSize)
+{
+	((wxFont*)_obj)->SetPointSize(pointSize);
+}
+	
+EWXWEXPORT(void, wxFont_SetFamily)(void* _obj, int family)
+{
+	((wxFont*)_obj)->SetFamily(family);
+}
+	
+EWXWEXPORT(void, wxFont_SetStyle)(void* _obj, int style)
+{
+	((wxFont*)_obj)->SetStyle(style);
+}
+	
+EWXWEXPORT(void, wxFont_SetWeight)(void* _obj, int weight)
+{
+	((wxFont*)_obj)->SetWeight(weight);
+}
+	
+EWXWEXPORT(void, wxFont_SetFaceName)(void* _obj, wxChar* faceName)
+{
+	((wxFont*)_obj)->SetFaceName(faceName);
+}
+	
+EWXWEXPORT(void, wxFont_SetUnderlined)(void* _obj, int underlined)
+{
+	((wxFont*)_obj)->SetUnderlined(underlined != 0);
+}
+	
+EWXWEXPORT(void, wxFont_SetEncoding)(void* _obj, int encoding)
+{
+	((wxFont*)_obj)->SetEncoding((wxFontEncoding)encoding);
+}
+	
+EWXWEXPORT(int, wxFont_GetFamilyString)(void* _obj, void* _buf)
+{
+	wxString result = ((wxFont*)_obj)->GetFamilyString();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFont_GetStyleString)(void* _obj, void* _buf)
+{
+	wxString result = ((wxFont*)_obj)->GetStyleString();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFont_GetWeightString)(void* _obj, void* _buf)
+{
+	wxString result = ((wxFont*)_obj)->GetWeightString();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxFont_GetDefaultEncoding)(void* _obj)
+{
+	return (int)((wxFont*)_obj)->GetDefaultEncoding();
+}
+	
+EWXWEXPORT(void, wxFont_SetDefaultEncoding)(void* _obj, int encoding)
+{
+	((wxFont*)_obj)->SetDefaultEncoding((wxFontEncoding) encoding);
+}
+	
+
+EWXWEXPORT(void*, wxFontEnumerator_Create)(void* _obj, void* _fnc)
+{
+	return (void*) new ELJFontEnumerator(_obj, _fnc);
+}
+
+EWXWEXPORT(void, wxFontEnumerator_Delete)(void* _obj)
+{
+	delete ((ELJFontEnumerator*)_obj);
+}
+
+EWXWEXPORT(int,wxFontEnumerator_EnumerateFacenames)(void* _obj, int encoding, int fixedWidthOnly)
+{
+	return (int)((ELJFontEnumerator*)_obj)->EnumerateFacenames((wxFontEncoding)encoding, fixedWidthOnly != 0);
+}
+	
+EWXWEXPORT(int,wxFontEnumerator_EnumerateEncodings)(void* _obj, void* facename)
+{
+	return (int)((ELJFontEnumerator*)_obj)->EnumerateEncodings((const wxChar*)facename);
+}
+	
+
+EWXWEXPORT(void*, wxFontMapper_Create)()
+{
+	return wxTheFontMapper;
+}
+
+EWXWEXPORT(int,wxFontMapper_GetAltForEncoding)(void* _obj, int encoding, void* alt_encoding, void* _buf)
+{
+	return (int)((wxFontMapper*)_obj)->GetAltForEncoding((wxFontEncoding)encoding, (wxFontEncoding*)alt_encoding, (const wxChar*)_buf, false);
+}
+	
+EWXWEXPORT(int,wxFontMapper_IsEncodingAvailable)(void* _obj, int encoding, void* _buf)
+{
+	return (int)((wxFontMapper*)_obj)->IsEncodingAvailable((wxFontEncoding)encoding, (const wxChar*)_buf);
+}
+	
+
+EWXWEXPORT(void*, wxEncodingConverter_Create)()
+{
+	return (void*) new wxEncodingConverter();
+}
+
+EWXWEXPORT(void, wxEncodingConverter_Delete)(void* _obj)
+{
+	delete (wxEncodingConverter*)_obj;
+}
+
+EWXWEXPORT(int,wxEncodingConverter_Init)(void* _obj, int input_enc, int output_enc, int method)
+{
+	return (int)((wxEncodingConverter*)_obj)->Init((wxFontEncoding)input_enc, (wxFontEncoding)output_enc, method);
+}
+	
+EWXWEXPORT(void,wxEncodingConverter_Convert)(void* _obj, void* input, void* output)
+{
+	((wxEncodingConverter*)_obj)->Convert((const char*)input, (char*)output);
+}
+
+EWXWEXPORT(int,wxEncodingConverter_GetPlatformEquivalents)(void* _obj, int enc, int platform, void* _lst)
+{
+	wxFontEncodingArray arr = ((wxEncodingConverter*)_obj)->GetPlatformEquivalents((wxFontEncoding)enc, platform);
+	if (_lst)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((int*)_lst)[i] = (int)arr.Item(i);
+	}
+	return (int)arr.GetCount();
+}
+
+EWXWEXPORT(int,wxEncodingConverter_GetAllEquivalents)(void* _obj, int enc, void* _lst)
+{
+	wxFontEncodingArray arr = ((wxEncodingConverter*)_obj)->GetAllEquivalents((wxFontEncoding)enc);
+	if (_lst)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((int*)_lst)[i] = (int)arr.Item(i);
+	}
+	return (int)arr.GetCount();
+}
+
+}
diff --git a/wxc/src/eljfontdata.cpp b/wxc/src/eljfontdata.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljfontdata.cpp
@@ -0,0 +1,91 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxFontData_Create) ()
+{
+	return (void*) new wxFontData();
+}
+
+EWXWEXPORT(void, wxFontData_Delete) (void* _obj)
+{
+	delete (wxFontData*)_obj;
+}
+
+EWXWEXPORT(void, wxFontData_SetAllowSymbols)(void* _obj, int flag)
+{
+	((wxFontData*)_obj)->SetAllowSymbols(flag != 0);
+}
+	
+EWXWEXPORT(int, wxFontData_GetAllowSymbols)(void* _obj)
+{
+	return (int)((wxFontData*)_obj)->GetAllowSymbols();
+}
+	
+EWXWEXPORT(void, wxFontData_SetColour)(void* _obj, void* colour)
+{
+	((wxFontData*)_obj)->SetColour(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxFontData_GetColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxFontData*)_obj)->GetColour();
+}
+	
+EWXWEXPORT(void, wxFontData_SetShowHelp)(void* _obj, int flag)
+{
+	((wxFontData*)_obj)->SetShowHelp(flag != 0);
+}
+	
+EWXWEXPORT(int, wxFontData_GetShowHelp)(void* _obj)
+{
+	return (int)((wxFontData*)_obj)->GetShowHelp();
+}
+	
+EWXWEXPORT(void, wxFontData_EnableEffects)(void* _obj, int flag)
+{
+	((wxFontData*)_obj)->EnableEffects(flag != 0);
+}
+	
+EWXWEXPORT(int, wxFontData_GetEnableEffects)(void* _obj)
+{
+	return (int)((wxFontData*)_obj)->GetEnableEffects();
+}
+	
+EWXWEXPORT(void, wxFontData_SetInitialFont)(void* _obj, void* font)
+{
+	((wxFontData*)_obj)->SetInitialFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(void, wxFontData_GetInitialFont)(void* _obj, void* ref)
+{
+	*((wxFont*)ref) = ((wxFontData*)_obj)->GetInitialFont();
+}
+	
+EWXWEXPORT(void, wxFontData_SetChosenFont)(void* _obj, void* font)
+{
+	((wxFontData*)_obj)->SetChosenFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(void, wxFontData_GetChosenFont)(void* _obj, void* ref)
+{
+	*((wxFont*)ref) = ((wxFontData*)_obj)->GetChosenFont();
+}
+	
+EWXWEXPORT(void, wxFontData_SetRange)(void* _obj, int minRange, int maxRange)
+{
+	((wxFontData*)_obj)->SetRange(minRange, maxRange);
+}
+	
+EWXWEXPORT(int, wxFontData_GetEncoding)(void* _obj)
+{
+	return (int)((wxFontData*)_obj)->GetEncoding();
+}
+	
+EWXWEXPORT(void, wxFontData_SetEncoding)(void* _obj, int encoding)
+{
+	((wxFontData*)_obj)->SetEncoding((wxFontEncoding)encoding);
+}
+	
+}
diff --git a/wxc/src/eljfontdlg.cpp b/wxc/src/eljfontdlg.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljfontdlg.cpp
@@ -0,0 +1,20 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxFontDialog_Create) (void* _prt, void* fnt)
+{
+#ifdef wxMAC_USE_EXPERIMENTAL_FONTDIALOG
+	return (void*) new wxFontDialog ((wxWindow*)_prt, (wxFontData&) fnt);
+#else
+	return (void*) new wxFontDialog ((wxWindow*)_prt, (wxFontData*) fnt);
+#endif
+}
+
+EWXWEXPORT(void, wxFontDialog_GetFontData)(void* _obj, void* _ref)
+{
+	*((wxFontData*)_ref) = ((wxFontDialog*)_obj)->GetFontData();
+}
+
+}
diff --git a/wxc/src/eljframe.cpp b/wxc/src/eljframe.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljframe.cpp
@@ -0,0 +1,113 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxFrame_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxFrame ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void*, wxFrame_CreateStatusBar)(void* _obj, int number, int style)
+{
+	return (void*)((wxFrame*)_obj)->CreateStatusBar(number, style, 1);
+}
+	
+EWXWEXPORT(void, wxFrame_Maximize)(void* _obj)
+{
+	((wxFrame*)_obj)->Maximize();
+}
+	
+EWXWEXPORT(void, wxFrame_Restore)(void* _obj)
+{
+	((wxFrame*)_obj)->Restore();
+}
+	
+EWXWEXPORT(void, wxFrame_Iconize)(void* _obj)
+{
+	((wxFrame*)_obj)->Iconize();
+}
+	
+EWXWEXPORT(int, wxFrame_IsMaximized)(void* _obj)
+{
+	return (int)((wxFrame*)_obj)->IsMaximized();
+}
+	
+EWXWEXPORT(int, wxFrame_IsIconized)(void* _obj)
+{
+	return (int)((wxFrame*)_obj)->IsIconized();
+}
+	
+EWXWEXPORT(void*, wxFrame_GetIcon)(void* _obj)
+{
+	return (void*) (&((wxFrame*)_obj)->GetIcon());
+}
+	
+EWXWEXPORT(void, wxFrame_SetIcon)(void* _obj, void* _icon)
+{
+	((wxFrame*)_obj)->SetIcon(*((wxIcon*) _icon));
+}
+	
+EWXWEXPORT(int, wxFrame_GetClientAreaOrigin_left)(void* _obj)
+{
+	return ((wxFrame*)_obj)->GetClientAreaOrigin().x;
+}
+	
+EWXWEXPORT(int, wxFrame_GetClientAreaOrigin_top)(void* _obj)
+{
+	return ((wxFrame*)_obj)->GetClientAreaOrigin().y;
+}
+	
+EWXWEXPORT(void, wxFrame_SetMenuBar)(void* _obj, void* menubar)
+{
+	((wxFrame*)_obj)->SetMenuBar((wxMenuBar*)menubar);
+}
+	
+EWXWEXPORT(void*, wxFrame_GetMenuBar)(void* _obj)
+{
+	return (void*)((wxFrame*)_obj)->GetMenuBar();
+}
+	
+EWXWEXPORT(void*, wxFrame_GetStatusBar)(void* _obj)
+{
+	return (void*)((wxFrame*)_obj)->GetStatusBar();
+}
+	
+EWXWEXPORT(void, wxFrame_SetStatusBar)(void* _obj, void* statBar)
+{
+	((wxFrame*)_obj)->SetStatusBar((wxStatusBar*) statBar);
+}
+	
+EWXWEXPORT(void, wxFrame_SetStatusText)(void* _obj, wxChar* _txt, int _number)
+{
+	((wxFrame*)_obj)->SetStatusText(_txt, _number);
+}
+	
+EWXWEXPORT(void, wxFrame_SetStatusWidths)(void* _obj, int _n, void* _widths_field)
+{
+	((wxFrame*)_obj)->SetStatusWidths(_n, (int*) _widths_field);
+}
+	
+EWXWEXPORT(void*, wxFrame_CreateToolBar)(void* _obj, long style)
+{
+	return (void*)((wxFrame*)_obj)->CreateToolBar(style, 1);
+}
+	
+EWXWEXPORT(void*, wxFrame_GetToolBar)(void* _obj)
+{
+	return (void*)((wxFrame*)_obj)->GetToolBar();
+}
+	
+EWXWEXPORT(void, wxFrame_SetToolBar)(void* _obj, void* _toolbar)
+{
+	((wxFrame*)_obj)->SetToolBar((wxToolBar*) _toolbar);
+}
+
+#if wxVERSION_NUMBER >= 2400
+EWXWEXPORT(void, wxFrame_SetIcons)(void* _obj, void* _icons)
+{
+	((wxFrame*)_obj)->SetIcons(*((wxIconBundle*)_icons));
+}
+#endif
+
+}
diff --git a/wxc/src/eljgauge.cpp b/wxc/src/eljgauge.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljgauge.cpp
@@ -0,0 +1,51 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxGauge_Create) (void* _prt, int _id, int _rng, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxGauge ((wxWindow*)_prt, _id, _rng, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void, wxGauge_SetShadowWidth)(void* _obj, int w)
+{
+	((wxGauge*)_obj)->SetShadowWidth(w);
+}
+	
+EWXWEXPORT(void, wxGauge_SetBezelFace)(void* _obj, int w)
+{
+	((wxGauge*)_obj)->SetBezelFace(w);
+}
+	
+EWXWEXPORT(void, wxGauge_SetRange)(void* _obj, int r)
+{
+	((wxGauge*)_obj)->SetRange(r);
+}
+	
+EWXWEXPORT(void, wxGauge_SetValue)(void* _obj, int pos)
+{
+	((wxGauge*)_obj)->SetValue(pos);
+}
+	
+EWXWEXPORT(int, wxGauge_GetShadowWidth)(void* _obj)
+{
+	return ((wxGauge*)_obj)->GetShadowWidth();
+}
+	
+EWXWEXPORT(int, wxGauge_GetBezelFace)(void* _obj)
+{
+	return ((wxGauge*)_obj)->GetBezelFace();
+}
+	
+EWXWEXPORT(int, wxGauge_GetRange)(void* _obj)
+{
+	return ((wxGauge*)_obj)->GetRange();
+}
+	
+EWXWEXPORT(int, wxGauge_GetValue)(void* _obj)
+{
+	return ((wxGauge*)_obj)->GetValue();
+}
+	
+}
diff --git a/wxc/src/eljgizmos.cpp b/wxc/src/eljgizmos.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljgizmos.cpp
@@ -0,0 +1,414 @@
+#include "wrapper.h"
+#include "wx/gizmos/dynamicsash.h"
+#include "wx/gizmos/editlbox.h"
+#include "wx/gizmos/ledctrl.h"
+#include "wx/gizmos/multicell.h"
+#include "wx/gizmos/splittree.h"
+
+class ELJSCTreeControl : public wxRemotelyScrolledTreeCtrl
+{
+	private:
+		TreeCompareFunc compare_func;
+		void* EiffelObject;
+
+	public:
+	    ELJSCTreeControl(void* _obj,
+		                 void* _cmp,
+		                 wxWindow *parent,
+		                 wxWindowID id = -1,
+                         const wxPoint& pos = wxDefaultPosition,
+                         const wxSize& size = wxDefaultSize,
+                         long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT) :
+		wxRemotelyScrolledTreeCtrl (parent, id, pos, size, style)
+		{
+			EiffelObject = _obj;
+			compare_func = (TreeCompareFunc)_cmp;
+		};
+
+		virtual int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2)
+		{
+			return EiffelObject ? compare_func (EiffelObject, (void*)&item1, (void*)&item2) : wxRemotelyScrolledTreeCtrl::OnCompareItems(item1, item2);
+		}
+
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxDynamicSashWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
+{
+	return (void*) new wxDynamicSashWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(void,wxDynamicSashWindow_Delete)(void* _obj)
+{
+	delete (wxDynamicSashWindow*)_obj;
+}
+
+EWXWEXPORT(void*,wxDynamicSashWindow_GetHScrollBar)(void* _obj, void* child)
+{
+	return (void*)((wxDynamicSashWindow*)_obj)->GetHScrollBar((wxWindow*)child);
+}
+	
+EWXWEXPORT(void*,wxDynamicSashWindow_GetVScrollBar)(void* _obj, void* child)
+{
+	return (void*)((wxDynamicSashWindow*)_obj)->GetVScrollBar((wxWindow*)child);
+}
+	
+EWXWEXPORT(void*,wxEditableListBox_Create)(void* parent, int id, void* label, int x, int y, int w, int h, int style)
+{
+	return (void*) new wxEditableListBox((wxWindow*)parent, (wxWindowID)id, (char*)label, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(void,wxEditableListBox_SetStrings)(void* _obj, void* strings, int _n)
+{
+	wxArrayString list;
+
+	for (int i = 0; i < _n; i++)
+		list.Add(((char**)strings)[i]);
+
+	((wxEditableListBox*)_obj)->SetStrings(list);
+}
+	
+EWXWEXPORT(int,wxEditableListBox_GetStrings)(void* _obj, void* _ref)
+{
+	wxArrayString list;
+	((wxEditableListBox*)_obj)->GetStrings(list);
+	
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < list.GetCount(); i++)
+			((char**)_ref)[i] = strdup (list.Item(i).c_str());
+	}
+
+	return list.GetCount();
+}
+	
+EWXWEXPORT(void*,wxEditableListBox_GetListCtrl)(void* _obj)
+{
+	return (void*)((wxEditableListBox*)_obj)->GetListCtrl();
+}
+	
+EWXWEXPORT(void*,wxEditableListBox_GetDelButton)(void* _obj)
+{
+	return (void*)((wxEditableListBox*)_obj)->GetDelButton();
+}
+	
+EWXWEXPORT(void*,wxEditableListBox_GetNewButton)(void* _obj)
+{
+	return (void*)((wxEditableListBox*)_obj)->GetNewButton();
+}
+	
+EWXWEXPORT(void*,wxEditableListBox_GetUpButton)(void* _obj)
+{
+	return (void*)((wxEditableListBox*)_obj)->GetUpButton();
+}
+	
+EWXWEXPORT(void*,wxEditableListBox_GetDownButton)(void* _obj)
+{
+	return (void*)((wxEditableListBox*)_obj)->GetDownButton();
+}
+	
+EWXWEXPORT(void*,wxEditableListBox_GetEditButton)(void* _obj)
+{
+	return (void*)((wxEditableListBox*)_obj)->GetEditButton();
+}
+	
+EWXWEXPORT(void*,wxLEDNumberCtrl_Create)(void* parent, int id, int x, int y, int w, int h, int style)
+{
+	return (void*) new wxLEDNumberCtrl((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(int,wxLEDNumberCtrl_GetAlignment)(void* _obj)
+{
+	return (int)((wxLEDNumberCtrl*)_obj)->GetAlignment();
+}
+	
+EWXWEXPORT(int,wxLEDNumberCtrl_GetDrawFaded)(void* _obj)
+{
+	return (int)((wxLEDNumberCtrl*)_obj)->GetDrawFaded();
+}
+	
+EWXWEXPORT(int,wxLEDNumberCtrl_GetValue)(void* _obj, void* _ref)
+{
+	wxString res = ((wxLEDNumberCtrl*)_obj)->GetValue();
+        return copyStrToBuf(_ref, res);
+}
+	
+EWXWEXPORT(void,wxLEDNumberCtrl_SetAlignment)(void* _obj, int Alignment, int Redraw)
+{
+	((wxLEDNumberCtrl*)_obj)->SetAlignment((wxLEDValueAlign)Alignment, Redraw != 0);
+}
+	
+EWXWEXPORT(void,wxLEDNumberCtrl_SetDrawFaded)(void* _obj, int DrawFaded, int Redraw)
+{
+	((wxLEDNumberCtrl*)_obj)->SetDrawFaded(DrawFaded != 0, Redraw != 0);
+}
+	
+EWXWEXPORT(void,wxLEDNumberCtrl_SetValue)(void* _obj, void* Value, int Redraw)
+{
+	((wxLEDNumberCtrl*)_obj)->SetValue((char*)Value, Redraw != 0);
+}
+	
+EWXWEXPORT(void*,wxMultiCellItemHandle_Create)(int row, int column, int height, int width, int sx, int sy, int style, int wx, int wy, int align)
+{
+	return (void*) new wxMultiCellItemHandle(row, column, height, width, wxSize(sx, sy), (wxResizable)style, wxSize(wx, wy), align);
+}
+	
+EWXWEXPORT(void*,wxMultiCellItemHandle_CreateWithSize)(void* _obj, int row, int column, int sx, int sy, int style, int wx, int wy, int align)
+{
+	return (void*) new wxMultiCellItemHandle(row, column, wxSize(sx, sy), (wxResizable)style, wxSize(wx, wy), align);
+}
+	
+EWXWEXPORT(void*,wxMultiCellItemHandle_CreateWithStyle)(void* _obj, int row, int column, int style, int wx, int wy, int align)
+{
+	return (void*) new wxMultiCellItemHandle(row, column, (wxResizable)style, wxSize(wx, wy), align);
+}
+	
+EWXWEXPORT(int,wxMultiCellItemHandle_GetColumn)(void* _obj)
+{
+	return ((wxMultiCellItemHandle*)_obj)->GetColumn();
+}
+	
+EWXWEXPORT(int,wxMultiCellItemHandle_GetRow)(void* _obj)
+{
+	return ((wxMultiCellItemHandle*)_obj)->GetRow();
+}
+	
+EWXWEXPORT(int,wxMultiCellItemHandle_GetWidth)(void* _obj)
+{
+	return ((wxMultiCellItemHandle*)_obj)->GetWidth();
+}
+	
+EWXWEXPORT(int,wxMultiCellItemHandle_GetHeight)(void* _obj)
+{
+	return ((wxMultiCellItemHandle*)_obj)->GetHeight();
+}
+	
+EWXWEXPORT(int,wxMultiCellItemHandle_GetStyle)(void* _obj)
+{
+	return (int)((wxMultiCellItemHandle*)_obj)->GetStyle();
+}
+	
+EWXWEXPORT(void,wxMultiCellItemHandle_GetLocalSize)(void* _obj, void* w, void* h)
+{
+	wxSize size = ((wxMultiCellItemHandle*)_obj)->GetLocalSize();
+	*((int*)w) = size.x;
+	*((int*)h) = size.y;
+}
+	
+EWXWEXPORT(int,wxMultiCellItemHandle_GetAlignment)(void* _obj)
+{
+	return ((wxMultiCellItemHandle*)_obj)->GetAlignment();
+}
+	
+EWXWEXPORT(void,wxMultiCellItemHandle_GetWeight)(void* _obj, void* w, void* h)
+{
+	wxSize size = ((wxMultiCellItemHandle*)_obj)->GetWeight();
+	*((int*)w) = size.x;
+	*((int*)h) = size.y;
+}
+	
+EWXWEXPORT(void*,wxMultiCellSizer_Create)(int rows, int cols)
+{
+	return (void*) new wxMultiCellSizer(rows, cols);
+}
+	
+EWXWEXPORT(void,wxMultiCellSizer_Delete)(void* _obj)
+{
+	delete (wxMultiCellSizer*)_obj;
+}
+
+EWXWEXPORT(void,wxMultiCellSizer_RecalcSizes)(void* _obj)
+{
+	((wxMultiCellSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void,wxMultiCellSizer_CalcMin)(void* _obj, void* w, void* h)
+{
+	wxSize size = ((wxMultiCellSizer*)_obj)->CalcMin();
+	*((int*)w) = size.x;
+	*((int*)h) = size.y;
+}
+	
+EWXWEXPORT(int,wxMultiCellSizer_SetDefaultCellSize)(void* _obj, int w, int h)
+{
+	return (int)((wxMultiCellSizer*)_obj)->SetDefaultCellSize(wxSize(w, h));
+}
+	
+EWXWEXPORT(int,wxMultiCellSizer_SetColumnWidth)(void* _obj, int column, int colSize, int expandable)
+{
+	return (int)((wxMultiCellSizer*)_obj)->SetColumnWidth(column, colSize, expandable != 0);
+}
+	
+EWXWEXPORT(int,wxMultiCellSizer_SetRowHeight)(void* _obj, int row, int rowSize, int expandable)
+{
+	return (int)((wxMultiCellSizer*)_obj)->SetRowHeight(row, rowSize, expandable != 0);
+}
+	
+EWXWEXPORT(int,wxMultiCellSizer_EnableGridLines)(void* _obj, void* win)
+{
+	return (int)((wxMultiCellSizer*)_obj)->EnableGridLines((wxWindow*)win);
+}
+	
+EWXWEXPORT(int,wxMultiCellSizer_SetGridPen)(void* _obj, void* pen)
+{
+	return (int)((wxMultiCellSizer*)_obj)->SetGridPen((wxPen*)pen);
+}
+	
+EWXWEXPORT(void*,wxMultiCellCanvas_Create)(void* parent, int numRows, int numCols)
+{
+	return (void*) new wxMultiCellCanvas((wxWindow*)parent, numRows, numCols);
+}
+	
+EWXWEXPORT(void,wxMultiCellCanvas_Add)(void* _obj, void* win, int row, int col)
+{
+	((wxMultiCellCanvas*)_obj)->Add((wxWindow*)win, (unsigned int)row, (unsigned int)col);
+}
+	
+EWXWEXPORT(int,wxMultiCellCanvas_MaxRows)(void* _obj)
+{
+	return ((wxMultiCellCanvas*)_obj)->MaxRows();
+}
+	
+EWXWEXPORT(int,wxMultiCellCanvas_MaxCols)(void* _obj)
+{
+	return ((wxMultiCellCanvas*)_obj)->MaxCols();
+}
+	
+EWXWEXPORT(void,wxMultiCellCanvas_CalculateConstraints)(void* _obj)
+{
+	((wxMultiCellCanvas*)_obj)->CalculateConstraints();
+}
+	
+EWXWEXPORT(void,wxMultiCellCanvas_SetMinCellSize)(void* _obj, int w, int h)
+{
+	((wxMultiCellCanvas*)_obj)->SetMinCellSize(wxSize(w, h));
+}
+	
+EWXWEXPORT(void*,wxSplitterScrolledWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
+{
+	return (void*) new wxSplitterScrolledWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(void*,wxThinSplitterWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
+{
+	return (void*) new wxThinSplitterWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(void,wxThinSplitterWindow_SizeWindows)(void* _obj)
+{
+	((wxThinSplitterWindow*)_obj)->SizeWindows();
+}
+	
+EWXWEXPORT(int,wxThinSplitterWindow_SashHitTest)(void* _obj, int x, int y, int tolerance)
+{
+	return (int)((wxThinSplitterWindow*)_obj)->SashHitTest(x, y, tolerance);
+}
+	
+EWXWEXPORT(void,wxThinSplitterWindow_DrawSash)(void* _obj, void* dc)
+{
+	((wxThinSplitterWindow*)_obj)->DrawSash(*((wxDC*)dc));
+}
+	
+EWXWEXPORT(void*,wxTreeCompanionWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
+{
+	return (void*) new wxTreeCompanionWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(void,wxTreeCompanionWindow_DrawItem)(void* _obj, void* dc, void* id, int x, int y, int w, int h)
+{
+	((wxTreeCompanionWindow*)_obj)->DrawItem(*((wxDC*)dc), *((wxTreeItemId*)id), wxRect(x, y, w, h));
+}
+	
+EWXWEXPORT(void*,wxTreeCompanionWindow_GetTreeCtrl)(void* _obj)
+{
+	return (void*)((wxTreeCompanionWindow*)_obj)->GetTreeCtrl();
+}
+	
+EWXWEXPORT(void,wxTreeCompanionWindow_SetTreeCtrl)(void* _obj, void* treeCtrl)
+{
+	((wxTreeCompanionWindow*)_obj)->SetTreeCtrl((wxRemotelyScrolledTreeCtrl*)treeCtrl);
+}
+	
+EWXWEXPORT(void*,wxRemotelyScrolledTreeCtrl_Create)(void* _obj, void* _cmp, void* parent, int id, int x, int y, int w, int h, int style)
+{
+	return (void*) new ELJSCTreeControl(_obj, _cmp, (wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_Delete)(void* _obj)
+{
+	delete (ELJSCTreeControl*)_obj;
+}
+
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_SetScrollbars)(void* _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, int noRefresh)
+{
+	((ELJSCTreeControl*)_obj)->SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh != 0);
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_GetViewStart)(void* _obj, void* x, void* y)
+{
+	((ELJSCTreeControl*)_obj)->GetViewStart((int*)x, (int*)y);
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_PrepareDC)(void* _obj, void* dc)
+{
+	((ELJSCTreeControl*)_obj)->PrepareDC(*((wxDC*)dc));
+}
+	
+EWXWEXPORT(int,wxRemotelyScrolledTreeCtrl_GetScrollPos)(void* _obj, int orient)
+{
+	return ((ELJSCTreeControl*)_obj)->GetScrollPos(orient);
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_HideVScrollbar)(void* _obj)
+{
+	((ELJSCTreeControl*)_obj)->HideVScrollbar();
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_CalcTreeSize)(void* _obj, void* x, void* y, void* w, void* h)
+{
+	wxRect rect;
+	((ELJSCTreeControl*)_obj)->CalcTreeSize(rect);
+	*((int*)x) = rect.x;
+	*((int*)y) = rect.y;
+	*((int*)w) = rect.width;
+	*((int*)h) = rect.height;
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_CalcTreeSizeItem)(void* _obj, void* id, void* x, void* y, void* w, void* h)
+{
+	wxRect rect;
+	((ELJSCTreeControl*)_obj)->CalcTreeSize(*((wxTreeItemId*)id), rect);
+	*((int*)x) = rect.x;
+	*((int*)y) = rect.y;
+	*((int*)w) = rect.width;
+	*((int*)h) = rect.height;
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_AdjustRemoteScrollbars)(void* _obj)
+{
+	((ELJSCTreeControl*)_obj)->AdjustRemoteScrollbars();
+}
+	
+EWXWEXPORT(void*,wxRemotelyScrolledTreeCtrl_GetScrolledWindow)(void* _obj)
+{
+	return (void*)((ELJSCTreeControl*)_obj)->GetScrolledWindow();
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_ScrollToLine)(void* _obj, int posHoriz, int posVert)
+{
+	((ELJSCTreeControl*)_obj)->ScrollToLine(posHoriz, posVert);
+}
+	
+EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_SetCompanionWindow)(void* _obj, void* companion)
+{
+	((ELJSCTreeControl*)_obj)->SetCompanionWindow((wxWindow*)companion);
+}
+	
+EWXWEXPORT(void*,wxRemotelyScrolledTreeCtrl_GetCompanionWindow)(void* _obj)
+{
+	return (void*)((ELJSCTreeControl*)_obj)->GetCompanionWindow();
+}
+	
+}
diff --git a/wxc/src/eljgrid.cpp b/wxc/src/eljgrid.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljgrid.cpp
@@ -0,0 +1,1465 @@
+#include "wrapper.h"
+#include "eljgrid.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxGridCellCoordsArray_Create)()
+{
+	return (void*) new wxGridCellCoordsArray();
+}
+
+EWXWEXPORT(void,wxGridCellCoordsArray_Delete)(void* _obj)
+{
+	delete (wxGridCellCoordsArray*)_obj;
+}
+
+EWXWEXPORT(int,wxGridCellCoordsArray_GetCount)(void* _obj)
+{
+	return ((wxGridCellCoordsArray*)_obj)->GetCount();
+}
+
+EWXWEXPORT(void,wxGridCellCoordsArray_Item)(void* _obj, int _idx, void* _c, void* _r)
+{
+	*((int*)_c) = ((wxGridCellCoordsArray*)_obj)->Item(_idx).GetCol();
+	*((int*)_r) = ((wxGridCellCoordsArray*)_obj)->Item(_idx).GetRow();
+}
+
+
+EWXWEXPORT(int, wxGridCellEditor_IsCreated)(void* _obj)
+{
+	return (int)((wxGridCellEditor*)_obj)->IsCreated();
+}
+	
+EWXWEXPORT(void*, wxGridCellEditor_GetControl)(void* _obj)
+{
+	return (void*)((wxGridCellEditor*)_obj)->GetControl();
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_SetControl)(void* _obj, void* control)
+{
+	((wxGridCellEditor*)_obj)->SetControl((wxControl*) control);
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_Create)(void* _obj, void* parent, int id, void* evtHandler)
+{
+	((wxGridCellEditor*)_obj)->Create((wxWindow*) parent, (wxWindowID) id, (wxEvtHandler*) evtHandler);
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_SetSize)(void* _obj, int x, int y, int w, int h)
+{
+	((wxGridCellEditor*)_obj)->SetSize(wxRect(x, y, w, h));
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_Show)(void* _obj, int show, void* attr)
+{
+	((wxGridCellEditor*)_obj)->Show(show != 0, (wxGridCellAttr*) attr);
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_PaintBackground)(void* _obj, int x, int y, int w, int h, void* attr)
+{
+	((wxGridCellEditor*)_obj)->PaintBackground(wxRect(x, y, w, h), (wxGridCellAttr*)attr);
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_BeginEdit)(void* _obj, int row, int col, void* grid)
+{
+	((wxGridCellEditor*)_obj)->BeginEdit(row, col, (wxGrid*)grid);
+}
+	
+EWXWEXPORT(int, wxGridCellEditor_EndEdit)(void* _obj, int row, int col, void* grid)
+{
+	return (int)((wxGridCellEditor*)_obj)->EndEdit(row, col, (wxGrid*) grid);
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_Reset)(void* _obj)
+{
+	((wxGridCellEditor*)_obj)->Reset();
+}
+	
+EWXWEXPORT(int, wxGridCellEditor_IsAcceptedKey)(void* _obj, void* event)
+{
+	return (int)((wxGridCellEditor*)_obj)->IsAcceptedKey(*((wxKeyEvent*)event));
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_StartingKey)(void* _obj, void* event)
+{
+	((wxGridCellEditor*)_obj)->StartingKey(*((wxKeyEvent*)event));
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_StartingClick)(void* _obj)
+{
+	((wxGridCellEditor*)_obj)->StartingClick();
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_HandleReturn)(void* _obj, void* event)
+{
+	((wxGridCellEditor*)_obj)->HandleReturn(*((wxKeyEvent*)event));
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_Destroy)(void* _obj)
+{
+	((wxGridCellEditor*)_obj)->Destroy();
+}
+	
+EWXWEXPORT(void, wxGridCellEditor_SetParameters)(void* _obj, void* params)
+{
+	((wxGridCellEditor*)_obj)->SetParameters((wxChar*)params);
+}
+	
+EWXWEXPORT(void*, wxGridCellTextEditor_Ctor)()
+{
+	return (void*) new wxGridCellTextEditor();
+}
+
+EWXWEXPORT(void*, wxGridCellNumberEditor_Ctor)(int min, int max)
+{
+	return (void*) new wxGridCellNumberEditor(min, max);
+}
+
+EWXWEXPORT(void*, wxGridCellFloatEditor_Ctor)(int width, int precision)
+{
+	return (void*) new wxGridCellFloatEditor(width, precision);
+}
+
+EWXWEXPORT(void*, wxGridCellBoolEditor_Ctor)()
+{
+	return (void*) new wxGridCellBoolEditor();
+}
+
+EWXWEXPORT(void*, wxGridCellChoiceEditor_Ctor)(int count, void* choices, int allowOthers)
+{
+	wxString items[256];
+
+	for (int i = 0; i < count; i++)
+		items[i] = ((wxChar**)choices)[i];
+
+	return (void*) new wxGridCellChoiceEditor (count, items, allowOthers != 0);
+}
+
+EWXWEXPORT(void*, wxGridCellAttr_Ctor)()
+{
+	return (void*) new wxGridCellAttr();
+}
+
+EWXWEXPORT(void, wxGridCellAttr_IncRef)(void* _obj)
+{
+	((wxGridCellAttr*)_obj)->IncRef();
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_DecRef)(void* _obj)
+{
+	((wxGridCellAttr*)_obj)->DecRef();
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetTextColour)(void* _obj, void* colText)
+{
+	((wxGridCellAttr*)_obj)->SetTextColour(*((wxColour*)colText));
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetBackgroundColour)(void* _obj, void* colBack)
+{
+	((wxGridCellAttr*)_obj)->SetBackgroundColour(*((wxColour*)colBack));
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetFont)(void* _obj, void* font)
+{
+	((wxGridCellAttr*)_obj)->SetFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetAlignment)(void* _obj, int hAlign, int vAlign)
+{
+	((wxGridCellAttr*)_obj)->SetAlignment(hAlign, vAlign);
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetReadOnly)(void* _obj, int isReadOnly)
+{
+	((wxGridCellAttr*)_obj)->SetReadOnly(isReadOnly != 0);
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetRenderer)(void* _obj, void* renderer)
+{
+	((wxGridCellAttr*)_obj)->SetRenderer((wxGridCellRenderer*)renderer);
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetEditor)(void* _obj, void* editor)
+{
+	((wxGridCellAttr*)_obj)->SetEditor((wxGridCellEditor*) editor);
+}
+	
+EWXWEXPORT(int, wxGridCellAttr_HasTextColour)(void* _obj)
+{
+	return (int)((wxGridCellAttr*)_obj)->HasTextColour();
+}
+	
+EWXWEXPORT(int, wxGridCellAttr_HasBackgroundColour)(void* _obj)
+{
+	return (int)((wxGridCellAttr*)_obj)->HasBackgroundColour();
+}
+	
+EWXWEXPORT(int, wxGridCellAttr_HasFont)(void* _obj)
+{
+	return (int)((wxGridCellAttr*)_obj)->HasFont();
+}
+	
+EWXWEXPORT(int, wxGridCellAttr_HasAlignment)(void* _obj)
+{
+	return (int)((wxGridCellAttr*)_obj)->HasAlignment();
+}
+	
+EWXWEXPORT(int, wxGridCellAttr_HasRenderer)(void* _obj)
+{
+	return (int)((wxGridCellAttr*)_obj)->HasRenderer();
+}
+	
+EWXWEXPORT(int, wxGridCellAttr_HasEditor)(void* _obj)
+{
+	return (int)((wxGridCellAttr*)_obj)->HasEditor();
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_GetTextColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGridCellAttr*)_obj)->GetTextColour();
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_GetBackgroundColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGridCellAttr*)_obj)->GetBackgroundColour();
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_GetFont)(void* _obj, void* font)
+{
+	*((wxFont*)font) = ((wxGridCellAttr*)_obj)->GetFont();
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_GetAlignment)(void* _obj, void* hAlign, void* vAlign)
+{
+	((wxGridCellAttr*)_obj)->GetAlignment((int*)hAlign, (int*)vAlign);
+}
+	
+EWXWEXPORT(void*, wxGridCellAttr_GetRenderer)(void* _obj, void* grid, int row, int col)
+{
+	return (void*)((wxGridCellAttr*)_obj)->GetRenderer((wxGrid*)grid, row, col);
+}
+	
+EWXWEXPORT(void*, wxGridCellAttr_GetEditor)(void* _obj, void* grid, int row, int col)
+{
+	return (void*)((wxGridCellAttr*)_obj)->GetEditor((wxGrid*)grid, row, col);
+}
+	
+EWXWEXPORT(int, wxGridCellAttr_IsReadOnly)(void* _obj)
+{
+	return (int)((wxGridCellAttr*)_obj)->IsReadOnly();
+}
+	
+EWXWEXPORT(void, wxGridCellAttr_SetDefAttr)(void* _obj, void* defAttr)
+{
+	((wxGridCellAttr*)_obj)->SetDefAttr((wxGridCellAttr*) defAttr);
+}
+	
+EWXWEXPORT(void*, wxGrid_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxGrid ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl | wxWANTS_CHARS);
+}
+
+EWXWEXPORT(void, wxGrid_CreateGrid) (void* _obj, int rows, int cols, int selmode)
+{
+	((wxGrid*)_obj)->CreateGrid (rows, cols, (wxGrid::wxGridSelectionModes)selmode);
+}
+
+EWXWEXPORT(void, wxGrid_SetSelectionMode)(void* _obj, int selmode)
+{
+	((wxGrid*)_obj)->SetSelectionMode((wxGrid::wxGridSelectionModes) selmode);
+}
+	
+EWXWEXPORT(int, wxGrid_GetNumberRows)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetNumberRows();
+}
+	
+EWXWEXPORT(int, wxGrid_GetNumberCols)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetNumberCols();
+}
+	
+EWXWEXPORT(void, wxGrid_CalcRowLabelsExposed)(void* _obj, void* reg)
+{
+	((wxGrid*)_obj)->CalcRowLabelsExposed(*((wxRegion*) reg));
+}
+	
+EWXWEXPORT(void, wxGrid_CalcColLabelsExposed)(void* _obj, void* reg)
+{
+	((wxGrid*)_obj)->CalcColLabelsExposed(*((wxRegion*) reg));
+}
+	
+EWXWEXPORT(void, wxGrid_CalcCellsExposed)(void* _obj, void* reg)
+{
+	((wxGrid*)_obj)->CalcCellsExposed(*((wxRegion*)reg));
+}
+	
+EWXWEXPORT(void,wxGrid_NewCalcCellsExposed)(void* _obj, void* reg, void* arr)
+{
+#if wxVERSION_NUMBER >= 2400
+	*((wxGridCellCoordsArray*)arr) = ((wxGrid*)_obj)->CalcCellsExposed(*((wxRegion*)reg));
+#endif
+}
+	
+EWXWEXPORT(void, wxGrid_ProcessRowLabelMouseEvent)(void* _obj, void* event)
+{
+	((wxGrid*)_obj)->ProcessRowLabelMouseEvent(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void, wxGrid_ProcessColLabelMouseEvent)(void* _obj, void* event)
+{
+	((wxGrid*)_obj)->ProcessColLabelMouseEvent(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(void, wxGrid_ProcessCornerLabelMouseEvent)(void* _obj, void* event)
+{
+	((wxGrid*)_obj)->ProcessCornerLabelMouseEvent(*((wxMouseEvent*) event));
+}
+	
+EWXWEXPORT(void, wxGrid_ProcessGridCellMouseEvent)(void* _obj, void* event)
+{
+	((wxGrid*)_obj)->ProcessGridCellMouseEvent(*((wxMouseEvent*)event));
+}
+	
+EWXWEXPORT(int, wxGrid_ProcessTableMessage)(void* _obj, void* evt)
+{
+	return (int)((wxGrid*)_obj)->ProcessTableMessage(*((wxGridTableMessage*)evt));
+}
+	
+EWXWEXPORT(void, wxGrid_DoEndDragResizeRow)(void* _obj)
+{
+	((wxGrid*)_obj)->DoEndDragResizeRow();
+}
+	
+EWXWEXPORT(void, wxGrid_DoEndDragResizeCol)(void* _obj)
+{
+	((wxGrid*)_obj)->DoEndDragResizeCol();
+}
+	
+EWXWEXPORT(void*, wxGrid_GetTable)(void* _obj)
+{
+	return (void*)((wxGrid*)_obj)->GetTable();
+}
+	
+EWXWEXPORT(int, wxGrid_SetTable)(void* _obj, void* table, int takeOwnership, int selmode)
+{
+	return (int)((wxGrid*)_obj)->SetTable((wxGridTableBase*)table, takeOwnership != 0, (wxGrid::wxGridSelectionModes) selmode);
+}
+	
+EWXWEXPORT(void, wxGrid_ClearGrid)(void* _obj)
+{
+	((wxGrid*)_obj)->ClearGrid();
+}
+	
+EWXWEXPORT(int, wxGrid_InsertRows)(void* _obj, int pos, int numRows, int updateLabels)
+{
+	return (int)((wxGrid*)_obj)->InsertRows(pos, numRows, updateLabels != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_AppendRows)(void* _obj, int numRows, int updateLabels)
+{
+	return (int)((wxGrid*)_obj)->AppendRows(numRows, updateLabels != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_DeleteRows)(void* _obj, int pos, int numRows, int updateLabels)
+{
+	return (int)((wxGrid*)_obj)->DeleteRows(pos, numRows, updateLabels != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_InsertCols)(void* _obj, int pos, int numCols, int updateLabels)
+{
+	return (int)((wxGrid*)_obj)->InsertCols(pos, numCols, updateLabels != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_AppendCols)(void* _obj, int numCols, int updateLabels )
+{
+	return (int)((wxGrid*)_obj)->AppendCols( numCols, updateLabels);
+}
+	
+EWXWEXPORT(int, wxGrid_DeleteCols)(void* _obj, int pos, int numCols, int updateLabels)
+{
+	return (int)((wxGrid*)_obj)->DeleteCols(pos, numCols, updateLabels != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_DrawGridCellArea)(void* _obj, void* dc)
+{
+#if wxVERSION_NUMBER >= 2400
+	wxGridCellCoordsArray arr;
+	((wxGrid*)_obj)->DrawGridCellArea(*((wxDC*) dc), arr);
+#else
+	((wxGrid*)_obj)->DrawGridCellArea(*((wxDC*) dc));
+#endif
+}
+	
+EWXWEXPORT(void,wxGrid_NewDrawGridCellArea)(void* _obj, void* dc, void* arr)
+{
+#if wxVERSION_NUMBER >= 2400
+	((wxGrid*)_obj)->DrawGridCellArea(*((wxDC*) dc), *((wxGridCellCoordsArray*)arr));
+#endif
+}
+	
+EWXWEXPORT(void, wxGrid_DrawGridSpace)(void* _obj, void* dc)
+{
+	((wxGrid*)_obj)->DrawGridSpace(*((wxDC*) dc));
+}
+	
+EWXWEXPORT(void, wxGrid_DrawCellBorder)(void* _obj, void* dc, int _row, int _col)
+{
+	((wxGrid*)_obj)->DrawCellBorder(*((wxDC*) dc), wxGridCellCoords(_row, _col));
+}
+	
+EWXWEXPORT(void, wxGrid_DrawAllGridLines)(void* _obj, void* dc, void* reg)
+{
+	((wxGrid*)_obj)->DrawAllGridLines(*((wxDC*) dc), *((wxRegion*) reg));
+}
+	
+EWXWEXPORT(void, wxGrid_DrawCell)(void* _obj, void* dc, int _row, int _col)
+{
+	((wxGrid*)_obj)->DrawCell(*((wxDC*) dc), wxGridCellCoords(_row, _col));
+}
+	
+EWXWEXPORT(void, wxGrid_DrawHighlight)(void* _obj, void* dc)
+{
+#if wxVERSION_NUMBER >= 2400
+	wxGridCellCoordsArray arr;
+	((wxGrid*)_obj)->DrawHighlight(*((wxDC*) dc), arr);
+#else
+	((wxGrid*)_obj)->DrawHighlight(*((wxDC*) dc));
+#endif
+}
+	
+EWXWEXPORT(void, wxGrid_NewDrawHighlight)(void* _obj, void* dc, void* arr)
+{
+#if wxVERSION_NUMBER >= 2400
+	((wxGrid*)_obj)->DrawHighlight(*((wxDC*) dc), *((wxGridCellCoordsArray*)arr));
+#endif
+}
+	
+EWXWEXPORT(void, wxGrid_DrawCellHighlight)(void* _obj, void* dc, void* attr)
+{
+	((wxGrid*)_obj)->DrawCellHighlight(*((wxDC*) dc), (const wxGridCellAttr*) attr);
+}
+	
+EWXWEXPORT(void, wxGrid_DrawRowLabels)(void* _obj, void* dc)
+{
+#if wxVERSION_NUMBER >= 2400
+	wxArrayInt arr;
+	((wxGrid*)_obj)->DrawRowLabels(*((wxDC*) dc), arr);
+#else
+	((wxGrid*)_obj)->DrawRowLabels(*((wxDC*) dc));
+#endif
+}
+	
+EWXWEXPORT(void, wxGrid_DrawRowLabel)(void* _obj, void* dc, int row)
+{
+	((wxGrid*)_obj)->DrawRowLabel(*((wxDC*) dc), row);
+}
+	
+EWXWEXPORT(void, wxGrid_DrawColLabels)(void* _obj, void* dc)
+{
+#if wxVERSION_NUMBER >= 2400
+	wxArrayInt arr;
+	((wxGrid*)_obj)->DrawColLabels(*((wxDC*) dc), arr);
+#else
+	((wxGrid*)_obj)->DrawColLabels(*((wxDC*) dc));
+#endif
+}
+	
+EWXWEXPORT(void, wxGrid_DrawColLabel)(void* _obj, void* dc, int col)
+{
+	((wxGrid*)_obj)->DrawColLabel(*((wxDC*) dc), col);
+}
+	
+EWXWEXPORT(void, wxGrid_DrawTextRectangle)(void* _obj, void* dc, void* txt, int x, int y, int w, int h, int horizontalAlignment, int verticalAlignment)
+{
+	((wxGrid*)_obj)->DrawTextRectangle(*((wxDC*) dc), (wxChar*)txt, wxRect(x, y, w, h), horizontalAlignment, verticalAlignment);
+}
+	
+EWXWEXPORT(int, wxGrid_StringToLines)(void* _obj,  void* value, void* lines)
+{
+	int result = 0;
+	wxArrayString arr;
+	
+	((wxGrid*)_obj)->StringToLines((wxChar*)value, arr);
+	
+	result = arr.GetCount();
+	
+	if (lines)
+	{
+		for (int i = 0; i < result; i++)
+			((const wxChar**)lines)[i] = wxStrdup (arr[i].c_str());
+	}
+	return result;
+}
+	
+EWXWEXPORT(void, wxGrid_GetTextBoxSize)(void* _obj, void* dc, int count, void* lines, void* width, void* height)
+{
+	wxArrayString arr;
+
+	for (int i = 0; i < count; i++)
+		arr[i] = ((wxChar**)lines)[i];
+
+	((wxGrid*)_obj)->GetTextBoxSize(*((wxDC*) dc), arr, (long*)width, (long*)height);
+}
+	
+EWXWEXPORT(void, wxGrid_BeginBatch)(void* _obj)
+{
+	((wxGrid*)_obj)->BeginBatch();
+}
+	
+EWXWEXPORT(void, wxGrid_EndBatch)(void* _obj)
+{
+	((wxGrid*)_obj)->EndBatch();
+}
+	
+EWXWEXPORT(int, wxGrid_GetBatchCount)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetBatchCount();
+}
+	
+EWXWEXPORT(int, wxGrid_IsEditable)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->IsEditable();
+}
+	
+EWXWEXPORT(void, wxGrid_EnableEditing)(void* _obj, int edit)
+{
+	((wxGrid*)_obj)->EnableEditing(edit != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_EnableCellEditControl)(void* _obj, int enable)
+{
+	((wxGrid*)_obj)->EnableCellEditControl(enable != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_DisableCellEditControl)(void* _obj)
+{
+	((wxGrid*)_obj)->DisableCellEditControl();
+}
+	
+EWXWEXPORT(int, wxGrid_CanEnableCellControl)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->CanEnableCellControl();
+}
+	
+EWXWEXPORT(int, wxGrid_IsCellEditControlEnabled)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->IsCellEditControlEnabled();
+}
+	
+EWXWEXPORT(int, wxGrid_IsCellEditControlShown)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->IsCellEditControlShown();
+}
+	
+EWXWEXPORT(int, wxGrid_IsCurrentCellReadOnly)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->IsCurrentCellReadOnly();
+}
+	
+EWXWEXPORT(void, wxGrid_ShowCellEditControl)(void* _obj)
+{
+	((wxGrid*)_obj)->ShowCellEditControl();
+}
+	
+EWXWEXPORT(void, wxGrid_HideCellEditControl)(void* _obj)
+{
+	((wxGrid*)_obj)->HideCellEditControl();
+}
+	
+EWXWEXPORT(void, wxGrid_SaveEditControlValue)(void* _obj)
+{
+	((wxGrid*)_obj)->SaveEditControlValue();
+}
+	
+EWXWEXPORT(void, wxGrid_XYToCell)(void* _obj, int x, int y, int* r, int* c)
+{
+	wxGridCellCoords cds;
+	((wxGrid*)_obj)->XYToCell(x, y, cds);
+	*r = cds.GetRow();
+	*c = cds.GetCol();
+}
+	
+EWXWEXPORT(int, wxGrid_YToRow)(void* _obj, int y)
+{
+	return ((wxGrid*)_obj)->YToRow(y);
+}
+	
+EWXWEXPORT(int, wxGrid_XToCol)(void* _obj, int x)
+{
+	return ((wxGrid*)_obj)->XToCol(x);
+}
+	
+EWXWEXPORT(int, wxGrid_YToEdgeOfRow)(void* _obj, int y)
+{
+	return ((wxGrid*)_obj)->YToEdgeOfRow(y);
+}
+	
+EWXWEXPORT(int, wxGrid_XToEdgeOfCol)(void* _obj, int x)
+{
+	return ((wxGrid*)_obj)->XToEdgeOfCol(x);
+}
+	
+EWXWEXPORT(void, wxGrid_CellToRect)(void* _obj, int row, int col, int* x, int* y, int* w, int* h)
+{
+	wxRect rct = ((wxGrid*)_obj)->CellToRect(row, col);
+	*x = rct.x;
+	*y = rct.y;
+	*w = rct.width;
+	*h = rct.height;
+}
+	
+EWXWEXPORT(int, wxGrid_GetGridCursorRow)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetGridCursorRow();
+}
+	
+EWXWEXPORT(int, wxGrid_GetGridCursorCol)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetGridCursorCol();
+}
+	
+EWXWEXPORT(int, wxGrid_IsVisible)(void* _obj,  int row, int col, int wholeCellVisible)
+{
+	return (int)((wxGrid*)_obj)->IsVisible(row, col, wholeCellVisible != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_MakeCellVisible)(void* _obj, int row, int col)
+{
+	((wxGrid*)_obj)->MakeCellVisible(row, col);
+}
+	
+EWXWEXPORT(void, wxGrid_SetGridCursor)(void* _obj, int row, int col)
+{
+	((wxGrid*)_obj)->SetGridCursor(row, col);
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorUp)(void* _obj, int expandSelection)
+{
+	return (int)((wxGrid*)_obj)->MoveCursorUp(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorDown)(void* _obj, int expandSelection )
+{
+	return (int)((wxGrid*)_obj)->MoveCursorDown(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorLeft)(void* _obj, int expandSelection)
+{
+	return (int)((wxGrid*)_obj)->MoveCursorLeft(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorRight)(void* _obj, int expandSelection)
+{
+	return (int)((wxGrid*)_obj)->MoveCursorRight(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_MovePageDown)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->MovePageDown();
+}
+	
+EWXWEXPORT(int, wxGrid_MovePageUp)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->MovePageUp();
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorUpBlock)(void* _obj, int expandSelection)
+{
+	return (int)((wxGrid*)_obj)->MoveCursorUpBlock(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorDownBlock)(void* _obj, int expandSelection)
+{
+	return (int)((wxGrid*)_obj)->MoveCursorDownBlock(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorLeftBlock)(void* _obj, int expandSelection)
+{
+	return (int)((wxGrid*)_obj)->MoveCursorLeftBlock(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_MoveCursorRightBlock)(void* _obj, int expandSelection)
+{
+	return (int)((wxGrid*)_obj)->MoveCursorRightBlock(expandSelection != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_GetDefaultRowLabelSize)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetDefaultRowLabelSize();
+}
+	
+EWXWEXPORT(int, wxGrid_GetRowLabelSize)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetRowLabelSize();
+}
+	
+EWXWEXPORT(int, wxGrid_GetDefaultColLabelSize)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetDefaultColLabelSize();
+}
+	
+EWXWEXPORT(int, wxGrid_GetColLabelSize)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetColLabelSize();
+}
+	
+EWXWEXPORT(void, wxGrid_GetLabelBackgroundColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetLabelBackgroundColour();
+}
+	
+EWXWEXPORT(void, wxGrid_GetLabelTextColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetLabelTextColour();
+}
+	
+EWXWEXPORT(void, wxGrid_GetLabelFont)(void* _obj, void* font)
+{
+	*((wxFont*)font) = ((wxGrid*)_obj)->GetLabelFont();
+}
+	
+EWXWEXPORT(void, wxGrid_GetRowLabelAlignment)(void* _obj, void* horiz, void* vert)
+{
+	((wxGrid*)_obj)->GetRowLabelAlignment((int*)horiz, (int*)vert);
+}
+	
+EWXWEXPORT(void, wxGrid_GetColLabelAlignment)(void* _obj, void* horiz, void* vert)
+{
+	((wxGrid*)_obj)->GetColLabelAlignment((int*)horiz, (int*)vert);
+}
+	
+EWXWEXPORT(int, wxGrid_GetRowLabelValue)(void* _obj, int row, void* _buf)
+{
+	wxString result =((wxGrid*)_obj)->GetRowLabelValue(row);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxGrid_GetColLabelValue)(void* _obj, int col, void* _buf)
+{
+	wxString result =((wxGrid*)_obj)->GetColLabelValue(col);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxGrid_GetGridLineColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetGridLineColour();
+}
+	
+EWXWEXPORT(void, wxGrid_GetCellHighlightColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetCellHighlightColour();
+}
+	
+EWXWEXPORT(void, wxGrid_SetRowLabelSize)(void* _obj, int width)
+{
+	((wxGrid*)_obj)->SetRowLabelSize(width);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColLabelSize)(void* _obj, int height)
+{
+	((wxGrid*)_obj)->SetColLabelSize(height);
+}
+	
+EWXWEXPORT(void, wxGrid_SetLabelBackgroundColour)(void* _obj, void* colour)
+{
+	((wxGrid*)_obj)->SetLabelBackgroundColour(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxGrid_SetLabelTextColour)(void* _obj, void* colour)
+{
+	((wxGrid*)_obj)->SetLabelTextColour(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxGrid_SetLabelFont)(void* _obj, void* font)
+{
+	((wxGrid*)_obj)->SetLabelFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(void, wxGrid_SetRowLabelAlignment)(void* _obj, int horiz, int vert)
+{
+	((wxGrid*)_obj)->SetRowLabelAlignment(horiz, vert);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColLabelAlignment)(void* _obj, int horiz, int vert)
+{
+	((wxGrid*)_obj)->SetColLabelAlignment(horiz, vert);
+}
+	
+EWXWEXPORT(void, wxGrid_SetRowLabelValue)(void* _obj, int row, void* label)
+{
+	((wxGrid*)_obj)->SetRowLabelValue(row, (wxChar*)label);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColLabelValue)(void* _obj, int col, void* label)
+{
+	((wxGrid*)_obj)->SetColLabelValue(col, (wxChar*)label);
+}
+	
+EWXWEXPORT(void, wxGrid_SetGridLineColour)(void* _obj, void* col)
+{
+	((wxGrid*)_obj)->SetGridLineColour(*((wxColour*) col));
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellHighlightColour)(void* _obj, void* col)
+{
+	((wxGrid*)_obj)->SetCellHighlightColour(*((wxColour*) col));
+}
+	
+EWXWEXPORT(void, wxGrid_EnableDragRowSize)(void* _obj, int enable)
+{
+	((wxGrid*)_obj)->EnableDragRowSize(enable != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_DisableDragRowSize)(void* _obj)
+{
+	((wxGrid*)_obj)->DisableDragRowSize();
+}
+	
+EWXWEXPORT(int, wxGrid_CanDragRowSize)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->CanDragRowSize();
+}
+	
+EWXWEXPORT(void, wxGrid_EnableDragColSize)(void* _obj, int enable)
+{
+	((wxGrid*)_obj)->EnableDragColSize(enable != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_DisableDragColSize)(void* _obj)
+{
+	((wxGrid*)_obj)->DisableDragColSize();
+}
+	
+EWXWEXPORT(int, wxGrid_CanDragColSize)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->CanDragColSize();
+}
+	
+EWXWEXPORT(void, wxGrid_EnableDragGridSize)(void* _obj, int enable)
+{
+	((wxGrid*)_obj)->EnableDragGridSize(enable != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_DisableDragGridSize)(void* _obj)
+{
+	((wxGrid*)_obj)->DisableDragGridSize();
+}
+	
+EWXWEXPORT(int, wxGrid_CanDragGridSize)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->CanDragGridSize();
+}
+	
+EWXWEXPORT(void, wxGrid_SetRowAttr)(void* _obj, int row, void* attr)
+{
+	((wxGrid*)_obj)->SetRowAttr(row, (wxGridCellAttr*) attr);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColAttr)(void* _obj, int col, void* attr)
+{
+	((wxGrid*)_obj)->SetColAttr(col, (wxGridCellAttr*) attr);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColFormatBool)(void* _obj, int col)
+{
+	((wxGrid*)_obj)->SetColFormatBool(col);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColFormatNumber)(void* _obj, int col)
+{
+	((wxGrid*)_obj)->SetColFormatNumber(col);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColFormatFloat)(void* _obj, int col, int width, int precision)
+{
+	((wxGrid*)_obj)->SetColFormatFloat(col, width, precision);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColFormatCustom)(void* _obj, int col, void* typeName)
+{
+	((wxGrid*)_obj)->SetColFormatCustom(col, (wxChar*)typeName);
+}
+	
+EWXWEXPORT(void, wxGrid_EnableGridLines)(void* _obj, int enable)
+{
+	((wxGrid*)_obj)->EnableGridLines(enable != 0);
+}
+	
+EWXWEXPORT(int, wxGrid_GridLinesEnabled)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->GridLinesEnabled();
+}
+	
+EWXWEXPORT(int, wxGrid_GetDefaultRowSize)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetDefaultRowSize();
+}
+	
+EWXWEXPORT(int, wxGrid_GetRowSize)(void* _obj, int row)
+{
+	return ((wxGrid*)_obj)->GetRowSize(row);
+}
+	
+EWXWEXPORT(int, wxGrid_GetDefaultColSize)(void* _obj)
+{
+	return ((wxGrid*)_obj)->GetDefaultColSize();
+}
+	
+EWXWEXPORT(int, wxGrid_GetColSize)(void* _obj, int col)
+{
+	return ((wxGrid*)_obj)->GetColSize(col);
+}
+	
+EWXWEXPORT(void, wxGrid_GetDefaultCellBackgroundColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetDefaultCellBackgroundColour();
+}
+	
+EWXWEXPORT(void, wxGrid_GetCellBackgroundColour)(void* _obj, int row, int col, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetCellBackgroundColour(row, col);
+}
+	
+EWXWEXPORT(void, wxGrid_GetDefaultCellTextColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetDefaultCellTextColour();
+}
+	
+EWXWEXPORT(void, wxGrid_GetCellTextColour)(void* _obj, int row, int col, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetCellTextColour(row, col);
+}
+	
+EWXWEXPORT(void, wxGrid_GetDefaultCellFont)(void* _obj, void* font)
+{
+	*((wxFont*)font) = ((wxGrid*)_obj)->GetDefaultCellFont();
+}
+	
+EWXWEXPORT(void, wxGrid_GetCellFont)(void* _obj, int row, int col, void* font)
+{
+	*((wxFont*)font) = ((wxGrid*)_obj)->GetCellFont(row, col);
+}
+	
+EWXWEXPORT(void, wxGrid_GetDefaultCellAlignment)(void* _obj, void* horiz, void* vert)
+{
+	((wxGrid*)_obj)->GetDefaultCellAlignment((int*)horiz, (int*)vert);
+}
+	
+EWXWEXPORT(void, wxGrid_GetCellAlignment)(void* _obj,  int row, int col, void* horiz, void* vert)
+{
+	((wxGrid*)_obj)->GetCellAlignment(row, col, (int*)horiz, (int*)vert);
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultRowSize)(void* _obj, int height, int resizeExistingRows)
+{
+	((wxGrid*)_obj)->SetDefaultRowSize(height, resizeExistingRows != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_SetRowSize)(void* _obj,  int row, int height)
+{
+	((wxGrid*)_obj)->SetRowSize(row, height);
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultColSize)(void* _obj, int width, int resizeExistingCols)
+{
+	((wxGrid*)_obj)->SetDefaultColSize(width, resizeExistingCols != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_SetColSize)(void* _obj, int col, int width)
+{
+	((wxGrid*)_obj)->SetColSize(col, width);
+}
+	
+EWXWEXPORT(void, wxGrid_AutoSizeColumn)(void* _obj, int col, int setAsMin)
+{
+	((wxGrid*)_obj)->AutoSizeColumn(col, setAsMin != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_AutoSizeRow)(void* _obj, int row, int setAsMin)
+{
+	((wxGrid*)_obj)->AutoSizeRow(row, setAsMin != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_AutoSizeColumns)(void* _obj, int setAsMin)
+{
+	((wxGrid*)_obj)->AutoSizeColumns(setAsMin != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_AutoSizeRows)(void* _obj, int setAsMin)
+{
+	((wxGrid*)_obj)->AutoSizeRows(setAsMin != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_AutoSize)(void* _obj)
+{
+	((wxGrid*)_obj)->AutoSize();
+}
+	
+EWXWEXPORT(void, wxGrid_SetColMinimalWidth)(void* _obj, int col, int width)
+{
+	((wxGrid*)_obj)->SetColMinimalWidth(col, width);
+}
+	
+EWXWEXPORT(void, wxGrid_SetRowMinimalHeight)(void* _obj, int row, int width)
+{
+	((wxGrid*)_obj)->SetRowMinimalHeight(row, width);
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultCellBackgroundColour)(void* _obj, void* colour)
+{
+	((wxGrid*)_obj)->SetDefaultCellBackgroundColour(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellBackgroundColour)(void* _obj, int row, int col, void* colour)
+{
+	((wxGrid*)_obj)->SetCellBackgroundColour(row, col, *((wxColour*) colour));
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultCellTextColour)(void* _obj, void* colour)
+{
+	((wxGrid*)_obj)->SetDefaultCellTextColour(*((wxColour*)colour));
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellTextColour)(void* _obj, int row, int col, void* colour)
+{
+	((wxGrid*)_obj)->SetCellTextColour(row, col, *((wxColour*) colour));
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultCellFont)(void* _obj, void* font)
+{
+	((wxGrid*)_obj)->SetDefaultCellFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellFont)(void* _obj,  int row, int col, void* font)
+{
+	((wxGrid*)_obj)->SetCellFont(row, col, *((wxFont*)font) );
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultCellAlignment)(void* _obj, int horiz, int vert)
+{
+	((wxGrid*)_obj)->SetDefaultCellAlignment(horiz, vert);
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellAlignment)(void* _obj,  int row, int col, int horiz, int vert)
+{
+	((wxGrid*)_obj)->SetCellAlignment(row, col, horiz, vert);
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultRenderer)(void* _obj, void* renderer)
+{
+	((wxGrid*)_obj)->SetDefaultRenderer((wxGridCellRenderer*) renderer);
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellRenderer)(void* _obj, int row, int col, void* renderer)
+{
+	((wxGrid*)_obj)->SetCellRenderer(row, col, (wxGridCellRenderer*)renderer);
+}
+	
+EWXWEXPORT(void*, wxGrid_GetDefaultRenderer)(void* _obj)
+{
+	return (void*)((wxGrid*)_obj)->GetDefaultRenderer();
+}
+	
+EWXWEXPORT(void*, wxGrid_GetCellRenderer)(void* _obj, int row, int col)
+{
+	return (void*)((wxGrid*)_obj)->GetCellRenderer(row, col);
+}
+	
+EWXWEXPORT(void, wxGrid_SetDefaultEditor)(void* _obj, void* editor)
+{
+	((wxGrid*)_obj)->SetDefaultEditor((wxGridCellEditor*)editor);
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellEditor)(void* _obj, int row, int col, void* editor)
+{
+	((wxGrid*)_obj)->SetCellEditor(row, col, (wxGridCellEditor*)editor);
+}
+	
+EWXWEXPORT(void*, wxGrid_GetDefaultEditor)(void* _obj)
+{
+	return (void*)((wxGrid*)_obj)->GetDefaultEditor();
+}
+	
+EWXWEXPORT(void*, wxGrid_GetCellEditor)(void* _obj, int row, int col)
+{
+	return (void*)((wxGrid*)_obj)->GetCellEditor(row, col);
+}
+	
+EWXWEXPORT(int, wxGrid_GetCellValue)(void* _obj, int row, int col, void* _buf)
+{
+	wxString result =((wxGrid*)_obj)->GetCellValue(row, col);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxGrid_SetCellValue)(void* _obj,  int row, int col, void* s)
+{
+	((wxGrid*)_obj)->SetCellValue(row, col, (wxChar*) s);
+}
+	
+EWXWEXPORT(int, wxGrid_IsReadOnly)(void* _obj, int row, int col)
+{
+	return (int)((wxGrid*)_obj)->IsReadOnly(row, col);
+}
+	
+EWXWEXPORT(void, wxGrid_SetReadOnly)(void* _obj, int row, int col, int isReadOnly)
+{
+	((wxGrid*)_obj)->SetReadOnly(row, col, isReadOnly != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_SelectRow)(void* _obj, int row, int addToSelected)
+{
+	((wxGrid*)_obj)->SelectRow(row, addToSelected != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_SelectCol)(void* _obj, int col, int addToSelected)
+{
+	((wxGrid*)_obj)->SelectCol(col, addToSelected != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_SelectBlock)(void* _obj,  int topRow, int leftCol, int bottomRow, int rightCol, int addToSelected)
+{
+	((wxGrid*)_obj)->SelectBlock(topRow, leftCol, bottomRow, rightCol, addToSelected != 0);
+}
+	
+EWXWEXPORT(void, wxGrid_SelectAll)(void* _obj)
+{
+	((wxGrid*)_obj)->SelectAll();
+}
+	
+EWXWEXPORT(int, wxGrid_IsSelection)(void* _obj)
+{
+	return (int)((wxGrid*)_obj)->IsSelection();
+}
+	
+EWXWEXPORT(void, wxGrid_ClearSelection)(void* _obj)
+{
+	((wxGrid*)_obj)->ClearSelection();
+}
+	
+EWXWEXPORT(int, wxGrid_IsInSelection)(void* _obj, int row, int col )
+{
+	return (int)((wxGrid*)_obj)->IsInSelection(row, col );
+}
+	
+EWXWEXPORT(void, wxGrid_BlockToDeviceRect)(void* _obj, int top, int left, int bottom, int right, int* x, int* y, int* w, int* h)
+{
+	wxRect rct = ((wxGrid*)_obj)->BlockToDeviceRect(wxGridCellCoords(top, left), wxGridCellCoords(bottom, right));
+	*x = rct.x;
+	*y = rct.y;
+	*w = rct.width;
+	*h = rct.height;
+}
+	
+EWXWEXPORT(void, wxGrid_GetSelectionBackground)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetSelectionBackground();
+}
+	
+EWXWEXPORT(void, wxGrid_GetSelectionForeground)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxGrid*)_obj)->GetSelectionForeground();
+}
+	
+EWXWEXPORT(void, wxGrid_SetSelectionBackground)(void* _obj, void* c)
+{
+	((wxGrid*)_obj)->SetSelectionBackground(*((wxColour*) c));
+}
+	
+EWXWEXPORT(void, wxGrid_SetSelectionForeground)(void* _obj, void* c)
+{
+	((wxGrid*)_obj)->SetSelectionForeground(*((wxColour*) c));
+}
+	
+EWXWEXPORT(void, wxGrid_RegisterDataType)(void* _obj, void* typeName, void* renderer, void* editor)
+{
+	((wxGrid*)_obj)->RegisterDataType((wxChar*) typeName, (wxGridCellRenderer*) renderer, (wxGridCellEditor*) editor);
+}
+	
+EWXWEXPORT(void*, wxGrid_GetDefaultEditorForCell)(void* _obj, int row, int col)
+{
+	return (void*)((wxGrid*)_obj)->GetDefaultEditorForCell(row, col);
+}
+	
+EWXWEXPORT(void*, wxGrid_GetDefaultRendererForCell)(void* _obj, int row, int col)
+{
+	return (void*)((wxGrid*)_obj)->GetDefaultRendererForCell(row, col);
+}
+	
+EWXWEXPORT(void*, wxGrid_GetDefaultEditorForType)(void* _obj, void* typeName)
+{
+	return (void*)((wxGrid*)_obj)->GetDefaultEditorForType((wxChar*) typeName);
+}
+	
+EWXWEXPORT(void*, wxGrid_GetDefaultRendererForType)(void* _obj, void* typeName)
+{
+	return (void*)((wxGrid*)_obj)->GetDefaultRendererForType((wxChar*) typeName);
+}
+	
+EWXWEXPORT(void, wxGrid_SetMargins)(void* _obj, int extraWidth, int extraHeight)
+{
+	((wxGrid*)_obj)->SetMargins(extraWidth, extraHeight);
+}
+
+EWXWEXPORT(void,wxGrid_GetSelectedCells)(void* _obj, void* _arr)
+{
+	*((wxGridCellCoordsArray*)_arr) = ((wxGrid*)_obj)->GetSelectedCells();
+}
+	
+EWXWEXPORT(void,wxGrid_GetSelectionBlockTopLeft)(void* _obj, void* _arr)
+{
+	*((wxGridCellCoordsArray*)_arr) = ((wxGrid*)_obj)->GetSelectionBlockTopLeft();
+}
+	
+EWXWEXPORT(void,wxGrid_GetSelectionBlockBottomRight)(void* _obj, void* _arr)
+{
+	*((wxGridCellCoordsArray*)_arr) = ((wxGrid*)_obj)->GetSelectionBlockBottomRight();
+}
+	
+EWXWEXPORT(int,wxGrid_GetSelectedRows)(void* _obj, void* _arr)
+{
+	wxArrayInt arr = ((wxGrid*)_obj)->GetSelectedRows();
+	if (_arr)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((int*)_arr)[i] = arr.Item(i);
+	}
+	return arr.GetCount();
+}
+	
+EWXWEXPORT(int,wxGrid_GetSelectedCols)(void* _obj, void* _arr)
+{
+	wxArrayInt arr = ((wxGrid*)_obj)->GetSelectedCols();
+	if (_arr)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((int*)_arr)[i] = arr.Item(i);
+	}
+	return arr.GetCount();
+}
+	
+
+
+EWXWEXPORT(void*,ELJGridTable_Create)(void* _obj,
+                                      void* _EifGetNumberRows,
+                                      void* _EifGetNumberCols,
+                                      void* _EifGetValue,
+                                      void* _EifSetValue,
+                                      void* _EifIsEmptyCell,
+                                      void* _EifClear,
+                                      void* _EifInsertRows,
+                                      void* _EifAppendRows,
+                                      void* _EifDeleteRows,
+                                      void* _EifInsertCols,
+                                      void* _EifAppendCols,
+                                      void* _EifDeleteCols,
+                                      void* _EifSetRowLabelValue,
+                                      void* _EifSetColLabelValue,
+                                      void* _EifGetRowLabelValue,
+                                      void* _EifGetColLabelValue)
+{
+	return (void*)new ELJGridTable (_obj,
+	                                _EifGetNumberRows,
+	                                _EifGetNumberCols,
+	                                _EifGetValue,
+	                                _EifSetValue,
+	                                _EifIsEmptyCell,
+	                                _EifClear,
+	                                _EifInsertRows,
+	                                _EifAppendRows,
+	                                _EifDeleteRows,
+	                                _EifInsertCols,
+	                                _EifAppendCols,
+	                                _EifDeleteCols,
+	                                _EifSetRowLabelValue,
+	                                _EifSetColLabelValue,
+	                                _EifGetRowLabelValue,
+	                                _EifGetColLabelValue);
+}
+	
+EWXWEXPORT(void,ELJGridTable_Delete)(void* _obj)
+{
+	delete (ELJGridTable*)_obj;
+}
+
+EWXWEXPORT(void*,ELJGridTable_GetView)(void* _obj)
+{
+	return (void*)((ELJGridTable*)_obj)->GetView();
+}
+
+EWXWEXPORT(void,ELJGridTable_SendTableMessage)(void* _obj, int id, int val1, int val2)
+{
+	wxGridTableMessage msg((ELJGridTable*)_obj, id, val1, val2);
+	((ELJGridTable*)_obj)->GetView()->ProcessTableMessage(msg);
+}
+
+EWXWEXPORT(int,wxGridEvent_GetRow)(void* _obj)
+{
+	return ((wxGridEvent*)_obj)->GetRow();
+}
+	
+EWXWEXPORT(int,wxGridEvent_GetCol)(void* _obj)
+{
+	return ((wxGridEvent*)_obj)->GetCol();
+}
+	
+EWXWEXPORT(void,wxGridEvent_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pt = ((wxGridEvent*)_obj)->GetPosition();
+	*((int*)_x) = pt.x;
+	*((int*)_y) = pt.y;
+}
+	
+EWXWEXPORT(int,wxGridEvent_Selecting)(void* _obj)
+{
+	return (int)((wxGridEvent*)_obj)->Selecting();
+}
+	
+EWXWEXPORT(int,wxGridEvent_ControlDown)(void* _obj)
+{
+	return  (int)((wxGridEvent*)_obj)->ControlDown();
+}
+	
+EWXWEXPORT(int,wxGridEvent_MetaDown)(void* _obj)
+{
+	return (int)((wxGridEvent*)_obj)->MetaDown();
+}
+	
+EWXWEXPORT(int,wxGridEvent_ShiftDown)(void* _obj)
+{
+	return (int)((wxGridEvent*)_obj)->ShiftDown();
+}
+	
+EWXWEXPORT(int,wxGridEvent_AltDown)(void* _obj)
+{
+	return (int)((wxGridEvent*)_obj)->AltDown();
+}
+	
+
+EWXWEXPORT(int,wxGridSizeEvent_GetRowOrCol)(void* _obj)
+{
+	return ((wxGridSizeEvent*)_obj)->GetRowOrCol();
+}
+	
+EWXWEXPORT(void,wxGridSizeEvent_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pt = ((wxGridSizeEvent*)_obj)->GetPosition();
+	*((int*)_x) = pt.x;
+	*((int*)_y) = pt.y;
+}
+	
+EWXWEXPORT(int,wxGridSizeEvent_ControlDown)(void* _obj)
+{
+	return (int)((wxGridSizeEvent*)_obj)->ControlDown();
+}
+	
+EWXWEXPORT(int,wxGridSizeEvent_MetaDown)(void* _obj)
+{
+	return (int)((wxGridSizeEvent*)_obj)->MetaDown();
+}
+	
+EWXWEXPORT(int,wxGridSizeEvent_ShiftDown)(void* _obj)
+{
+	return (int)((wxGridSizeEvent*)_obj)->ShiftDown();
+}
+	
+EWXWEXPORT(int,wxGridSizeEvent_AltDown)(void* _obj)
+{
+	return (int)((wxGridSizeEvent*)_obj)->AltDown();
+}
+	
+
+EWXWEXPORT(void,wxGridRangeSelectEvent_GetTopLeftCoords)(void* _obj, void* _c, void* _r)
+{
+	wxGridCellCoords crd = ((wxGridRangeSelectEvent*)_obj)->GetTopLeftCoords();
+	*((int*)_c) = crd.GetRow();
+	*((int*)_r) = crd.GetCol();
+}
+	
+EWXWEXPORT(void,wxGridRangeSelectEvent_GetBottomRightCoords)(void* _obj, void* _c, void* _r)
+{
+	wxGridCellCoords crd = ((wxGridRangeSelectEvent*)_obj)->GetBottomRightCoords();
+	*((int*)_c) = crd.GetRow();
+	*((int*)_r) = crd.GetCol();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_GetTopRow)(void* _obj)
+{
+	return ((wxGridRangeSelectEvent*)_obj)->GetTopRow();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_GetBottomRow)(void* _obj)
+{
+	return ((wxGridRangeSelectEvent*)_obj)->GetBottomRow();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_GetLeftCol)(void* _obj)
+{
+	return ((wxGridRangeSelectEvent*)_obj)->GetLeftCol();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_GetRightCol)(void* _obj)
+{
+	return ((wxGridRangeSelectEvent*)_obj)->GetRightCol();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_Selecting)(void* _obj)
+{
+	return (int)((wxGridRangeSelectEvent*)_obj)->Selecting();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_ControlDown)(void* _obj)
+{
+	return (int)((wxGridRangeSelectEvent*)_obj)->ControlDown();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_MetaDown)(void* _obj)
+{
+	return (int)((wxGridRangeSelectEvent*)_obj)->MetaDown();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_ShiftDown)(void* _obj)
+{
+	return (int)((wxGridRangeSelectEvent*)_obj)->ShiftDown();
+}
+	
+EWXWEXPORT(int,wxGridRangeSelectEvent_AltDown)(void* _obj)
+{
+	return (int)((wxGridRangeSelectEvent*)_obj)->AltDown();
+}
+	
+
+EWXWEXPORT(int,wxGridEditorCreatedEvent_GetRow)(void* _obj)
+{
+	return ((wxGridEditorCreatedEvent*)_obj)->GetRow();
+}
+	
+EWXWEXPORT(int,wxGridEditorCreatedEvent_GetCol)(void* _obj)
+{
+	return ((wxGridEditorCreatedEvent*)_obj)->GetCol();
+}
+	
+EWXWEXPORT(void*,wxGridEditorCreatedEvent_GetControl)(void* _obj)
+{
+	return (void*)((wxGridEditorCreatedEvent*)_obj)->GetControl();
+}
+	
+EWXWEXPORT(void,wxGridEditorCreatedEvent_SetRow)(void* _obj, int row)
+{
+	((wxGridEditorCreatedEvent*)_obj)->SetRow(row);
+}
+	
+EWXWEXPORT(void,wxGridEditorCreatedEvent_SetCol)(void* _obj, int col)
+{
+	((wxGridEditorCreatedEvent*)_obj)->SetCol(col);
+}
+	
+EWXWEXPORT(void,wxGridEditorCreatedEvent_SetControl)(void* _obj, void* ctrl)
+{
+	((wxGridEditorCreatedEvent*)_obj)->SetControl((wxControl*)ctrl);
+}
+	
+
+} 
diff --git a/wxc/src/eljgrid.h b/wxc/src/eljgrid.h
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljgrid.h
@@ -0,0 +1,97 @@
+#ifndef __ELJGRID_H
+#define __ELJGRID_H
+
+#include "wx/grid.h"
+
+extern "C"
+{
+typedef int   _cdecl (*TGridGetInt)(void* _obj);
+typedef int   _cdecl (*TGridIsEmpty)(void* _obj, int row, int col);
+typedef void* _cdecl (*TGridGetValue)(void* _obj, int row, int col);
+typedef void  _cdecl (*TGridSetValue)(void* _obj, int row, int col, void* val);
+typedef void  _cdecl (*TGridClear)(void* _obj);
+typedef int   _cdecl (*TGridModify)(void* _obj, int pos, int num);
+typedef int   _cdecl (*TGridMultiModify)(void* _obj, int num);
+typedef void  _cdecl (*TGridSetLabel)(void* _obj, int idx, void* val);
+typedef void* _cdecl (*TGridGetLabel)(void* _obj, int idx);
+}
+
+class ELJGridTable : public wxGridTableBase
+{
+	private:
+		void* EiffelObject;
+		TGridGetInt EifGetNumberRows;
+		TGridGetInt EifGetNumberCols;
+		TGridGetValue EifGetValue;
+		TGridSetValue EifSetValue;
+		TGridIsEmpty EifIsEmptyCell;
+		TGridClear EifClear;
+		TGridModify EifInsertRows;
+		TGridMultiModify EifAppendRows;
+		TGridModify EifDeleteRows;
+		TGridModify EifInsertCols;
+		TGridMultiModify EifAppendCols;
+		TGridModify EifDeleteCols;
+		TGridSetLabel EifSetRowLabelValue;
+		TGridSetLabel EifSetColLabelValue;
+		TGridGetLabel EifGetRowLabelValue;
+		TGridGetLabel EifGetColLabelValue;
+	public:
+		ELJGridTable (void* _obj,
+		              void* _EifGetNumberRows,
+		              void* _EifGetNumberCols,
+		              void* _EifGetValue,
+		              void* _EifSetValue,
+		              void* _EifIsEmptyCell,
+		              void* _EifClear,
+		              void* _EifInsertRows,
+		              void* _EifAppendRows,
+		              void* _EifDeleteRows,
+		              void* _EifInsertCols,
+		              void* _EifAppendCols,
+		              void* _EifDeleteCols,
+		              void* _EifSetRowLabelValue,
+		              void* _EifSetColLabelValue,
+		              void* _EifGetRowLabelValue,
+		              void* _EifGetColLabelValue): wxGridTableBase()
+		{
+			EiffelObject = _obj;
+			EifGetNumberRows = (TGridGetInt)_EifGetNumberRows;
+			EifGetNumberCols = (TGridGetInt)_EifGetNumberCols;
+			EifGetValue = (TGridGetValue)_EifGetValue;
+			EifSetValue = (TGridSetValue)_EifSetValue;
+			EifIsEmptyCell = (TGridIsEmpty)_EifIsEmptyCell;
+			EifClear = (TGridClear)_EifClear;
+			EifInsertRows = (TGridModify)_EifInsertRows;
+			EifAppendRows = (TGridMultiModify)_EifAppendRows;
+			EifDeleteRows = (TGridModify)_EifDeleteRows;
+			EifInsertCols = (TGridModify)_EifInsertCols;
+			EifAppendCols = (TGridMultiModify)_EifAppendCols;
+			EifDeleteCols = (TGridModify)_EifDeleteCols;
+			EifSetRowLabelValue = (TGridSetLabel)_EifSetRowLabelValue;
+			EifSetColLabelValue = (TGridSetLabel)_EifSetColLabelValue;
+			EifGetRowLabelValue = (TGridGetLabel)_EifGetRowLabelValue;
+			EifGetColLabelValue = (TGridGetLabel)_EifGetColLabelValue;
+		};
+		
+		int GetNumberRows() {return EifGetNumberRows(EiffelObject);};
+		int GetNumberCols() {return EifGetNumberCols(EiffelObject);};
+		wxString GetValue(int row, int col) {return (wxChar*)EifGetValue(EiffelObject, row, col);};
+		void SetValue(int row, int col, const wxString& s) {EifSetValue(EiffelObject, row, col, (void*)s.c_str());};
+		bool IsEmptyCell(int row, int col) {return EifIsEmptyCell(EiffelObject, row, col) != 0;};
+
+		void Clear() {EifClear(EiffelObject);};
+		bool InsertRows(size_t pos, size_t numRows) {return EifInsertRows(EiffelObject, (int)pos, (int)numRows) != 0;};
+		bool AppendRows(size_t numRows) {return EifAppendRows(EiffelObject, (int)numRows) != 0;};
+		bool DeleteRows(size_t pos, size_t numRows) {return EifDeleteRows(EiffelObject, (int)pos, (int)numRows) != 0;};
+		bool InsertCols(size_t pos, size_t numCols) {return EifInsertCols(EiffelObject, (int)pos, (int)numCols) != 0;};
+		bool AppendCols(size_t numCols) {return EifAppendCols(EiffelObject, (int)numCols) != 0;};
+		bool DeleteCols(size_t pos, size_t numCols) {return EifDeleteCols(EiffelObject, (int)pos, (int)numCols) != 0;};
+
+		void SetRowLabelValue(int row, const wxString& s) {EifSetRowLabelValue(EiffelObject, row, (void*)s.c_str());};
+		void SetColLabelValue(int col, const wxString& s) {EifSetColLabelValue(EiffelObject, col, (void*)s.c_str());};
+		wxString GetRowLabelValue(int row) {return (wxChar*)EifGetRowLabelValue(EiffelObject, row);};
+		wxString GetColLabelValue(int col) {return (wxChar*)EifGetColLabelValue(EiffelObject, col);};
+};
+
+#endif
diff --git a/wxc/src/eljhelpcontroller.cpp b/wxc/src/eljhelpcontroller.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljhelpcontroller.cpp
@@ -0,0 +1,135 @@
+#include "wrapper.h"
+#include "wx/fs_zip.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxHtmlHelpController_Create)(int _style)
+{
+	wxGetApp().InitZipFileSystem();
+	wxGetApp().InitImageHandlers();
+	return (void*) new wxHtmlHelpController(_style);
+}
+
+EWXWEXPORT(void, wxHtmlHelpController_Delete)(void* _obj)
+{
+	delete (wxHtmlHelpController*)_obj;
+}
+
+EWXWEXPORT(void, wxHtmlHelpController_SetTitleFormat)(void* _obj, void* format)
+{
+	((wxHtmlHelpController*)_obj)->SetTitleFormat((wxChar*)format);
+}
+	
+EWXWEXPORT(void, wxHtmlHelpController_SetTempDir)(void* _obj, void* path)
+{
+	((wxHtmlHelpController*)_obj)->SetTempDir((wxChar*)path);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_AddBook)(void* _obj, void* book, int show_wait_msg)
+{
+	return (int)((wxHtmlHelpController*)_obj)->AddBook((wxChar*) book, show_wait_msg != 0);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_Display)(void* _obj, void* x)
+{
+	return (int)((wxHtmlHelpController*)_obj)->Display((wxChar*)x);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_DisplayNumber)(void* _obj, int id)
+{
+	return (int)((wxHtmlHelpController*)_obj)->Display(id);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_DisplayContents)(void* _obj)
+{
+	return (int)((wxHtmlHelpController*)_obj)->DisplayContents();
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_DisplayIndex)(void* _obj)
+{
+	return (int)((wxHtmlHelpController*)_obj)->DisplayIndex();
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_KeywordSearch)(void* _obj, void* keyword)
+{
+	return (int)((wxHtmlHelpController*)_obj)->KeywordSearch((wxChar*) keyword);
+}
+	
+EWXWEXPORT(void*, wxHtmlHelpController_GetFrame)(void* _obj)
+{
+	return (void*)((wxHtmlHelpController*)_obj)->GetFrame();
+}
+	
+EWXWEXPORT(void, wxHtmlHelpController_UseConfig)(void* _obj, void* config, void* rootpath)
+{
+	((wxHtmlHelpController*)_obj)->UseConfig((wxConfigBase*)config, (wxChar*)rootpath);
+}
+	
+EWXWEXPORT(void, wxHtmlHelpController_ReadCustomization)(void* _obj, void* cfg, void* path)
+{
+	((wxHtmlHelpController*)_obj)->ReadCustomization((wxConfigBase*)cfg, (wxChar*)path);
+}
+	
+EWXWEXPORT(void, wxHtmlHelpController_WriteCustomization)(void* _obj, void* cfg, void* path)
+{
+	((wxHtmlHelpController*)_obj)->WriteCustomization((wxConfigBase*)cfg, (wxChar*)path);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_Initialize)(void* _obj, void* file)
+{
+	return (int)((wxHtmlHelpController*)_obj)->Initialize((wxChar*)file);
+}
+	
+EWXWEXPORT(void, wxHtmlHelpController_SetViewer)(void* _obj, void* viewer, int flags)
+{
+	((wxHtmlHelpController*)_obj)->SetViewer((wxChar*)viewer, (long)flags);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_LoadFile)(void* _obj, void* file)
+{
+	return (int)((wxHtmlHelpController*)_obj)->LoadFile((wxChar*) file);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_DisplaySectionNumber)(void* _obj, int sectionNo)
+{
+	return (int)((wxHtmlHelpController*)_obj)->DisplaySection(sectionNo);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_DisplaySection)(void* _obj, void* section)
+{
+	return (int)((wxHtmlHelpController*)_obj)->DisplaySection((wxChar*)section);
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_DisplayBlock)(void* _obj, int blockNo)
+{
+	return (int)((wxHtmlHelpController*)_obj)->DisplayBlock((long)blockNo);
+}
+	
+EWXWEXPORT(void, wxHtmlHelpController_SetFrameParameters)(void* _obj, void* title, int width, int height, int pos_x, int pos_y, int newFrameEachTime)
+{
+	((wxHtmlHelpController*)_obj)->SetFrameParameters((wxChar*) title, wxSize(width, height), wxPoint(pos_x, pos_y), newFrameEachTime != 0);
+}
+	
+EWXWEXPORT(void*, wxHtmlHelpController_GetFrameParameters)(void* _obj, void* title, int* width, int* height, int* pos_x, int* pos_y, int* newFrameEachTime)
+{
+	void* result;
+	wxPoint pos;
+	wxSize size;
+
+	result = (void*)((wxHtmlHelpController*)_obj)->GetFrameParameters(&size, &pos, (bool*)newFrameEachTime);
+	
+	*height = size.y;
+	*width  = size.x;
+	*pos_x  = pos.x;
+	*pos_y  = pos.y;
+	
+	return result;
+}
+	
+EWXWEXPORT(int, wxHtmlHelpController_Quit)(void* _obj)
+{
+	return (int)((wxHtmlHelpController*)_obj)->Quit();
+}
+	
+}
diff --git a/wxc/src/eljicnbndl.cpp b/wxc/src/eljicnbndl.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljicnbndl.cpp
@@ -0,0 +1,49 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+#include "wx/artprov.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxIconBundle_CreateDefault)()
+{
+	return (void*)new wxIconBundle();
+}
+	
+EWXWEXPORT(void*,wxIconBundle_CreateFromFile)(void* file, int type)
+{
+	return (void*)new wxIconBundle((wxChar*)file, (long)type);
+}
+	
+EWXWEXPORT(void*,wxIconBundle_CreateFromIcon)(void* icon)
+{
+	return (void*) new wxIconBundle(*((wxIcon*)icon));
+}
+	
+EWXWEXPORT(void,wxIconBundle_Assign)(void* _obj, void* _ref)
+{
+	*((wxIconBundle*)_ref) = *((wxIconBundle*)_obj);
+}
+	
+EWXWEXPORT(void,wxIconBundle_Delete)(void* _obj)
+{
+	delete (wxIconBundle*)_obj;
+}
+	
+EWXWEXPORT(void,wxIconBundle_AddIconFromFile)(void* _obj, void* file, int type)
+{
+	((wxIconBundle*)_obj)->AddIcon((wxChar*)file, (long)type);
+}
+	
+EWXWEXPORT(void,wxIconBundle_AddIcon)(void* _obj, void* icon)
+{
+	((wxIconBundle*)_obj)->AddIcon(*((wxIcon*)icon));
+}
+	
+EWXWEXPORT(void,wxIconBundle_GetIcon)(void* _obj, int w, int h, void* _ref)
+{
+	*((wxIcon*)_ref) = ((wxIconBundle*)_obj)->GetIcon(wxSize(w, h));
+}
+
+}
+#endif
diff --git a/wxc/src/eljicon.cpp b/wxc/src/eljicon.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljicon.cpp
@@ -0,0 +1,111 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxIcon_CreateDefault)()
+{
+	return (void*) new wxIcon();
+}
+
+EWXWEXPORT(void, wxIcon_Delete)(void* _obj)
+{
+	delete (wxIcon*)_obj;
+}
+
+EWXWEXPORT(void*, wxIcon_FromRaw)(void* data, int width, int height)
+{
+#ifdef __WIN32__
+	return (void*) new wxIcon((const wxChar*) data, wxBITMAP_TYPE_ICO, width, height);
+#else
+	return (void*) new wxIcon((const wxChar*) data, wxBITMAP_TYPE_ANY, width, height);
+#endif
+}
+
+EWXWEXPORT(void*, wxIcon_FromXPM)(void* data)
+{
+	return (void*) new wxIcon((const wxChar*) data);
+}
+
+EWXWEXPORT(void*, wxIcon_CreateLoad) (void* name, long type, int width, int height)
+{
+	return (void*) new wxIcon((wxChar*)name, (wxBitmapType)type, width, height);
+}
+
+EWXWEXPORT(int, wxIcon_Load)(void* _obj, void* name, long type, int width, int height)
+{
+#ifdef __WIN32__
+	return (int)((wxIcon*)_obj)->LoadFile((wxChar*)name, (wxBitmapType)type, width, height);
+#else
+	return (int)((wxIcon*)_obj)->LoadFile((wxChar*)name, (wxBitmapType)type);
+#endif
+}
+
+EWXWEXPORT(void, wxIcon_CopyFromBitmap)(void* _obj, void* bmp)
+{
+#ifdef __WIN32__
+	((wxIcon*)_obj)->CopyFromBitmap(*((wxBitmap*)bmp));
+#endif
+}
+
+EWXWEXPORT(int, wxIcon_Ok)(void* _obj)
+{
+	return (int)((wxIcon*)_obj)->Ok();
+}
+
+EWXWEXPORT(int, wxIcon_GetDepth)(void* _obj)
+{
+	return (int)((wxIcon*)_obj)->GetDepth();
+}
+
+EWXWEXPORT(int, wxIcon_GetWidth)(void* _obj)
+{
+	return (int)((wxIcon*)_obj)->GetWidth();
+}
+
+EWXWEXPORT(int, wxIcon_GetHeight)(void* _obj)
+{
+	return (int)((wxIcon*)_obj)->GetHeight();
+}
+
+EWXWEXPORT(void, wxIcon_Assign)(void* _obj, void* other)
+{
+	*((wxIcon*)_obj) = *((wxIcon*)other);
+}
+
+EWXWEXPORT(int, wxIcon_IsEqual)(void* _obj, void* other)
+{
+#if (wxVERSION_NUMBER <= 2800)
+	return (int)(*((wxIcon*)_obj) == *((wxIcon*)other));
+#else
+	wxIcon* icon1 = (wxIcon *)_obj;
+	wxIcon* icon2 = (wxIcon *)other;
+	wxBitmap bmp1;
+	wxBitmap bmp2;
+	bmp1.CopyFromIcon(*icon1);
+	bmp2.CopyFromIcon(*icon2);
+	wxImage image1 = (wxImage)bmp1.ConvertToImage();
+	wxImage image2 = (wxImage)bmp2.ConvertToImage();
+	wxImage* img1 = &image1;
+	wxImage* img2 = &image2;
+	if( (icon1->GetWidth() == icon2->GetWidth()) &&
+		(icon1->GetHeight() == icon2->GetHeight()) &&
+		(icon1->GetDepth() == icon2->GetDepth())){
+		bool equal = true;
+		for(int sx=0;sx<(icon1->GetWidth());sx++){
+			for(int sy=0;sy<(icon1->GetHeight());sy++){
+				equal = equal &&
+					(img1->GetRed(sx,sy)==img2->GetRed(sx,sy) &&
+					img1->GetGreen(sx,sy)==img2->GetGreen(sx,sy) &&
+					img1->GetBlue(sx,sy)==img2->GetBlue(sx,sy) &&
+					img1->GetAlpha(sx,sy)==img2->GetAlpha(sx,sy));
+			}
+		}
+		return (int)equal;
+	} else {
+		return 0;
+	}
+#endif
+}
+
+}
diff --git a/wxc/src/eljimage.cpp b/wxc/src/eljimage.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljimage.cpp
@@ -0,0 +1,192 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxImage_CreateDefault)()
+{
+	return (void*) new wxImage();
+}
+
+EWXWEXPORT(void*, wxImage_CreateSized)(int width, int height)
+{
+	return (void*) new wxImage(width, height);
+}
+
+EWXWEXPORT(void*, wxImage_CreateFromData)(int width, int height, void* data)
+{
+	return (void*) new wxImage(width, height, (unsigned char*)data, true);
+}
+
+EWXWEXPORT(void*, wxImage_CreateFromFile)(void* name)
+{
+	return (void*) new wxImage((wxChar*)name);
+}
+
+EWXWEXPORT(void*, wxImage_CreateFromBitmap)(void* bitmap)
+{
+	return (void*) new wxImage(((wxBitmap*)bitmap)->ConvertToImage());
+}
+
+EWXWEXPORT(void, wxImage_ConvertToBitmap)(void* _obj, void* bitmap)
+{
+	wxBitmap tmp(*((wxImage*)_obj));
+	*((wxBitmap*)bitmap) = tmp;
+}
+	
+EWXWEXPORT(void, wxImage_Initialize)(void* _obj, int width, int height)
+{
+	((wxImage*)_obj)->Create(width, height);
+}
+	
+EWXWEXPORT(void, wxImage_InitializeFromData)(void* _obj, int width, int height, void* data)
+{
+	((wxImage*)_obj)->Create(width, height, (unsigned char*)data, true);
+}
+	
+EWXWEXPORT(void, wxImage_Destroy)(void* _obj)
+{
+	((wxImage*)_obj)->Destroy();
+}
+	
+EWXWEXPORT(void, wxImage_GetSubImage)(void* _obj, int x, int y, int w, int h, void* image)
+{
+	*((wxImage*)image) = ((wxImage*)_obj)->GetSubImage(wxRect(x, y, w, h));
+}
+	
+EWXWEXPORT(void, wxImage_Paste)(void* _obj, void* image, int x, int y)
+{
+	((wxImage*)_obj)->Paste(*((wxImage*)image), x, y);
+}
+	
+EWXWEXPORT(void, wxImage_Scale)(void* _obj, int width, int height, void* image)
+{
+	*((wxImage*)image) = ((wxImage*)_obj)->Scale(width, height);
+}
+	
+EWXWEXPORT(void, wxImage_Rescale)(void* _obj, int width, int height)
+{
+	((wxImage*)_obj)->Rescale(width, height);
+}
+	
+EWXWEXPORT(void, wxImage_Rotate)(void* _obj, double angle, int c_x, int c_y, int interpolating, void* offset_after_rotation, void* image)
+{
+	*((wxImage*)image) = ((wxImage*)_obj)->Rotate(angle, wxPoint(c_x, c_y), interpolating != 0, (wxPoint*)offset_after_rotation);
+}
+	
+EWXWEXPORT(void, wxImage_Rotate90)(void* _obj, int clockwise, void* image)
+{
+	*((wxImage*)image) = ((wxImage*)_obj)->Rotate90(clockwise != 0);
+}
+	
+EWXWEXPORT(void, wxImage_Mirror)(void* _obj, int horizontally, void* image)
+{
+	*((wxImage*)image) = ((wxImage*)_obj)->Mirror(horizontally != 0);
+}
+	
+EWXWEXPORT(void, wxImage_Replace)(void* _obj, char r1, char g1, char b1, char r2, char g2, char b2)
+{
+	((wxImage*)_obj)->Replace(r1, g1, b1, r2, g2, b2);
+}
+	
+EWXWEXPORT(void, wxImage_SetRGB)(void* _obj, int x, int y, char r, char g, char b)
+{
+	((wxImage*)_obj)->SetRGB(x, y, r, g, b);
+}
+	
+EWXWEXPORT(char, wxImage_GetRed)(void* _obj, int x, int y)
+{
+	return ((wxImage*)_obj)->GetRed(x, y);
+}
+	
+EWXWEXPORT(char, wxImage_GetGreen)(void* _obj, int x, int y)
+{
+	return ((wxImage*)_obj)->GetGreen(x, y);
+}
+	
+EWXWEXPORT(char, wxImage_GetBlue)(void* _obj, int x, int y)
+{
+	return ((wxImage*)_obj)->GetBlue(x, y);
+}
+	
+EWXWEXPORT(int, wxImage_CanRead)(void* name)
+{
+	return (int)wxImage::CanRead((wxChar*)name);
+}
+	
+EWXWEXPORT(int, wxImage_LoadFile)(void* _obj, void* name, int type)
+{
+	return (int)((wxImage*)_obj)->LoadFile((wxChar*)name, (long)type);
+}
+	
+EWXWEXPORT(int, wxImage_SaveFile)(void* _obj, void* name, int type)
+{
+	return (int)((wxImage*)_obj)->SaveFile((wxChar*)name, (long)type);
+}
+	
+EWXWEXPORT(int, wxImage_Ok)(void* _obj)
+{
+	return (int)((wxImage*)_obj)->Ok();
+}
+	
+EWXWEXPORT(int, wxImage_GetWidth)(void* _obj)
+{
+	return ((wxImage*)_obj)->GetWidth();
+}
+	
+EWXWEXPORT(int, wxImage_GetHeight)(void* _obj)
+{
+	return ((wxImage*)_obj)->GetHeight();
+}
+	
+EWXWEXPORT(void*, wxImage_GetData)(void* _obj)
+{
+	return (void*)((wxImage*)_obj)->GetData();
+}
+	
+EWXWEXPORT(void, wxImage_SetData)(void* _obj, void* data)
+{
+	((wxImage*)_obj)->SetData((unsigned char*)data);
+}
+	
+EWXWEXPORT(void, wxImage_SetDataAndSize)(void* _obj, char *data, int new_width, int new_height)
+{
+	((wxImage*)_obj)->SetData((unsigned char*)data, new_width, new_height);
+}
+	
+EWXWEXPORT(void, wxImage_SetMaskColour)(void* _obj, char r, char g, char b)
+{
+	((wxImage*)_obj)->SetMaskColour(r, g, b);
+}
+	
+EWXWEXPORT(char, wxImage_GetMaskRed)(void* _obj)
+{
+	return ((wxImage*)_obj)->GetMaskRed();
+}
+	
+EWXWEXPORT(char, wxImage_GetMaskGreen)(void* _obj)
+{
+	return ((wxImage*)_obj)->GetMaskGreen();
+}
+	
+EWXWEXPORT(char, wxImage_GetMaskBlue)(void* _obj)
+{
+	return ((wxImage*)_obj)->GetMaskBlue();
+}
+	
+EWXWEXPORT(void, wxImage_SetMask)(void* _obj, int mask)
+{
+	((wxImage*)_obj)->SetMask(mask != 0);
+}
+	
+EWXWEXPORT(int, wxImage_HasMask)(void* _obj)
+{
+	return (int)((wxImage*)_obj)->HasMask();
+}
+	
+EWXWEXPORT(int, wxImage_CountColours)(void* _obj, int stopafter)
+{
+	return ((wxImage*)_obj)->CountColours((long)stopafter);
+}
+	
+}
diff --git a/wxc/src/eljimagelist.cpp b/wxc/src/eljimagelist.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljimagelist.cpp
@@ -0,0 +1,74 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxImageList_Create)(int width, int height, int mask, int initialCount)
+{
+	return (void*) new wxImageList(width, height, mask != 0, initialCount);
+}
+	
+EWXWEXPORT(void, wxImageList_Delete)(void* _obj)
+{
+	delete (wxImageList*)_obj;
+}
+
+EWXWEXPORT(int, wxImageList_GetImageCount)(void* _obj)
+{
+	return ((wxImageList*)_obj)->GetImageCount();
+}
+	
+EWXWEXPORT(void, wxImageList_GetSize)(void* _obj, int index, int* width, int* height)
+{
+	bool success = ((wxImageList*)_obj)->GetSize(index, *((int*)width), *((int*)height));
+        if (!success) {
+          *width = -1;
+          *height = -1;
+        };
+}
+	
+EWXWEXPORT(int, wxImageList_AddBitmap)(void* _obj, void* bitmap, void* mask)
+{
+	return ((wxImageList*)_obj)->Add(*((wxBitmap*)bitmap), *((wxBitmap*)mask));
+}
+	
+EWXWEXPORT(int, wxImageList_AddMasked)(void* _obj, void* bitmap, void* maskColour)
+{
+	return ((wxImageList*)_obj)->Add(*((wxBitmap*)bitmap), *((wxColour*)maskColour));
+}
+	
+EWXWEXPORT(int, wxImageList_AddIcon)(void* _obj, void* icon)
+{
+	return ((wxImageList*)_obj)->Add(*((wxIcon*)icon));
+}
+	
+EWXWEXPORT(int, wxImageList_Replace)(void* _obj, int index, void* bitmap, void* mask)
+{
+#ifdef __WIN32__
+	return (int)((wxImageList*)_obj)->Replace(index, *((wxBitmap*)bitmap), *((wxBitmap*)mask));
+#else
+	return (int)((wxImageList*)_obj)->Replace(index, *((wxBitmap*)bitmap));
+#endif
+}
+	
+EWXWEXPORT(int, wxImageList_ReplaceIcon)(void* _obj, int index, void* icon)
+{
+	return (int)((wxImageList*)_obj)->Replace(index, *((wxIcon*)icon));
+}
+	
+EWXWEXPORT(int, wxImageList_Remove)(void* _obj, int index)
+{
+	return (int)((wxImageList*)_obj)->Remove(index);
+}
+	
+EWXWEXPORT(int, wxImageList_RemoveAll)(void* _obj)
+{
+	return (int)((wxImageList*)_obj)->RemoveAll();
+}
+	
+EWXWEXPORT(int, wxImageList_Draw)(void* _obj, int index, void* dc, int x, int y, int flags, int solidBackground)
+{
+	return (int)((wxImageList*)_obj)->Draw(index, *((wxDC*)dc), x, y, flags, solidBackground != 0);
+}
+	
+}
diff --git a/wxc/src/eljipc.cpp b/wxc/src/eljipc.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljipc.cpp
@@ -0,0 +1,126 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, ELJConnection_CreateDefault)()
+{
+	return new ELJConnection();
+}
+
+EWXWEXPORT(void*, ELJConnection_Create)(void* buffer, int size)
+{
+	return new ELJConnection((wxChar*)buffer, size);
+}
+
+EWXWEXPORT(void, ELJConnection_Delete)(void* _obj)
+{
+	delete (ELJConnection*)_obj;
+}
+
+EWXWEXPORT(int, ELJConnection_Execute)(void* _obj, void* data, int size, int format)
+{
+	return (int)((ELJConnection*)_obj)->Execute((wxChar*)data, size, (wxIPCFormat)format);
+}
+	
+EWXWEXPORT(void*, ELJConnection_Request)(void* _obj, void* item, void* size, int format)
+{
+	return (void*)((ELJConnection*)_obj)->Request((wxChar*)item, (int*)size, (wxIPCFormat)format);
+}
+	
+EWXWEXPORT(int, ELJConnection_Poke)(void* _obj, void* item, void* data, int size, int format)
+{
+	return (int)((ELJConnection*)_obj)->Poke((wxChar*)item, (wxChar*)data, size, (wxIPCFormat)format);
+}
+	
+EWXWEXPORT(int, ELJConnection_StartAdvise)(void* _obj, void* item)
+{
+	return (int)((ELJConnection*)_obj)->StartAdvise((wxChar*)item);
+}
+	
+EWXWEXPORT(int, ELJConnection_StopAdvise)(void* _obj, void* item)
+{
+	return (int)((ELJConnection*)_obj)->StopAdvise((wxChar*)item);
+}
+	
+EWXWEXPORT(int, ELJConnection_Advise)(void* _obj, void* item, void* data, int size, int format)
+{
+	return (int)((ELJConnection*)_obj)->Advise((wxChar*)item, (wxChar*)data, size, (wxIPCFormat)format);
+}
+	
+EWXWEXPORT(int, ELJConnection_Disconnect)(void* _obj)
+{
+	return (int)((ELJConnection*)_obj)->Disconnect();
+}
+	
+EWXWEXPORT(void, ELJConnection_Compress)(void* _obj, int on)
+{
+	((ELJConnection*)_obj)->Compress(on != 0);
+}
+	
+EWXWEXPORT(void, ELJConnection_SetOnAdvise)(void* _obj, void* _fnc)
+{
+	((ELJConnection*)_obj)->SetOnAdvise(_fnc);
+}
+	
+EWXWEXPORT(void, ELJConnection_SetOnExecute)(void* _obj, void* _fnc)
+{
+	((ELJConnection*)_obj)->SetOnExecute(_fnc);
+}
+	
+EWXWEXPORT(void, ELJConnection_SetOnRequest)(void* _obj, void* _fnc)
+{
+	((ELJConnection*)_obj)->SetOnRequest(_fnc);
+}
+	
+EWXWEXPORT(void, ELJConnection_SetOnPoke)(void* _obj, void* _fnc)
+{
+	((ELJConnection*)_obj)->SetOnPoke(_fnc);
+}
+	
+EWXWEXPORT(void, ELJConnection_SetOnStartAdvise)(void* _obj, void* _fnc)
+{
+	((ELJConnection*)_obj)->SetOnStartAdvise(_fnc);
+}
+	
+EWXWEXPORT(void, ELJConnection_SetOnStopAdvise)(void* _obj, void* _fnc)
+{
+	((ELJConnection*)_obj)->SetOnStopAdvise(_fnc);
+}
+
+EWXWEXPORT(void, ELJConnection_SetOnDisconnect)(void* _obj, void* _fnc)
+{
+	((ELJConnection*)_obj)->SetOnDisconnect(_fnc);
+}
+
+EWXWEXPORT(void*, ELJServer_Create)(void* _eobj, void* _cnct)
+{
+	return new ELJServer(_eobj, _cnct);
+}
+
+EWXWEXPORT(void, ELJServer_Delete)(void* _obj)
+{
+	delete (ELJServer*)_obj;
+}
+
+EWXWEXPORT(int, ELJServer_Initialize)(void* _obj, void* name)
+{
+	return ((ELJServer*)_obj)->Create((wxChar*)name);
+}
+	
+EWXWEXPORT(void*, ELJClient_Create)(void* _eobj, void* _cnct)
+{
+	return new ELJClient(_eobj, _cnct);
+}
+
+EWXWEXPORT(void, ELJClient_Delete)(void* _obj)
+{
+	delete (ELJClient*)_obj;
+}
+
+EWXWEXPORT(void, ELJClient_MakeConnection)(void* _obj, void* host, void* server, void* topic)
+{
+	((ELJClient*)_obj)->MakeConnection((wxChar*)host, (wxChar*)server, (wxChar*)topic);
+}
+	
+}
diff --git a/wxc/src/eljjoystick.cpp b/wxc/src/eljjoystick.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljjoystick.cpp
@@ -0,0 +1,453 @@
+#include "wrapper.h"
+#include "wx/joystick.h"
+
+extern "C"
+{
+
+#if wxUSE_JOYSTICK
+
+EWXWEXPORT(void*,wxJoystick_Create)(int joystick)
+{
+	return (void*)new wxJoystick(joystick);
+}
+
+EWXWEXPORT(void,wxJoystick_Delete)(void* _obj)
+{
+	delete (wxJoystick*)_obj;
+}
+
+EWXWEXPORT(void,wxJoystick_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	wxPoint pt = ((wxJoystick*)_obj)->GetPosition();
+	*((int*)_x) = pt.x;
+	*((int*)_y) = pt.y;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetZPosition)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetZPosition();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetButtonState)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetButtonState();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPOVPosition)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetPOVPosition();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPOVCTSPosition)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetPOVCTSPosition();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetRudderPosition)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetRudderPosition();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetUPosition)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetUPosition();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetVPosition)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetVPosition();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetMovementThreshold)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetMovementThreshold();
+}
+	
+EWXWEXPORT(void,wxJoystick_SetMovementThreshold)(void* _obj, int threshold)
+{
+	((wxJoystick*)_obj)->SetMovementThreshold(threshold);
+}
+	
+EWXWEXPORT(int,wxJoystick_IsOk)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->IsOk();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetNumberJoysticks)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetNumberJoysticks();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetManufacturerId)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetManufacturerId();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetProductId)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetProductId();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetProductName)(void* _obj, void* _buf)
+{
+	wxString res = ((wxJoystick*)_obj)->GetProductName();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int,wxJoystick_GetXMin)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetXMin();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetYMin)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetYMin();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetZMin)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetZMin();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetXMax)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetXMax();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetYMax)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetYMax();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetZMax)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetZMax();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetNumberButtons)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetNumberButtons();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetNumberAxes)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetNumberAxes();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetMaxButtons)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetMaxButtons();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetMaxAxes)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetMaxAxes();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPollingMin)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetPollingMin();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPollingMax)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetPollingMax();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetRudderMin)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetRudderMin();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetRudderMax)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetRudderMax();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetUMin)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetUMin();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetUMax)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetUMax();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetVMin)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetVMin();
+}
+	
+EWXWEXPORT(int,wxJoystick_GetVMax)(void* _obj)
+{
+	return ((wxJoystick*)_obj)->GetVMax();
+}
+	
+EWXWEXPORT(int,wxJoystick_HasRudder)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->HasRudder();
+}
+	
+EWXWEXPORT(int,wxJoystick_HasZ)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->HasZ();
+}
+	
+EWXWEXPORT(int,wxJoystick_HasU)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->HasU();
+}
+	
+EWXWEXPORT(int,wxJoystick_HasV)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->HasV();
+}
+	
+EWXWEXPORT(int,wxJoystick_HasPOV)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->HasPOV();
+}
+	
+EWXWEXPORT(int,wxJoystick_HasPOV4Dir)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->HasPOV4Dir();
+}
+	
+EWXWEXPORT(int,wxJoystick_HasPOVCTS)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->HasPOVCTS();
+}
+	
+EWXWEXPORT(int,wxJoystick_SetCapture)(void* _obj, void* win, int pollingFreq)
+{
+	return (int)((wxJoystick*)_obj)->SetCapture((wxWindow*)win, pollingFreq);
+}
+	
+EWXWEXPORT(int,wxJoystick_ReleaseCapture)(void* _obj)
+{
+	return (int)((wxJoystick*)_obj)->ReleaseCapture();
+}
+
+#else
+
+EWXWEXPORT(void*,wxJoystick_Create)(int joystick)
+{
+	return NULL;
+}
+
+EWXWEXPORT(void,wxJoystick_Delete)(void* _obj)
+{
+}
+
+EWXWEXPORT(void,wxJoystick_GetPosition)(void* _obj, void* _x, void* _y)
+{
+}
+	
+EWXWEXPORT(int,wxJoystick_GetZPosition)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetButtonState)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPOVPosition)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPOVCTSPosition)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetRudderPosition)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetUPosition)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetVPosition)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetMovementThreshold)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(void,wxJoystick_SetMovementThreshold)(void* _obj, int threshold)
+{
+}
+	
+EWXWEXPORT(int,wxJoystick_IsOk)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetNumberJoysticks)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetManufacturerId)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetProductId)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetProductName)(void* _obj, void* _buf)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetXMin)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetYMin)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetZMin)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetXMax)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetYMax)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetZMax)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetNumberButtons)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetNumberAxes)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetMaxButtons)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetMaxAxes)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPollingMin)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetPollingMax)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetRudderMin)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetRudderMax)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetUMin)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetUMax)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetVMin)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_GetVMax)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_HasRudder)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_HasZ)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_HasU)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_HasV)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_HasPOV)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_HasPOV4Dir)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_HasPOVCTS)(void* _obj)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_SetCapture)(void* _obj, void* win, int pollingFreq)
+{
+	return 0;
+}
+	
+EWXWEXPORT(int,wxJoystick_ReleaseCapture)(void* _obj)
+{
+	return 0;
+}
+
+#endif
+	
+}
diff --git a/wxc/src/eljlayoutconstraints.cpp b/wxc/src/eljlayoutconstraints.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljlayoutconstraints.cpp
@@ -0,0 +1,181 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxLayoutConstraints_left)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->left);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_top)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->top);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_right)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->right);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_bottom)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->bottom);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_width)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->width);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_height)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->height);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_centreX)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->centreX);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_centreY)(void* _obj)
+{
+	return (void*)(&((wxLayoutConstraints*)_obj)->centreY);
+}
+	
+EWXWEXPORT(void*, wxLayoutConstraints_Create)()
+{
+	return (void*) new wxLayoutConstraints();
+}
+
+EWXWEXPORT(void, wxIndividualLayoutConstraint_Set)(void* _obj, int rel, void* otherW, int otherE, int val, int marg)
+{
+	((wxIndividualLayoutConstraint*)_obj)->Set((wxRelationship)rel, (wxWindowBase*) otherW, (wxEdge)otherE, val, marg);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_LeftOf)(void* _obj, void* sibling, int marg)
+{
+	((wxIndividualLayoutConstraint*)_obj)->LeftOf((wxWindowBase*) sibling, (wxEdge)marg);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_RightOf)(void* _obj, void* sibling, int marg)
+{
+	((wxIndividualLayoutConstraint*)_obj)->RightOf((wxWindowBase*)sibling, (wxEdge)marg);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_Above)(void* _obj, void* sibling, int marg)
+{
+	((wxIndividualLayoutConstraint*)_obj)->Above((wxWindowBase*)sibling, marg);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_Below)(void* _obj, void* sibling, int marg)
+{
+	((wxIndividualLayoutConstraint*)_obj)->Below((wxWindowBase*)sibling, marg);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_SameAs)(void* _obj, void* otherW, int edge, int marg)
+{
+	((wxIndividualLayoutConstraint*)_obj)->SameAs((wxWindowBase*)otherW, (wxEdge)edge, (wxEdge)marg);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_PercentOf)(void* _obj, void* otherW, int wh, int per)
+{
+	((wxIndividualLayoutConstraint*)_obj)->PercentOf((wxWindowBase*)otherW, (wxEdge)wh, per);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_Absolute)(void* _obj, int val)
+{
+	((wxIndividualLayoutConstraint*)_obj)->Absolute(val);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_Unconstrained)(void* _obj)
+{
+	((wxIndividualLayoutConstraint*)_obj)->Unconstrained();
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_AsIs)(void* _obj)
+{
+	((wxIndividualLayoutConstraint*)_obj)->AsIs();
+}
+	
+EWXWEXPORT(void*, wxIndividualLayoutConstraint_GetOtherWindow)(void* _obj)
+{
+	return (void*)((wxIndividualLayoutConstraint*)_obj)->GetOtherWindow();
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetMyEdge)(void* _obj)
+{
+	return (int)((wxIndividualLayoutConstraint*)_obj)->GetMyEdge();
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_SetEdge)(void* _obj, int which)
+{
+	((wxIndividualLayoutConstraint*)_obj)->SetEdge((wxEdge)which);
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_SetValue)(void* _obj, int v)
+{
+	((wxIndividualLayoutConstraint*)_obj)->SetValue(v);
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetMargin)(void* _obj)
+{
+	return ((wxIndividualLayoutConstraint*)_obj)->GetMargin();
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_SetMargin)(void* _obj, int m)
+{
+	((wxIndividualLayoutConstraint*)_obj)->SetMargin(m);
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetValue)(void* _obj)
+{
+	return ((wxIndividualLayoutConstraint*)_obj)->GetValue();
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetPercent)(void* _obj)
+{
+	return ((wxIndividualLayoutConstraint*)_obj)->GetPercent();
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetOtherEdge)(void* _obj)
+{
+	return ((wxIndividualLayoutConstraint*)_obj)->GetOtherEdge();
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetDone)(void* _obj)
+{
+	return (int)((wxIndividualLayoutConstraint*)_obj)->GetDone();
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_SetDone)(void* _obj, int d)
+{
+	((wxIndividualLayoutConstraint*)_obj)->SetDone(d != 0);
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetRelationship)(void* _obj)
+{
+	return ((wxIndividualLayoutConstraint*)_obj)->GetRelationship();
+}
+	
+EWXWEXPORT(void, wxIndividualLayoutConstraint_SetRelationship)(void* _obj, int r)
+{
+	((wxIndividualLayoutConstraint*)_obj)->SetRelationship((wxRelationship)r);
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_ResetIfWin)(void* _obj, void* otherW)
+{
+	return (int)((wxIndividualLayoutConstraint*)_obj)->ResetIfWin((wxWindowBase*)otherW);
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_SatisfyConstraint)(void* _obj, void* constraints, void* win)
+{
+	return (int)((wxIndividualLayoutConstraint*)_obj)->SatisfyConstraint((wxLayoutConstraints*)constraints, (wxWindowBase*)win);
+}
+	
+EWXWEXPORT(int, wxIndividualLayoutConstraint_GetEdge)(void* _obj, int which, void* thisWin, void* other)
+{
+	return ((wxIndividualLayoutConstraint*)_obj)->GetEdge((wxEdge)which, (wxWindowBase*) thisWin, (wxWindowBase*) other);
+}
+	
+}
diff --git a/wxc/src/eljlistbox.cpp b/wxc/src/eljlistbox.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljlistbox.cpp
@@ -0,0 +1,113 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxListBox_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
+{
+	wxListBox* result = new wxListBox ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), 0, NULL, _stl, wxDefaultValidator);
+
+	for (int i = 0; i < _n; i++)
+		result->Append(((wxChar**)_str)[i]);
+
+	return (void*) result;
+}
+
+EWXWEXPORT(void, wxListBox_Clear)(void* _obj)
+{
+	((wxListBox*)_obj)->Clear();
+}
+	
+EWXWEXPORT(void, wxListBox_Delete)(void* _obj, int n)
+{
+	((wxListBox*)_obj)->Delete(n);
+}
+	
+EWXWEXPORT(int, wxListBox_GetCount)(void* _obj)
+{
+	return ((wxListBox*)_obj)->GetCount();
+}
+	
+EWXWEXPORT(int, wxListBox_GetString)(void* _obj, int n, void* _buf)
+{
+	wxString result = ((wxListBox*)_obj)->GetString(n);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxListBox_SetString)(void* _obj, int n, wxChar* s)
+{
+	((wxListBox*)_obj)->SetString(n, s);
+}
+	
+EWXWEXPORT(int, wxListBox_FindString)(void* _obj, wxChar* s)
+{
+	return ((wxListBox*)_obj)->FindString(s);
+}
+	
+EWXWEXPORT(int, wxListBox_IsSelected)(void* _obj, int n)
+{
+	return (int)((wxListBox*)_obj)->IsSelected(n);
+}
+	
+EWXWEXPORT(void, wxListBox_SetSelection)(void* _obj, int n, int select)
+{
+	((wxListBox*)_obj)->SetSelection(n, select != 0);
+}
+	
+EWXWEXPORT(int, wxListBox_GetSelection)(void* _obj)
+{
+	return ((wxListBox*)_obj)->GetSelection();
+}
+	
+EWXWEXPORT(int, wxListBox_GetSelections)(void* _obj, int* aSelections, int allocated)
+{
+	wxArrayInt sel;
+	int result = ((wxListBox*)_obj)->GetSelections(sel);
+	
+	if (allocated < result) return -result;
+	
+	for (int i = 0; i < result; i++) aSelections[i] = sel[i];
+	return result;
+}
+	
+EWXWEXPORT(void, wxListBox_Append)(void* _obj, wxChar* item)
+{
+	((wxListBox*)_obj)->Append(item);
+}
+	
+EWXWEXPORT(void, wxListBox_AppendData)(void* _obj, wxChar* item, void* _data)
+{
+	((wxListBox*)_obj)->Append(item, _data);
+}
+	
+EWXWEXPORT(void, wxListBox_InsertItems)(void* _obj, void* items, int pos, int count)
+{
+	wxArrayString array;
+	
+	for (int i = 0; i< count; i++)
+		array[i] = ((wxChar**)items)[i];
+	
+	((wxListBox*)_obj)->InsertItems(array, pos);
+}
+	
+EWXWEXPORT(void, wxListBox_SetFirstItem)(void* _obj, int n)
+{
+	((wxListBox*)_obj)->SetFirstItem(n);
+}
+	
+EWXWEXPORT(void, wxListBox_SetClientData)(void* _obj, int n, void* clientData)
+{
+	((wxListBox*)_obj)->SetClientData(n, clientData);
+}
+	
+EWXWEXPORT(void*, wxListBox_GetClientData)(void* _obj, int n)
+{
+	return (void*)((wxListBox*)_obj)->GetClientData(n);
+}
+	
+EWXWEXPORT(void, wxListBox_SetStringSelection)(void* _obj, wxChar* str, int sel)
+{
+	((wxListBox*)_obj)->SetStringSelection(str, sel != 0);
+}
+	
+}
diff --git a/wxc/src/eljlistctrl.cpp b/wxc/src/eljlistctrl.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljlistctrl.cpp
@@ -0,0 +1,498 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+typedef int _cdecl (*EiffelSortFunc) (void* obj, int data1, int data2);
+
+typedef struct _EiffelSort
+{
+	void*          obj;
+	EiffelSortFunc fnc;
+}EiffelSort;
+
+int wxCALLBACK ListCmp (long item1, long item2, long sortData)
+{
+	return ((EiffelSort*)sortData)->fnc (((EiffelSort*)sortData)->obj, (int)item1, (int)item2);
+}
+
+EWXWEXPORT(void*, wxListItem_Create)()
+{
+	return (void*) new wxListItem();
+}
+
+EWXWEXPORT(void, wxListItem_Delete)(void* _obj)
+{
+	delete (wxListItem*)_obj;
+}
+EWXWEXPORT(void, wxListItem_Clear)(void* _obj)
+{
+	((wxListItem*)_obj)->Clear();
+}
+	
+EWXWEXPORT(void, wxListItem_ClearAttributes)(void* _obj)
+{
+	((wxListItem*)_obj)->ClearAttributes();
+}
+	
+EWXWEXPORT(void, wxListItem_SetMask)(void* _obj, int mask)
+{
+	((wxListItem*)_obj)->SetMask((long)mask);
+}
+	
+EWXWEXPORT(void, wxListItem_SetId)(void* _obj, int id)
+{
+	((wxListItem*)_obj)->SetId((long)id);
+}
+	
+EWXWEXPORT(void, wxListItem_SetColumn)(void* _obj, int col)
+{
+	((wxListItem*)_obj)->SetColumn(col);
+}
+	
+EWXWEXPORT(void, wxListItem_SetState)(void* _obj, int state)
+{
+	((wxListItem*)_obj)->SetState((long)state);
+}
+	
+EWXWEXPORT(void, wxListItem_SetStateMask)(void* _obj, int stateMask)
+{
+	((wxListItem*)_obj)->SetStateMask((long)stateMask);
+}
+	
+EWXWEXPORT(void, wxListItem_SetText)(void* _obj, void* text)
+{
+	((wxListItem*)_obj)->SetText((wxChar*)text);
+}
+	
+EWXWEXPORT(void, wxListItem_SetImage)(void* _obj, int image)
+{
+	((wxListItem*)_obj)->SetImage(image);
+}
+	
+EWXWEXPORT(void, wxListItem_SetData)(void* _obj, int data)
+{
+	((wxListItem*)_obj)->SetData((long)data);
+}
+	
+EWXWEXPORT(void, wxListItem_SetDataPointer)(void* _obj, void *data)
+{
+	((wxListItem*)_obj)->SetData(data);
+}
+	
+EWXWEXPORT(void, wxListItem_SetWidth)(void* _obj, int width)
+{
+	((wxListItem*)_obj)->SetWidth(width);
+}
+	
+EWXWEXPORT(void, wxListItem_SetAlign)(void* _obj, int align)
+{
+	((wxListItem*)_obj)->SetAlign((wxListColumnFormat)align);
+}
+	
+EWXWEXPORT(void, wxListItem_SetTextColour)(void* _obj, void* colText)
+{
+	((wxListItem*)_obj)->SetTextColour(*((wxColour*)colText));
+}
+	
+EWXWEXPORT(void, wxListItem_SetBackgroundColour)(void* _obj, void* colBack)
+{
+	((wxListItem*)_obj)->SetBackgroundColour(*((wxColour*)colBack));
+}
+	
+EWXWEXPORT(void, wxListItem_SetFont)(void* _obj, void* font)
+{
+	((wxListItem*)_obj)->SetFont(*((wxFont*)font));
+}
+	
+EWXWEXPORT(int, wxListItem_GetMask)(void* _obj)
+{
+	return (int)((wxListItem*)_obj)->GetMask();
+}
+	
+EWXWEXPORT(int, wxListItem_GetId)(void* _obj)
+{
+	return (int)((wxListItem*)_obj)->GetId();
+}
+	
+EWXWEXPORT(int, wxListItem_GetColumn)(void* _obj)
+{
+	return ((wxListItem*)_obj)->GetColumn();
+}
+	
+EWXWEXPORT(int, wxListItem_GetState)(void* _obj)
+{
+	return (int)((wxListItem*)_obj)->GetState();
+}
+	
+EWXWEXPORT(int, wxListItem_GetText)(void* _obj, void* _buf)
+{
+	wxString result = ((wxListItem*)_obj)->GetText();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxListItem_GetImage)(void* _obj)
+{
+	return ((wxListItem*)_obj)->GetImage();
+}
+	
+EWXWEXPORT(int, wxListItem_GetData)(void* _obj)
+{
+	return (int)((wxListItem*)_obj)->GetData();
+}
+	
+EWXWEXPORT(int, wxListItem_GetWidth)(void* _obj)
+{
+	return ((wxListItem*)_obj)->GetWidth();
+}
+	
+EWXWEXPORT(int, wxListItem_GetAlign)(void* _obj)
+{
+	return (int)((wxListItem*)_obj)->GetAlign();
+}
+	
+EWXWEXPORT(void*, wxListItem_GetAttributes)(void* _obj)
+{
+	return (void*)((wxListItem*)_obj)->GetAttributes();
+}
+	
+EWXWEXPORT(int, wxListItem_HasAttributes)(void* _obj)
+{
+	return (int)((wxListItem*)_obj)->HasAttributes();
+}
+	
+EWXWEXPORT(void, wxListItem_GetTextColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxListItem*)_obj)->GetTextColour();
+}
+	
+EWXWEXPORT(void, wxListItem_GetBackgroundColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxListItem*)_obj)->GetBackgroundColour();
+}
+	
+EWXWEXPORT(void, wxListItem_GetFont)(void* _obj, void* _ref)
+{
+	*((wxFont*)_ref) = ((wxListItem*)_obj)->GetFont();
+}
+	
+EWXWEXPORT(void*, wxListCtrl_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxListCtrl ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(int, wxListCtrl_SetForegroundColour)(void* _obj, void* col)
+{
+	return (int)((wxListCtrl*)_obj)->SetForegroundColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetBackgroundColour)(void* _obj, void* col)
+{
+	return (int)((wxListCtrl*)_obj)->SetBackgroundColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetColumn)(void* _obj, int col, void* item)
+{
+	return (int)((wxListCtrl*)_obj)->GetColumn(col, *((wxListItem*)item));
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetColumn)(void* _obj, int col, void* item)
+{
+	return (int)((wxListCtrl*)_obj)->SetColumn(col, *((wxListItem*)item));
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetColumnWidth)(void* _obj, int col)
+{
+	return ((wxListCtrl*)_obj)->GetColumnWidth(col);
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetColumnWidth)(void* _obj, int col, int width)
+{
+	return (int)((wxListCtrl*)_obj)->SetColumnWidth(col, width);
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetCountPerPage)(void* _obj)
+{
+	return ((wxListCtrl*)_obj)->GetCountPerPage();
+}
+	
+EWXWEXPORT(void*, wxListCtrl_GetEditControl)(void* _obj)
+{
+#ifdef __WIN32__
+	return (void*)((wxListCtrl*)_obj)->GetEditControl();
+#else
+	return NULL;
+#endif
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetItem)(void* _obj, void* info)
+{
+	return (int)((wxListCtrl*)_obj)->GetItem(*((wxListItem*)info));
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetItemFromInfo)(void* _obj, void* info)
+{
+	return (int)((wxListCtrl*)_obj)->SetItem(*((wxListItem*)info));
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetItem)(void* _obj, int index, int col, void* label, int imageId)
+{
+	return (int)((wxListCtrl*)_obj)->SetItem((long)index, col, (wxChar*)label, imageId);
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetItemState)(void* _obj, int item, int stateMask)
+{
+	return ((wxListCtrl*)_obj)->GetItemState((long)item, (long)stateMask);
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetItemState)(void* _obj, int item, int state, int stateMask)
+{
+	return (int)((wxListCtrl*)_obj)->SetItemState((long)item, (long)state, (long)stateMask);
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetItemImage)(void* _obj, int item, int image, int selImage)
+{
+	return (int)((wxListCtrl*)_obj)->SetItemImage((long)item, image, selImage);
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetItemText)(void* _obj, int item, void* buf)
+{
+	wxString res = ((wxListCtrl*)_obj)->GetItemText((long)item);
+        return copyStrToBuf(buf, res);
+}
+	
+EWXWEXPORT(void, wxListCtrl_SetItemText)(void* _obj, int item, void* str)
+{
+	((wxListCtrl*)_obj)->SetItemText((long)item, (wxChar*)str);
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetItemData)(void* _obj, int item)
+{
+	return (int)((wxListCtrl*)_obj)->GetItemData((long)item);
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetItemData)(void* _obj, int item, int data)
+{
+	return (int)((wxListCtrl*)_obj)->SetItemData((long)item, (long)data);
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetItemRect)(void* _obj, int item, int code, void* x, void* y, void* w, void* h)
+{
+	wxRect rct;
+	int result = (int)((wxListCtrl*)_obj)->GetItemRect((long)item, rct, code);
+	if (result)
+	{
+		*((int*)x) = rct.x;
+		*((int*)y) = rct.y;
+		*((int*)w) = rct.width;
+		*((int*)h) = rct.height;
+	} 
+	return result;
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetItemPosition)(void* _obj, int item, void* x, void* y)
+{
+	wxPoint pos;
+	int result = (int)((wxListCtrl*)_obj)->GetItemPosition((long)item, pos);
+	*((int*)x) = pos.x;
+	*((int*)y) = pos.y;
+
+	return result;
+}
+	
+EWXWEXPORT(int, wxListCtrl_SetItemPosition)(void* _obj, int item, int x, int y)
+{
+	wxPoint pos;
+	int result = (int)((wxListCtrl*)_obj)->SetItemPosition((long)item, pos);
+	*((int*)x) = pos.x;
+	*((int*)y) = pos.y;
+
+	return result;
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetItemCount)(void* _obj)
+{
+	return ((wxListCtrl*)_obj)->GetItemCount();
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetColumnCount)(void* _obj)
+{
+	return ((wxListCtrl*)_obj)->GetColumnCount();
+}
+	
+EWXWEXPORT(void, wxListCtrl_GetItemSpacing)(void* _obj, int isSmall, int* h, int* w)
+{
+#if (wxVERSION_NUMBER <= 2600)
+	int x = ((wxListCtrl*)_obj)->GetItemSpacing(isSmall != 0);
+        *h = x;
+        *w = x;
+#else
+	wxSize res = ((wxListCtrl*)_obj)->GetItemSpacing();
+	*h = res.GetHeight();
+	*w = res.GetWidth();
+#endif
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetSelectedItemCount)(void* _obj)
+{
+	return ((wxListCtrl*)_obj)->GetSelectedItemCount();
+}
+	
+EWXWEXPORT(void, wxListCtrl_GetTextColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxListCtrl*)_obj)->GetTextColour();
+}
+	
+EWXWEXPORT(void, wxListCtrl_SetTextColour)(void* _obj, void* col)
+{
+	((wxListCtrl*)_obj)->SetTextColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetTopItem)(void* _obj)
+{
+	return (int)((wxListCtrl*)_obj)->GetTopItem();
+}
+	
+EWXWEXPORT(void, wxListCtrl_SetSingleStyle)(void* _obj, int style, int add)
+{
+	((wxListCtrl*)_obj)->SetSingleStyle((long)style, add != 0);
+}
+	
+EWXWEXPORT(void, wxListCtrl_SetWindowStyleFlag)(void* _obj, int style)
+{
+	((wxListCtrl*)_obj)->SetWindowStyleFlag((long)style);
+}
+	
+EWXWEXPORT(int, wxListCtrl_GetNextItem)(void* _obj, int item, int geometry, int state)
+{
+	return ((wxListCtrl*)_obj)->GetNextItem((long)item, geometry, state);
+}
+	
+EWXWEXPORT(void*, wxListCtrl_GetImageList)(void* _obj, int which)
+{
+	return (void*)((wxListCtrl*)_obj)->GetImageList(which);
+}
+	
+EWXWEXPORT(void, wxListCtrl_SetImageList)(void* _obj, void* imageList, int which)
+{
+	((wxListCtrl*)_obj)->SetImageList((wxImageList*)imageList, which);
+}
+	
+EWXWEXPORT(int, wxListCtrl_Arrange)(void* _obj, int flag)
+{
+	return (int)((wxListCtrl*)_obj)->Arrange(flag);
+}
+	
+EWXWEXPORT(int, wxListCtrl_DeleteItem)(void* _obj, int item)
+{
+	return (int)((wxListCtrl*)_obj)->DeleteItem((long)item);
+}
+	
+EWXWEXPORT(int, wxListCtrl_DeleteAllItems)(void* _obj)
+{
+	return (int)((wxListCtrl*)_obj)->DeleteAllItems();
+}
+	
+EWXWEXPORT(int, wxListCtrl_DeleteColumn)(void* _obj, int col)
+{
+	return (int)((wxListCtrl*)_obj)->DeleteColumn(col);
+}
+	
+EWXWEXPORT(int, wxListCtrl_DeleteAllColumns)(void* _obj)
+{
+	return (int)((wxListCtrl*)_obj)->DeleteAllColumns();
+}
+	
+EWXWEXPORT(void, wxListCtrl_ClearAll)(void* _obj)
+{
+	((wxListCtrl*)_obj)->ClearAll();
+}
+	
+EWXWEXPORT(void, wxListCtrl_EditLabel)(void* _obj, int item)
+{
+	((wxListCtrl*)_obj)->EditLabel((long)item);
+}
+	
+EWXWEXPORT(int, wxListCtrl_EndEditLabel)(void* _obj, int cancel)
+{
+#ifdef __WIN32__
+	return (int)((wxListCtrl*)_obj)->EndEditLabel(cancel != 0);
+#else
+	return 0;
+#endif
+}
+	
+EWXWEXPORT(int, wxListCtrl_EnsureVisible)(void* _obj, int item)
+{
+	return (int)((wxListCtrl*)_obj)->EnsureVisible((long)item);
+}
+	
+EWXWEXPORT(int, wxListCtrl_FindItem)(void* _obj, int start, void* str, int partial)
+{
+	return (long)((wxListCtrl*)_obj)->FindItem((long)start, (wxChar*) str, partial != 0);
+}
+	
+EWXWEXPORT(int, wxListCtrl_FindItemByData)(void* _obj, int start, int data)
+{
+	return (int)((wxListCtrl*)_obj)->FindItem((long)start, (long)data);
+}
+	
+EWXWEXPORT(int, wxListCtrl_FindItemByPosition)(void* _obj, int start, int x, int y, int direction)
+{
+	return (int)((wxListCtrl*)_obj)->FindItem((long)start, wxPoint(x, y), direction);
+}
+	
+EWXWEXPORT(int, wxListCtrl_HitTest)(void* _obj, int x, int y, void* flags)
+{
+	return ((wxListCtrl*)_obj)->HitTest(wxPoint(x, y), *((int*)flags));
+}
+	
+EWXWEXPORT(int, wxListCtrl_InsertItem)(void* _obj, void* info)
+{
+	return (int)((wxListCtrl*)_obj)->InsertItem(*((wxListItem*)info));
+}
+	
+EWXWEXPORT(int, wxListCtrl_InsertItemWithData)(void* _obj, int index, void* label)
+{
+	return (int)((wxListCtrl*)_obj)->InsertItem((long)index, (wxChar*)label);
+}
+	
+EWXWEXPORT(int, wxListCtrl_InsertItemWithImage)(void* _obj, int index, int imageIndex)
+{
+	return (int)((wxListCtrl*)_obj)->InsertItem((long)index, imageIndex);
+}
+	
+EWXWEXPORT(int, wxListCtrl_InsertItemWithLabel)(void* _obj, int index, void* label, int imageIndex)
+{
+	return (int)((wxListCtrl*)_obj)->InsertItem((long)index, (wxChar*)label, imageIndex);
+}
+	
+EWXWEXPORT(int, wxListCtrl_InsertColumnFromInfo)(void* _obj, int col, void* info)
+{
+	return (int)((wxListCtrl*)_obj)->InsertColumn((long)col, *((wxListItem*)info));
+}
+	
+EWXWEXPORT(int, wxListCtrl_InsertColumn)(void* _obj, int col, void* heading, int format, int width)
+{
+	return (int)((wxListCtrl*)_obj)->InsertColumn((long)col, (wxChar*) heading, format, width);
+}
+	
+EWXWEXPORT(int, wxListCtrl_ScrollList)(void* _obj, int dx, int dy)
+{
+	return (int)((wxListCtrl*)_obj)->ScrollList(dx, dy);
+}
+	
+EWXWEXPORT(int, wxListCtrl_SortItems)(void* _obj, void* fnc, void* obj)
+{
+	EiffelSort srt = {obj, (EiffelSortFunc)fnc};
+	return (int)((wxListCtrl*)_obj)->SortItems(ListCmp, (long)&srt);
+}
+	
+EWXWEXPORT(void, wxListCtrl_UpdateStyle)(void* _obj)
+{
+#ifdef __WIN32__
+	((wxListCtrl*)_obj)->UpdateStyle();
+#endif
+}
+	
+}
diff --git a/wxc/src/eljlocale.cpp b/wxc/src/eljlocale.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljlocale.cpp
@@ -0,0 +1,64 @@
+#include "wrapper.h"
+#include "wx/intl.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxLocale_Create)(int _lang, int _flags)
+{
+	return (void*)new wxLocale(_lang, _flags);
+}
+
+EWXWEXPORT(void,wxLocale_Delete)(void* _obj)
+{
+	delete (wxLocale*)_obj;
+}
+
+EWXWEXPORT(int,wxLocale_IsOk)(void* _obj)
+{
+	return (int)((wxLocale*)_obj)->IsOk();
+}
+	
+EWXWEXPORT(void*,wxLocale_GetLocale)(void* _obj)
+{
+	return (void*)((wxLocale*)_obj)->GetLocale();
+}
+	
+EWXWEXPORT(void,wxLocale_AddCatalogLookupPathPrefix)(void* _obj, void* prefix)
+{
+	((wxLocale*)_obj)->AddCatalogLookupPathPrefix((const wxChar*)prefix);
+}
+	
+EWXWEXPORT(int,wxLocale_AddCatalog)(void* _obj, void* szDomain)
+{
+	return (int)((wxLocale*)_obj)->AddCatalog((const wxChar*)szDomain);
+}
+	
+EWXWEXPORT(int,wxLocale_IsLoaded)(void* _obj, void* szDomain)
+{
+	return (int)((wxLocale*)_obj)->IsLoaded((const wxChar*)szDomain);
+}
+	
+EWXWEXPORT(void*,wxLocale_GetString)(void* _obj, void* szOrigString, void* szDomain)
+{
+	return (void*)((wxLocale*)_obj)->GetString((const wxChar*)szOrigString, (const wxChar*)szDomain);
+}
+	
+EWXWEXPORT(int,wxLocale_GetName)(void* _obj, void* _ref)
+{
+	wxString res = ((wxLocale*)_obj)->GetName();
+	return copyStrToBuf(_ref, res);
+}
+	
+
+EWXWEXPORT(void*,wxGetELJLocale)()
+{
+	return (void*)wxGetLocale();
+}
+	
+EWXWEXPORT(void*,wxGetELJTranslation)(void* sz)
+{
+	return (void*)wxGetTranslation((const wxChar*)sz);
+}
+	
+}
diff --git a/wxc/src/eljlog.cpp b/wxc/src/eljlog.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljlog.cpp
@@ -0,0 +1,206 @@
+#include "wrapper.h"
+#include "wx/log.h"
+
+extern "C"
+{
+
+typedef void (*TLogFunc) (void*, int, void*, int);
+
+}
+
+class ELJLog : public wxLog
+{
+	private:
+		TLogFunc func;
+		void*    EiffelObject;
+		
+    protected:
+		virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+		{
+			func (EiffelObject, (int)level, (void*)szString, (int)t);
+		}
+
+	public:
+		ELJLog (void* _obj, void* _fnc) : wxLog()
+		{
+			func = (TLogFunc)_fnc;
+			EiffelObject = _obj;
+		}
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*,ELJLog_Create)(void* _obj, void* _fnc)
+{
+	return (void*) new ELJLog(_obj, _fnc);
+}
+
+EWXWEXPORT(void,ELJLog_Delete)(void* _obj)
+{
+	delete (ELJLog*)_obj;
+}
+
+EWXWEXPORT(int,ELJLog_IsEnabled)(void* _obj)
+{
+	return (int)((ELJLog*)_obj)->IsEnabled();
+}
+	
+EWXWEXPORT(int,ELJLog_EnableLogging)(void* _obj, int doIt)
+{
+	return (int)((ELJLog*)_obj)->EnableLogging(doIt != 0);
+}
+	
+EWXWEXPORT(void,ELJLog_OnLog)(void* _obj, int level, void* szString, int t)
+{
+	((ELJLog*)_obj)->OnLog((wxLogLevel)level, (const wxChar*)szString, (time_t)t);
+}
+	
+EWXWEXPORT(void,ELJLog_Flush)(void* _obj)
+{
+	((ELJLog*)_obj)->Flush();
+}
+	
+EWXWEXPORT(int,ELJLog_HasPendingMessages)(void* _obj)
+{
+	return (int)((ELJLog*)_obj)->HasPendingMessages();
+}
+	
+EWXWEXPORT(void,ELJLog_FlushActive)(void* _obj)
+{
+	((ELJLog*)_obj)->FlushActive();
+}
+	
+EWXWEXPORT(void*,ELJLog_GetActiveTarget)()
+{
+	return (void*)ELJLog::GetActiveTarget();
+}
+	
+EWXWEXPORT(void*,ELJLog_SetActiveTarget)(void* pLogger)
+{
+	return (void*)ELJLog::SetActiveTarget((wxLog*)pLogger);
+}
+	
+EWXWEXPORT(void,ELJLog_Suspend)(void* _obj)
+{
+	((ELJLog*)_obj)->Suspend();
+}
+	
+EWXWEXPORT(void,ELJLog_Resume)(void* _obj)
+{
+	((ELJLog*)_obj)->Resume();
+}
+	
+EWXWEXPORT(void,ELJLog_SetVerbose)(void* _obj, int bVerbose)
+{
+	((ELJLog*)_obj)->SetVerbose(bVerbose != 0);
+}
+	
+EWXWEXPORT(void,ELJLog_DontCreateOnDemand)(void* _obj)
+{
+	((ELJLog*)_obj)->DontCreateOnDemand();
+}
+	
+EWXWEXPORT(void,ELJLog_SetTraceMask)(void* _obj, int ulMask)
+{
+	((ELJLog*)_obj)->SetTraceMask((wxTraceMask)ulMask);
+}
+	
+EWXWEXPORT(void,ELJLog_AddTraceMask)(void* _obj, void* str)
+{
+	((ELJLog*)_obj)->AddTraceMask((const wxChar*)str);
+}
+	
+EWXWEXPORT(void,ELJLog_RemoveTraceMask)(void* _obj, void* str)
+{
+	((ELJLog*)_obj)->RemoveTraceMask((const wxChar*)str);
+}
+	
+EWXWEXPORT(void,ELJLog_SetTimestamp)(void* _obj, void* ts)
+{
+	((ELJLog*)_obj)->SetTimestamp((const wxChar*)ts);
+}
+	
+EWXWEXPORT(int,ELJLog_GetVerbose)(void* _obj)
+{
+	return (int)((ELJLog*)_obj)->GetVerbose();
+}
+	
+EWXWEXPORT(int,ELJLog_GetTraceMask)(void* _obj)
+{
+	return (int)((ELJLog*)_obj)->GetTraceMask();
+}
+	
+EWXWEXPORT(int,ELJLog_IsAllowedTraceMask)(void* _obj, void* mask)
+{
+	return (int)((ELJLog*)_obj)->IsAllowedTraceMask((const wxChar*)mask);
+}
+	
+EWXWEXPORT(void*,ELJLog_GetTimestamp)(void* _obj)
+{
+	return (void*)((ELJLog*)_obj)->GetTimestamp();
+}
+
+EWXWEXPORT(int,ELJSysErrorCode)()
+{
+	return (int)wxSysErrorCode();
+}
+
+EWXWEXPORT(void*,ELJSysErrorMsg)(int nErrCode)
+{
+	return (void*)wxSysErrorMsg((unsigned long)nErrCode);
+}
+
+EWXWEXPORT(void,LogErrorMsg)(void* _msg)
+{
+	wxLogError((wxChar*)_msg);
+}
+
+EWXWEXPORT(void,LogFatalErrorMsg)(void* _msg)
+{
+	wxLogFatalError((wxChar*)_msg);
+}
+
+EWXWEXPORT(void,LogWarningMsg)(void* _msg)
+{
+	wxLogWarning((wxChar*)_msg);
+}
+
+EWXWEXPORT(void,LogMessageMsg)(void* _msg)
+{
+	wxLogMessage((wxChar*)_msg);
+}
+
+
+EWXWEXPORT(void*,wxLogChain_Create)(void* logger)
+{
+	return new wxLogChain ((wxLog*)logger);
+}
+
+EWXWEXPORT(void,wxLogChain_Delete)(void* _obj)
+{
+	delete (wxLogChain*)_obj;
+}
+
+EWXWEXPORT(void,wxLogChain_SetLog)(void* _obj, void* logger)
+{
+	((wxLogChain*)_obj)->SetLog((wxLog*)logger);
+}
+	
+EWXWEXPORT(void,wxLogChain_PassMessages)(void* _obj, int bDoPass)
+{
+	((wxLogChain*)_obj)->PassMessages(bDoPass != 0);
+}
+	
+EWXWEXPORT(int,wxLogChain_IsPassingMessages)(void* _obj)
+{
+	return (int)((wxLogChain*)_obj)->IsPassingMessages();
+}
+	
+EWXWEXPORT(void*,wxLogChain_GetOldLog)(void* _obj)
+{
+	return (void*)((wxLogChain*)_obj)->GetOldLog();
+}
+	
+
+}
diff --git a/wxc/src/eljmask.cpp b/wxc/src/eljmask.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljmask.cpp
@@ -0,0 +1,16 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxMask_Create) (void* bitmap)
+{
+	return (void*) new wxMask (*(wxBitmap*)bitmap);
+}
+
+EWXWEXPORT(void*, wxMask_CreateColoured) (void* bitmap, void* colour)
+{
+	return (void*) new wxMask (*(wxBitmap*)bitmap, *(wxColour*)colour);
+}
+
+}
diff --git a/wxc/src/eljmdi.cpp b/wxc/src/eljmdi.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljmdi.cpp
@@ -0,0 +1,77 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxMDIParentFrame_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxMDIParentFrame ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void*, wxMDIParentFrame_GetActiveChild)(void* _obj)
+{
+	return (void*)((wxMDIParentFrame*)_obj)->GetActiveChild();
+}
+	
+EWXWEXPORT(void*, wxMDIParentFrame_GetClientWindow)(void* _obj)
+{
+	return (void*)((wxMDIParentFrame*)_obj)->GetClientWindow();
+}
+	
+EWXWEXPORT(void*, wxMDIParentFrame_OnCreateClient)(void* _obj)
+{
+	return (void*)((wxMDIParentFrame*)_obj)->OnCreateClient();
+}
+	
+EWXWEXPORT(void*, wxMDIParentFrame_GetWindowMenu)(void* _obj)
+{
+#ifdef __WIN32__
+	return (void*)((wxMDIParentFrame*)_obj)->GetWindowMenu();
+#else
+	return NULL;
+#endif
+}
+	
+EWXWEXPORT(void, wxMDIParentFrame_SetWindowMenu)(void* _obj, void* menu)
+{
+#ifdef __WIN32__
+	((wxMDIParentFrame*)_obj)->SetWindowMenu((wxMenu*) menu);
+#endif
+}
+	
+EWXWEXPORT(void, wxMDIParentFrame_Cascade)(void* _obj)
+{
+	((wxMDIParentFrame*)_obj)->Cascade();
+}
+	
+EWXWEXPORT(void, wxMDIParentFrame_Tile)(void* _obj)
+{
+	((wxMDIParentFrame*)_obj)->Tile();
+}
+	
+EWXWEXPORT(void, wxMDIParentFrame_ArrangeIcons)(void* _obj)
+{
+	((wxMDIParentFrame*)_obj)->ArrangeIcons();
+}
+	
+EWXWEXPORT(void, wxMDIParentFrame_ActivateNext)(void* _obj)
+{
+	((wxMDIParentFrame*)_obj)->ActivateNext();
+}
+	
+EWXWEXPORT(void, wxMDIParentFrame_ActivatePrevious)(void* _obj)
+{
+	((wxMDIParentFrame*)_obj)->ActivatePrevious();
+}
+	
+EWXWEXPORT(void*, wxMDIChildFrame_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxMDIChildFrame ((wxMDIParentFrame *)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void, wxMDIChildFrame_Activate)(void* _obj)
+{
+	((wxMDIChildFrame*)_obj)->Activate();
+}
+	
+}
diff --git a/wxc/src/eljmenu.cpp b/wxc/src/eljmenu.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljmenu.cpp
@@ -0,0 +1,339 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxMenu_Create)(wxChar* title, long style)
+{
+	return (void*) new wxMenu(title, style);
+}
+	
+EWXWEXPORT(void, wxMenu_DeletePointer)(void* _obj)
+{
+	delete (wxMenu*)_obj;
+}
+	
+EWXWEXPORT(void, wxMenu_AppendSeparator)(void* _obj)
+{
+	((wxMenu*)_obj)->AppendSeparator();
+}
+	
+EWXWEXPORT(void, wxMenu_Append)(void* _obj, int id, wxChar* text, wxChar* help, int isCheckable)
+{
+	((wxMenu*)_obj)->Append(id, text, help, isCheckable != 0);
+}
+	
+EWXWEXPORT(void, wxMenu_AppendSub)(void* _obj, int id, wxChar* text, void* submenu, wxChar* help)
+{
+	((wxMenu*)_obj)->Append(id, text, (wxMenu*) submenu, help);
+}
+	
+EWXWEXPORT(void, wxMenu_AppendItem)(void* _obj, void* _itm)
+{
+	((wxMenu*)_obj)->Append((wxMenuItem*)_itm);
+}
+	
+EWXWEXPORT(void, wxMenu_Break)(void* _obj)
+{
+	((wxMenu*)_obj)->Break();
+}
+	
+EWXWEXPORT(void, wxMenu_Insert)(void* _obj, size_t pos, int id, wxChar* text, wxChar* help, int isCheckable)
+{
+	((wxMenu*)_obj)->Insert(pos, id, text, help, isCheckable != 0);
+}
+	
+EWXWEXPORT(void, wxMenu_InsertSub)(void* _obj, size_t pos, int id, wxChar* text, void* submenu, wxChar* help)
+{
+	((wxMenu*)_obj)->Insert(pos, id, text, (wxMenu*) submenu, help);
+}
+	
+EWXWEXPORT(void, wxMenu_InsertItem)(void* _obj, int pos, void* _itm)
+{
+	((wxMenu*)_obj)->Insert((size_t)pos, (wxMenuItem*)_itm);
+}
+	
+EWXWEXPORT(void, wxMenu_Prepend)(void* _obj, int id, wxChar* text, wxChar* help, int isCheckable)
+{
+	((wxMenu*)_obj)->Prepend(id, text, help, isCheckable!= 0);
+}
+	
+EWXWEXPORT(void, wxMenu_PrependSub)(void* _obj, int id, wxChar* text, void* submenu, wxChar* help)
+{
+	((wxMenu*)_obj)->Prepend(id, text, (wxMenu*) submenu, help);
+}
+	
+EWXWEXPORT(void, wxMenu_PrependItem)(void* _obj, void* _itm)
+{
+	((wxMenu*)_obj)->Prepend((wxMenuItem*)_itm);
+}
+	
+EWXWEXPORT(void, wxMenu_RemoveByItem)(void* _obj, void* item)
+{
+	((wxMenu*)_obj)->Remove((wxMenuItem*) item);
+}
+	
+EWXWEXPORT(void, wxMenu_RemoveById)(void* _obj, int id, void* _itm)
+{
+	*((void**)_itm) = (void*)((wxMenu*)_obj)->Remove(id);
+}
+	
+EWXWEXPORT(void, wxMenu_DeleteById)(void* _obj, int id)
+{
+	((wxMenu*)_obj)->Delete(id);
+}
+	
+EWXWEXPORT(void, wxMenu_DeleteByItem)(void* _obj, void* _itm)
+{
+	((wxMenu*)_obj)->Delete((wxMenuItem*)_itm);
+}
+	
+EWXWEXPORT(void, wxMenu_DestroyById)(void* _obj, int id)
+{
+	((wxMenu*)_obj)->Destroy(id);
+}
+	
+EWXWEXPORT(void, wxMenu_DestroyByItem)(void* _obj, void* _itm)
+{
+	((wxMenu*)_obj)->Destroy((wxMenuItem*)_itm);
+}
+	
+EWXWEXPORT(size_t, wxMenu_GetMenuItemCount)(void* _obj)
+{
+	return ((wxMenu*)_obj)->GetMenuItemCount();
+}
+	
+EWXWEXPORT(int, wxMenu_GetMenuItems)(void* _obj, void* _lst)
+{
+	if (_lst)
+	{
+		for (unsigned int i = 0; i < ((wxMenu*)_obj)->GetMenuItems().GetCount(); i++)
+			((void**)_lst)[i] = ((wxMenu*)_obj)->GetMenuItems().Item(i)->GetData();
+	}
+	return ((wxMenu*)_obj)->GetMenuItems().GetCount();
+}
+	
+EWXWEXPORT(int, wxMenu_FindItemByLabel)(void* _obj, wxChar* itemString)
+{
+	return ((wxMenu*)_obj)->FindItem(itemString);
+}
+	
+EWXWEXPORT(void*, wxMenu_FindItem)(void* _obj, int id, void* menu)
+{
+	return (void*)((wxMenu*)_obj)->FindItem(id, (wxMenu**) menu);
+}
+	
+EWXWEXPORT(void, wxMenu_Enable)(void* _obj, int id, int enable)
+{
+	((wxMenu*)_obj)->Enable(id, enable != 0);
+}
+	
+EWXWEXPORT(int, wxMenu_IsEnabled)(void* _obj, int id)
+{
+	return (int)((wxMenu*)_obj)->IsEnabled(id);
+}
+	
+EWXWEXPORT(void, wxMenu_Check)(void* _obj, int id, int check)
+{
+	((wxMenu*)_obj)->Check(id, check != 0);
+}
+	
+EWXWEXPORT(int, wxMenu_IsChecked)(void* _obj, int id)
+{
+	return (int)((wxMenu*)_obj)->IsChecked(id);
+}
+	
+EWXWEXPORT(void, wxMenu_SetLabel)(void* _obj, int id, wxChar* label)
+{
+	((wxMenu*)_obj)->SetLabel(id, label);
+}
+	
+EWXWEXPORT(int, wxMenu_GetLabel)(void* _obj, int id, void* _buf)
+{
+	wxString result = ((wxMenu*)_obj)->GetLabel(id);
+	return copyStrToBuf(_buf, result); 
+}
+	
+EWXWEXPORT(void, wxMenu_SetHelpString)(void* _obj, int id, wxChar* helpString)
+{
+	((wxMenu*)_obj)->SetHelpString(id, helpString);
+}
+	
+EWXWEXPORT(int, wxMenu_GetHelpString)(void* _obj, int id, void* _buf)
+{
+	wxString result = ((wxMenu*)_obj)->GetHelpString(id);
+	return copyStrToBuf(_buf, result); 
+}
+	
+EWXWEXPORT(void, wxMenu_SetTitle)(void* _obj, wxChar* title)
+{
+	((wxMenu*)_obj)->SetTitle(title);
+}
+	
+EWXWEXPORT(int, wxMenu_GetTitle)(void* _obj, void* _buf)
+{
+	wxString result = ((wxMenu*)_obj)->GetTitle();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxMenu_SetClientData)(void* _obj, void* clientData)
+{
+	((wxMenu*)_obj)->SetClientData(clientData);
+}
+	
+EWXWEXPORT(void*, wxMenu_GetClientData)(void* _obj)
+{
+	return (void*)((wxMenu*)_obj)->GetClientData();
+}
+	
+EWXWEXPORT(void, wxMenu_SetEventHandler)(void* _obj, void* handler)
+{
+	((wxMenu*)_obj)->SetEventHandler((wxEvtHandler*) handler);
+}
+	
+EWXWEXPORT(void, wxMenu_SetInvokingWindow)(void* _obj, void* win)
+{
+	((wxMenu*)_obj)->SetInvokingWindow((wxWindow*) win);
+}
+	
+EWXWEXPORT(void*, wxMenu_GetInvokingWindow)(void* _obj)
+{
+	return (void*)((wxMenu*)_obj)->GetInvokingWindow();
+}
+	
+EWXWEXPORT(int, wxMenu_GetStyle)(void* _obj)
+{
+	return ((wxMenu*)_obj)->GetStyle();
+}
+	
+EWXWEXPORT(void, wxMenu_UpdateUI)(void* _obj, void* source)
+{
+	((wxMenu*)_obj)->UpdateUI((wxEvtHandler*) source);
+}
+	
+EWXWEXPORT(int, wxMenu_IsAttached)(void* _obj)
+{
+	return (int)((wxMenu*)_obj)->IsAttached();
+}
+	
+EWXWEXPORT(void, wxMenu_SetParent)(void* _obj, void* parent)
+{
+	((wxMenu*)_obj)->SetParent((wxMenu*) parent);
+}
+	
+EWXWEXPORT(void*, wxMenu_GetParent)(void* _obj)
+{
+	return (void*)((wxMenu*)_obj)->GetParent();
+}
+	
+
+EWXWEXPORT(void*, wxMenuItem_Create)()
+{
+	return (void*) new wxMenuItem();
+}
+	
+EWXWEXPORT(void, wxMenuItem_Delete)(void* _obj)
+{
+	delete (wxMenuItem*)_obj;
+}
+
+EWXWEXPORT(void*, wxMenuItem_GetMenu)(void* _obj)
+{
+	return (void*)((wxMenuItem*)_obj)->GetMenu();
+}
+	
+EWXWEXPORT(void, wxMenuItem_SetId)(void* _obj, int id)
+{
+	((wxMenuItem*)_obj)->SetId(id);
+}
+	
+EWXWEXPORT(int, wxMenuItem_GetId)(void* _obj)
+{
+	return ((wxMenuItem*)_obj)->GetId();
+}
+	
+EWXWEXPORT(int, wxMenuItem_IsSeparator)(void* _obj)
+{
+	return (int)((wxMenuItem*)_obj)->IsSeparator();
+}
+	
+EWXWEXPORT(void, wxMenuItem_SetText)(void* _obj, void* str)
+{
+	((wxMenuItem*)_obj)->SetText((wxChar*) str);
+}
+	
+EWXWEXPORT(int, wxMenuItem_GetLabel)(void* _obj, void* _buf)
+{
+	wxString result = ((wxMenuItem*)_obj)->GetLabel();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxMenuItem_GetText)(void* _obj, void* _buf)
+{
+	wxString result = ((wxMenuItem*)_obj)->GetText();
+	return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(int, wxMenuItem_GetLabelFromText)(void* text, void* _buf)
+{
+	wxString result = wxMenuItem::GetLabelFromText((wxChar*) text);
+	return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(void, wxMenuItem_SetCheckable)(void* _obj, int checkable)
+{
+	((wxMenuItem*)_obj)->SetCheckable(checkable != 0);
+}
+	
+EWXWEXPORT(int, wxMenuItem_IsCheckable)(void* _obj)
+{
+	return (int)((wxMenuItem*)_obj)->IsCheckable();
+}
+	
+EWXWEXPORT(int, wxMenuItem_IsSubMenu)(void* _obj)
+{
+	return (int)((wxMenuItem*)_obj)->IsSubMenu();
+}
+	
+EWXWEXPORT(void, wxMenuItem_SetSubMenu)(void* _obj, void* menu)
+{
+	((wxMenuItem*)_obj)->SetSubMenu((wxMenu*)menu);
+}
+	
+EWXWEXPORT(void*, wxMenuItem_GetSubMenu)(void* _obj)
+{
+	return (void*)((wxMenuItem*)_obj)->GetSubMenu();
+}
+	
+EWXWEXPORT(void, wxMenuItem_Enable)(void* _obj, int enable)
+{
+	((wxMenuItem*)_obj)->Enable(enable != 0);
+}
+	
+EWXWEXPORT(int, wxMenuItem_IsEnabled)(void* _obj)
+{
+	return (int)((wxMenuItem*)_obj)->IsEnabled();
+}
+	
+EWXWEXPORT(void, wxMenuItem_Check)(void* _obj, int check)
+{
+	((wxMenuItem*)_obj)->Check(check != 0);
+}
+	
+EWXWEXPORT(int, wxMenuItem_IsChecked)(void* _obj)
+{
+	return (int)((wxMenuItem*)_obj)->IsChecked();
+}
+	
+EWXWEXPORT(void, wxMenuItem_SetHelp)(void* _obj, void* str)
+{
+	((wxMenuItem*)_obj)->SetHelp((wxChar*)str);
+}
+	
+EWXWEXPORT(int, wxMenuItem_GetHelp)(void* _obj, void* _buf)
+{
+	wxString result = ((wxMenuItem*)_obj)->GetHelp();
+	return copyStrToBuf(_buf, result);
+}
+
+}
diff --git a/wxc/src/eljmenubar.cpp b/wxc/src/eljmenubar.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljmenubar.cpp
@@ -0,0 +1,129 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxMenuBar_Create)(int _style)
+{
+	return new wxMenuBar(_style);
+}
+	
+EWXWEXPORT(void, wxMenuBar_DeletePointer)(void* _obj)
+{
+	delete (wxMenuBar*)_obj;
+}
+	
+EWXWEXPORT(int, wxMenuBar_Append)(void* _obj, void* menu, wxChar* title)
+{
+	return (int)((wxMenuBar*)_obj)->Append((wxMenu*) menu, title);
+}
+	
+EWXWEXPORT(int, wxMenuBar_Insert)(void* _obj, int pos, void* menu, wxChar* title)
+{
+	return (int)((wxMenuBar*)_obj)->Insert((size_t) pos, (wxMenu*) menu, title);
+}
+	
+EWXWEXPORT(int, wxMenuBar_GetMenuCount)(void* _obj)
+{
+	return (int)((wxMenuBar*)_obj)->GetMenuCount();
+}
+	
+EWXWEXPORT(void*, wxMenuBar_GetMenu)(void* _obj, int pos)
+{
+	return (void*)((wxMenuBar*)_obj)->GetMenu((size_t) pos);
+}
+	
+EWXWEXPORT(void*, wxMenuBar_Replace)(void* _obj, int pos, void* menu, wxChar* title)
+{
+	return (void*)((wxMenuBar*)_obj)->Replace((size_t) pos, (wxMenu*) menu, title);
+}
+	
+EWXWEXPORT(void*, wxMenuBar_Remove)(void* _obj, int pos)
+{
+	return (void*)((wxMenuBar*)_obj)->Remove((size_t) pos);
+}
+	
+EWXWEXPORT(void, wxMenuBar_EnableTop)(void* _obj, int pos, int enable)
+{
+	((wxMenuBar*)_obj)->EnableTop((size_t) pos, enable != 0);
+}
+	
+EWXWEXPORT(void, wxMenuBar_SetLabelTop)(void* _obj, int pos, wxChar* label)
+{
+	((wxMenuBar*)_obj)->SetLabelTop((size_t) pos, label);
+}
+	
+EWXWEXPORT(int, wxMenuBar_GetLabelTop)(void* _obj, int pos, void* _buf)
+{
+	wxString result = ((wxMenuBar*)_obj)->GetLabelTop((size_t) pos);
+	return copyStrToBuf(_buf, result); 
+}
+	
+EWXWEXPORT(int, wxMenuBar_FindMenuItem)(void* _obj, wxChar* menuString, wxChar* itemString)
+{
+	return ((wxMenuBar*)_obj)->FindMenuItem(menuString, itemString);
+}
+	
+EWXWEXPORT(void*, wxMenuBar_FindItem)(void* _obj, int id, void *menu)
+{
+	return (void*)((wxMenuBar*)_obj)->FindItem(id, (wxMenu**) menu);
+}
+	
+EWXWEXPORT(int, wxMenuBar_FindMenu)(void* _obj, wxChar* title)
+{
+	return ((wxMenuBar*)_obj)->FindMenu(title);
+}
+	
+EWXWEXPORT(void, wxMenuBar_EnableItem)(void* _obj, int id, int enable)
+{
+	((wxMenuBar*)_obj)->Enable(id, enable != 0);
+}
+	
+EWXWEXPORT(void, wxMenuBar_Check)(void* _obj, int id, int check)
+{
+	((wxMenuBar*)_obj)->Check(id, check != 0);
+}
+	
+EWXWEXPORT(int, wxMenuBar_IsChecked)(void* _obj, int id)
+{
+	return (int)((wxMenuBar*)_obj)->IsChecked(id);
+}
+	
+EWXWEXPORT(int, wxMenuBar_IsEnabled)(void* _obj, int id)
+{
+	return (int)((wxMenuBar*)_obj)->IsEnabled(id);
+}
+	
+EWXWEXPORT(void, wxMenuBar_SetItemLabel)(void* _obj, int id, wxChar* label)
+{
+	((wxMenuBar*)_obj)->SetLabel(id, label);
+}
+	
+EWXWEXPORT(int, wxMenuBar_GetLabel)(void* _obj, int id, void* _buf)
+{
+	wxString result = ((wxMenuBar*)_obj)->GetLabel(id);
+	return copyStrToBuf(_buf, result); 
+}
+	
+EWXWEXPORT(void, wxMenuBar_SetHelpString)(void* _obj, int id, wxChar* helpString)
+{
+	((wxMenuBar*)_obj)->SetHelpString(id, helpString);
+}
+	
+EWXWEXPORT(int, wxMenuBar_GetHelpString)(void* _obj, int id, void* _buf)
+{
+	wxString result = ((wxMenuBar*)_obj)->GetHelpString(id);
+	return copyStrToBuf(_buf, result); 
+}
+	
+EWXWEXPORT(int, wxMenuBar_Enable)(void* _obj, int enable)
+{
+	return (int)((wxMenuBar*)_obj)->Enable(enable != 0);
+}
+	
+EWXWEXPORT(void, wxMenuBar_SetLabel)(void* _obj, wxChar* s)
+{
+	((wxMenuBar*)_obj)->SetLabel(s);
+}
+	
+}
diff --git a/wxc/src/eljmessagedialog.cpp b/wxc/src/eljmessagedialog.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljmessagedialog.cpp
@@ -0,0 +1,21 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxMessageDialog_Create)(void* _prt, void* _msg, void* _cap, int _stl)
+{
+	return (void*) new wxMessageDialog((wxWindow*)_prt, (wxChar*)_msg, (wxChar*)_cap, (long)_stl);
+}
+
+EWXWEXPORT(void, wxMessageDialog_Delete)(void* _obj)
+{
+	delete (wxMessageDialog*)_obj;
+}
+
+EWXWEXPORT(int, wxMessageDialog_ShowModal)(void* _obj)
+{
+	return ((wxMessageDialog*)_obj)->ShowModal();
+}
+
+}
diff --git a/wxc/src/eljminiframe.cpp b/wxc/src/eljminiframe.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljminiframe.cpp
@@ -0,0 +1,11 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxMiniFrame_Create) (void* _prt, int _id, void* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxMiniFrame ((wxWindow*)_prt, _id, (wxChar*)_txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+}
diff --git a/wxc/src/eljnotebook.cpp b/wxc/src/eljnotebook.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljnotebook.cpp
@@ -0,0 +1,107 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxNotebook_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxNotebook ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(int, wxNotebook_GetPageCount)(void* _obj)
+{
+	return ((wxNotebook*)_obj)->GetPageCount();
+}
+	
+EWXWEXPORT(int, wxNotebook_SetSelection)(void* _obj, int nPage)
+{
+	return ((wxNotebook*)_obj)->SetSelection(nPage);
+}
+	
+EWXWEXPORT(void, wxNotebook_AdvanceSelection)(void* _obj, int bForward)
+{
+	((wxNotebook*)_obj)->AdvanceSelection(bForward != 0);
+}
+	
+EWXWEXPORT(int, wxNotebook_GetSelection)(void* _obj)
+{
+	return ((wxNotebook*)_obj)->GetSelection();
+}
+	
+EWXWEXPORT(int, wxNotebook_SetPageText)(void* _obj, int nPage, void* strText)
+{
+	return (int)((wxNotebook*)_obj)->SetPageText(nPage, (wxChar*) strText);
+}
+	
+EWXWEXPORT(int, wxNotebook_GetPageText)(void* _obj, int nPage, void* _buf)
+{
+	wxString result = ((wxNotebook*)_obj)->GetPageText(nPage);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxNotebook_SetImageList)(void* _obj, void* imageList)
+{
+	((wxNotebook*)_obj)->SetImageList((wxImageList*) imageList);
+}
+	
+EWXWEXPORT(void*, wxNotebook_GetImageList)(void* _obj)
+{
+	return (void*)((wxNotebook*)_obj)->GetImageList();
+}
+	
+EWXWEXPORT(int, wxNotebook_GetPageImage)(void* _obj, int nPage)
+{
+	return ((wxNotebook*)_obj)->GetPageImage(nPage);
+}
+	
+EWXWEXPORT(int, wxNotebook_SetPageImage)(void* _obj, int nPage, int nImage)
+{
+	return (int)((wxNotebook*)_obj)->SetPageImage(nPage, nImage);
+}
+	
+EWXWEXPORT(int, wxNotebook_GetRowCount)(void* _obj)
+{
+	return ((wxNotebook*)_obj)->GetRowCount();
+}
+	
+EWXWEXPORT(void, wxNotebook_SetPageSize)(void* _obj, int _w, int _h)
+{
+	((wxNotebook*)_obj)->SetPageSize(wxSize(_w, _h));
+}
+	
+EWXWEXPORT(void, wxNotebook_SetPadding)(void* _obj, int _w, int _h)
+{
+	((wxNotebook*)_obj)->SetPadding(wxSize(_w, _h));
+}
+	
+EWXWEXPORT(int, wxNotebook_DeletePage)(void* _obj, int nPage)
+{
+	return (int)((wxNotebook*)_obj)->DeletePage(nPage);
+}
+	
+EWXWEXPORT(int, wxNotebook_RemovePage)(void* _obj, int nPage)
+{
+	return (int)((wxNotebook*)_obj)->RemovePage(nPage);
+}
+	
+EWXWEXPORT(int, wxNotebook_DeleteAllPages)(void* _obj)
+{
+	return (int)((wxNotebook*)_obj)->DeleteAllPages();
+}
+	
+EWXWEXPORT(int, wxNotebook_AddPage)(void* _obj, void* pPage, void* strText, int bSelect, int imageId)
+{
+	return (int)((wxNotebook*)_obj)->AddPage((wxNotebookPage*) pPage, (wxChar*) strText, bSelect != 0, imageId);
+}
+	
+EWXWEXPORT(int, wxNotebook_InsertPage)(void* _obj, int nPage, void* pPage, void* strText, int bSelect, int imageId)
+{
+	return (int)((wxNotebook*)_obj)->InsertPage(nPage, (wxNotebookPage*) pPage, (wxChar*) strText, bSelect != 0, imageId);
+}
+	
+EWXWEXPORT(void*, wxNotebook_GetPage)(void* _obj, int nPage)
+{
+	return (void*)((wxNotebook*)_obj)->GetPage(nPage);
+}
+	
+}
diff --git a/wxc/src/eljpalette.cpp b/wxc/src/eljpalette.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljpalette.cpp
@@ -0,0 +1,68 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxPalette_CreateDefault) ()
+{
+	return (void*) new wxPalette();
+}
+
+EWXWEXPORT(void*, wxPalette_CreateRGB) (int n, void* red, void* green, void* blue)
+{
+	return (void*) new wxPalette(n, (unsigned char*)red, (unsigned char*)green, (unsigned char*)blue);
+}
+
+EWXWEXPORT(void, wxPalette_Delete) (void* _obj)
+{
+	delete (wxPalette*)_obj;
+}
+
+EWXWEXPORT(int, wxPalette_GetPixel)(void* _obj, char red, char green, char blue)
+{
+	return ((wxPalette*)_obj)->GetPixel((unsigned char)red, (unsigned char)green, (unsigned char)blue);
+}
+	
+EWXWEXPORT(int, wxPalette_GetRGB)(void* _obj, int pixel, void* red, void* green, void* blue)
+{
+	return (int)((wxPalette*)_obj)->GetRGB(pixel, (unsigned char*)red, (unsigned char*)green, (unsigned char*)blue);
+}
+	
+EWXWEXPORT(int, wxPalette_Ok)(void* _obj)
+{
+	return (int)((wxPalette*)_obj)->Ok();
+}
+	
+EWXWEXPORT(void, wxPalette_Assign)(void* _obj, void* palette)
+{
+	*((wxPalette*)_obj) = *((wxPalette*)palette);
+}
+
+EWXWEXPORT(int, wxPalette_IsEqual)(void* _obj, void* palette)
+{
+#if (wxVERSION_NUMBER <= 2800)
+	return (int)(*((wxPalette*)_obj) == *((wxPalette*)palette));
+#else
+	wxPalette* pal1 = (wxPalette *)_obj;
+	wxPalette* pal2 = (wxPalette *)palette;
+	if (pal1->GetColoursCount() == pal2->GetColoursCount()){
+		bool equal = true;
+		unsigned char red1 = 0;
+		unsigned char red2 = 0;
+		unsigned char green1 = 0;
+		unsigned char green2 = 0;
+		unsigned char blue1 = 0;
+		unsigned char blue2 = 0;
+		for(int x = 0; x<(pal1->GetColoursCount()); x++){
+			pal1->GetRGB(x, &red1, &green1, &blue1);
+			pal2->GetRGB(x, &red2, &green2, &blue2);
+			equal = equal && (red1==red2 && green1==green2 && blue1==blue2); 
+		}
+		return (int)equal;
+	} else {
+		return 0;
+	}
+#endif
+}
+
+}
diff --git a/wxc/src/eljpanel.cpp b/wxc/src/eljpanel.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljpanel.cpp
@@ -0,0 +1,34 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxPanel_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxPanel ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void, wxPanel_InitDialog)(void* _obj)
+{
+	((wxPanel*)_obj)->InitDialog();
+}
+	
+EWXWEXPORT(void*, wxPanel_GetDefaultItem)(void* _obj)
+{
+#if (wxVERSION_NUMBER <= 2800)
+	return (void*)((wxPanel*)_obj)->GetDefaultItem();
+#else
+	return (void*)((wxTopLevelWindow*)_obj)->GetDefaultItem();
+#endif
+}
+	
+EWXWEXPORT(void, wxPanel_SetDefaultItem)(void* _obj, void* btn)
+{
+#if (wxVERSION_NUMBER <= 2800)
+	((wxPanel*)_obj)->SetDefaultItem((wxButton*) btn);
+#else
+	((wxTopLevelWindow*)_obj)->SetDefaultItem((wxButton*) btn);
+#endif
+}
+	
+}
diff --git a/wxc/src/eljpen.cpp b/wxc/src/eljpen.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljpen.cpp
@@ -0,0 +1,153 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxPen_CreateDefault) ()
+{
+	return new wxPen();
+}
+
+EWXWEXPORT(void*, wxPen_CreateFromColour) (void* col, int width, int style)
+{
+	return new wxPen(*((wxColour*)col), width, style);
+}
+
+EWXWEXPORT(void*, wxPen_CreateFromBitmap) (void* stipple, int width)
+{
+#ifdef __WIN32__
+	return new wxPen(*((wxBitmap*)stipple), width);
+#else
+	return NULL;
+#endif
+}
+
+EWXWEXPORT(void*, wxPen_CreateFromStock) (int id)
+{
+	switch (id)
+	{
+		case 0:
+			return (void*)wxRED_PEN;
+		case 1:
+			return (void*)wxCYAN_PEN;
+		case 2:
+			return (void*)wxGREEN_PEN;
+		case 3:
+			return (void*)wxBLACK_PEN;
+		case 4:
+			return (void*)wxWHITE_PEN;
+		case 5:
+			return (void*)wxTRANSPARENT_PEN;
+		case 6:
+			return (void*)wxBLACK_DASHED_PEN;
+		case 7:
+			return (void*)wxGREY_PEN;
+		case 8:
+			return (void*)wxMEDIUM_GREY_PEN;
+		case 9:
+			return (void*)wxLIGHT_GREY_PEN;
+	}
+	
+	return NULL;
+}
+
+EWXWEXPORT(void, wxPen_Delete)(void* _obj)
+{
+	delete (wxPen*)_obj;
+}
+
+EWXWEXPORT(void, wxPen_Assign)(void* _obj, void* pen)
+{
+	*((wxPen*)_obj) = *((wxPen*)pen);
+}
+	
+EWXWEXPORT(int, wxPen_IsEqual)(void* _obj, void* pen)
+{
+	return (int)(*((wxPen*)_obj) == *((wxPen*)pen));
+}
+	
+EWXWEXPORT(int, wxPen_Ok)(void* _obj)
+{
+	return (int)((wxPen*)_obj)->Ok();
+}
+	
+EWXWEXPORT(void, wxPen_SetColour)(void* _obj, void* col)
+{
+	((wxPen*)_obj)->SetColour(*((wxColour*)col));
+}
+	
+EWXWEXPORT(void, wxPen_SetColourSingle)(void* _obj, char r, char g, char b)
+{
+	((wxPen*)_obj)->SetColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
+}
+	
+EWXWEXPORT(void, wxPen_SetWidth)(void* _obj, int width)
+{
+	((wxPen*)_obj)->SetWidth(width);
+}
+	
+EWXWEXPORT(void, wxPen_SetStyle)(void* _obj, int style)
+{
+	((wxPen*)_obj)->SetStyle(style);
+}
+	
+EWXWEXPORT(void, wxPen_SetStipple)(void* _obj, void* stipple)
+{
+#ifdef __WIN32__
+	((wxPen*)_obj)->SetStipple(*((wxBitmap*)stipple));
+#endif
+}
+	
+EWXWEXPORT(void, wxPen_SetDashes)(void* _obj, int nb_dashes, void* dash)
+{
+	((wxPen*)_obj)->SetDashes(nb_dashes, (wxDash*)dash);
+}
+	
+EWXWEXPORT(void, wxPen_SetJoin)(void* _obj, int join)
+{
+	((wxPen*)_obj)->SetJoin(join);
+}
+	
+EWXWEXPORT(void, wxPen_SetCap)(void* _obj, int cap)
+{
+	((wxPen*)_obj)->SetCap(cap);
+}
+	
+EWXWEXPORT(void, wxPen_GetColour)(void* _obj, void* _ref)
+{
+	*((wxColour*)_ref) = ((wxPen*)_obj)->GetColour();
+}
+	
+EWXWEXPORT(int, wxPen_GetWidth)(void* _obj)
+{
+	return ((wxPen*)_obj)->GetWidth();
+}
+	
+EWXWEXPORT(int, wxPen_GetStyle)(void* _obj)
+{
+	return ((wxPen*)_obj)->GetStyle();
+}
+	
+EWXWEXPORT(int, wxPen_GetJoin)(void* _obj)
+{
+	return ((wxPen*)_obj)->GetJoin();
+}
+	
+EWXWEXPORT(int, wxPen_GetCap)(void* _obj)
+{
+	return ((wxPen*)_obj)->GetCap();
+}
+	
+EWXWEXPORT(int, wxPen_GetDashes)(void* _obj, void* ptr)
+{
+	return ((wxPen*)_obj)->GetDashes((wxDash**)ptr);
+}
+	
+EWXWEXPORT(void, wxPen_GetStipple)(void* _obj, void* _ref)
+{
+#ifdef __WIN32__
+	*((wxBitmap*)_ref) = *(((wxPen*)_obj)->GetStipple());
+#endif
+}
+	
+}
diff --git a/wxc/src/eljplot.cpp b/wxc/src/eljplot.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljplot.cpp
@@ -0,0 +1,317 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+	#include "wx/plot/plot.h"
+#else
+	#include "wx/plot.h"
+#endif
+
+extern "C"
+{
+
+typedef int (*TGetPlotInt)(void* _obj);
+typedef double (*TGetPlotDouble)(void* _obj, int _x);
+
+}
+
+class ELJPlotCurve : public wxPlotCurve
+{
+	private:
+		void* EiffelObject;
+		TGetPlotInt EGetStartX;
+		TGetPlotInt EGetEndX;
+		TGetPlotDouble EGetY;
+	public:
+		ELJPlotCurve(void* _obj, void* _str, void* _end, void* _y, int offsetY, double startY, double endY) : wxPlotCurve(offsetY, startY, endY)
+		{
+			EiffelObject = _obj;
+			EGetStartX = (TGetPlotInt)_str;
+			EGetEndX = (TGetPlotInt)_end;
+			EGetY = (TGetPlotDouble)_y;
+		}
+    virtual wxInt32 GetStartX()
+	{ return (wxInt32)EGetStartX(EiffelObject); }
+
+    virtual wxInt32 GetEndX()
+	{ return (wxInt32)EGetEndX(EiffelObject); }
+
+    virtual double GetY(wxInt32 x)
+	{ return EGetY(EiffelObject, (int)x); }
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxPlotWindow_Create)(void* parent, int id, int x, int y, int w, int h, int flags)
+{
+    return (void*)new wxPlotWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), flags);
+}
+
+EWXWEXPORT(void,wxPlotWindow_Add)(void* _obj, void* curve)
+{
+	((wxPlotWindow*)_obj)->Add((wxPlotCurve*)curve);
+}
+	
+EWXWEXPORT(void,wxPlotWindow_Delete)(void* _obj, void* curve)
+{
+	((wxPlotWindow*)_obj)->Delete((wxPlotCurve*)curve);
+}
+	
+EWXWEXPORT(int,wxPlotWindow_GetCount)(void* _obj)
+{
+	return (int)((wxPlotWindow*)_obj)->GetCount();
+}
+	
+EWXWEXPORT(void*,wxPlotWindow_GetAt)(void* _obj, int n)
+{
+	return (void*)((wxPlotWindow*)_obj)->GetAt((size_t)n);
+}
+	
+EWXWEXPORT(void,wxPlotWindow_SetCurrent)(void* _obj, void*  current)
+{
+	((wxPlotWindow*)_obj)->SetCurrent((wxPlotCurve*)current);
+}
+	
+EWXWEXPORT(void*,wxPlotWindow_GetCurrent)(void* _obj)
+{
+	return (void*)((wxPlotWindow*)_obj)->GetCurrent();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_AddOnOff)(void* _obj, void* curve)
+{
+	((wxPlotWindow*)_obj)->Add((wxPlotOnOffCurve*)curve);
+}
+	
+EWXWEXPORT(void,wxPlotWindow_DeleteOnOff)(void* _obj, void* curve)
+{
+	((wxPlotWindow*)_obj)->Delete((wxPlotOnOffCurve*)curve);
+}
+	
+EWXWEXPORT(int,wxPlotWindow_GetOnOffCurveCount)(void* _obj)
+{
+	return (int)((wxPlotWindow*)_obj)->GetOnOffCurveCount();
+}
+	
+EWXWEXPORT(void*,wxPlotWindow_GetOnOffCurveAt)(void* _obj, int n)
+{
+	return (void*)((wxPlotWindow*)_obj)->GetOnOffCurveAt((size_t)n);
+}
+	
+EWXWEXPORT(void,wxPlotWindow_Move)(void* _obj, void* curve, int pixels_up)
+{
+	((wxPlotWindow*)_obj)->Move((wxPlotCurve*)curve, pixels_up);
+}
+	
+EWXWEXPORT(void,wxPlotWindow_Enlarge)(void* _obj, void* curve, double factor)
+{
+	((wxPlotWindow*)_obj)->Enlarge((wxPlotCurve*)curve, factor);
+}
+	
+EWXWEXPORT(void,wxPlotWindow_SetUnitsPerValue)(void* _obj, double upv)
+{
+	((wxPlotWindow*)_obj)->SetUnitsPerValue(upv);
+}
+	
+EWXWEXPORT(double,wxPlotWindow_GetUnitsPerValue)(void* _obj)
+{
+	return ((wxPlotWindow*)_obj)->GetUnitsPerValue();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_SetZoom)(void* _obj, double zoom)
+{
+	((wxPlotWindow*)_obj)->SetZoom(zoom);
+}
+	
+EWXWEXPORT(double,wxPlotWindow_GetZoom)(void* _obj)
+{
+	return ((wxPlotWindow*)_obj)->GetZoom();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_SetScrollOnThumbRelease)(void* _obj, int scrollOnThumbRelease)
+{
+	((wxPlotWindow*)_obj)->SetScrollOnThumbRelease(scrollOnThumbRelease != 0);
+}
+	
+EWXWEXPORT(int,wxPlotWindow_GetScrollOnThumbRelease)(void* _obj)
+{
+	return (int)((wxPlotWindow*)_obj)->GetScrollOnThumbRelease();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_SetEnlargeAroundWindowCentre)(void* _obj, int enlargeAroundWindowCentre)
+{
+	((wxPlotWindow*)_obj)->SetEnlargeAroundWindowCentre(enlargeAroundWindowCentre != 0);
+}
+	
+EWXWEXPORT(int,wxPlotWindow_GetEnlargeAroundWindowCentre)(void* _obj)
+{
+	return (int)((wxPlotWindow*)_obj)->GetEnlargeAroundWindowCentre();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_RedrawEverything)(void* _obj)
+{
+	((wxPlotWindow*)_obj)->RedrawEverything();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_RedrawXAxis)(void* _obj)
+{
+	((wxPlotWindow*)_obj)->RedrawXAxis();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_RedrawYAxis)(void* _obj)
+{
+	((wxPlotWindow*)_obj)->RedrawYAxis();
+}
+	
+EWXWEXPORT(void,wxPlotWindow_ResetScrollbar)(void* _obj)
+{
+	((wxPlotWindow*)_obj)->ResetScrollbar();
+}
+	
+
+EWXWEXPORT(void*,wxPlotOnOffCurve_Create)(int offsetY)
+{
+	return (void*)new wxPlotOnOffCurve(offsetY);
+}
+
+EWXWEXPORT(void,wxPlotOnOffCurve_Delete)(void* _obj)
+{
+	delete (wxPlotOnOffCurve*)_obj;
+}
+
+EWXWEXPORT(int,wxPlotOnOffCurve_GetStartX)(void* _obj)
+{
+	return (int)((wxPlotOnOffCurve*)_obj)->GetStartX();
+}
+	
+EWXWEXPORT(int,wxPlotOnOffCurve_GetEndX)(void* _obj)
+{
+	return (int)((wxPlotOnOffCurve*)_obj)->GetEndX();
+}
+	
+EWXWEXPORT(void,wxPlotOnOffCurve_SetOffsetY)(void* _obj, int offsetY)
+{
+	((wxPlotOnOffCurve*)_obj)->SetOffsetY(offsetY);
+}
+	
+EWXWEXPORT(int,wxPlotOnOffCurve_GetOffsetY)(void* _obj)
+{
+	return ((wxPlotOnOffCurve*)_obj)->GetOffsetY();
+}
+	
+EWXWEXPORT(void,wxPlotOnOffCurve_Add)(void* _obj, int on, int off, void* clientData)
+{
+	((wxPlotOnOffCurve*)_obj)->Add((wxInt32)on, (wxInt32)off, clientData);
+}
+	
+EWXWEXPORT(int,wxPlotOnOffCurve_GetCount)(void* _obj)
+{
+	return (int)((wxPlotOnOffCurve*)_obj)->GetCount();
+}
+	
+EWXWEXPORT(int,wxPlotOnOffCurve_GetOn)(void* _obj, int index)
+{
+	return (int)((wxPlotOnOffCurve*)_obj)->GetOn((size_t)index);
+}
+	
+EWXWEXPORT(int,wxPlotOnOffCurve_GetOff)(void* _obj, int index)
+{
+	return (int)((wxPlotOnOffCurve*)_obj)->GetOff((size_t)index);
+}
+	
+EWXWEXPORT(void*,wxPlotOnOffCurve_GetClientData)(void* _obj, int index)
+{
+	return (void*)((wxPlotOnOffCurve*)_obj)->GetClientData((size_t)index);
+}
+	
+EWXWEXPORT(void*,wxPlotOnOffCurve_GetAt)(void* _obj, int index)
+{
+	return (void*)((wxPlotOnOffCurve*)_obj)->GetAt((size_t)index);
+}
+	
+EWXWEXPORT(void,wxPlotOnOffCurve_DrawOnLine)(void* _obj, void* dc, int y, int start, int end, void* clientData)
+{
+	((wxPlotOnOffCurve*)_obj)->DrawOnLine(*((wxDC*)dc), (wxCoord)y, (wxCoord)start, (wxCoord)end, clientData);
+}
+	
+EWXWEXPORT(void,wxPlotOnOffCurve_DrawOffLine)(void* _obj, void* dc, int y, int start, int end)
+{
+	((wxPlotOnOffCurve*)_obj)->DrawOffLine(*((wxDC*)dc), (wxCoord)y, (wxCoord)start, (wxCoord)end);
+}
+	
+
+EWXWEXPORT(void*,ELJPlotCurve_Create)(void* _obj, void* _str, void* _end, void* _y, int offsetY, double startY, double endY)
+{
+	return (void*)new ELJPlotCurve(_obj, _str, _end, _y, offsetY, startY, endY);
+}
+
+EWXWEXPORT(void,ELJPlotCurve_Delete)(void* _obj)
+{
+	delete (ELJPlotCurve*)_obj;
+}
+
+EWXWEXPORT(void,ELJPlotCurve_SetStartY)(void* _obj, double startY)
+{
+	((ELJPlotCurve*)_obj)->SetStartY(startY);
+}
+	
+EWXWEXPORT(double,ELJPlotCurve_GetStartY)(void* _obj)
+{
+	return ((ELJPlotCurve*)_obj)->GetStartY();
+}
+	
+EWXWEXPORT(void,ELJPlotCurve_SetEndY)(void* _obj, double endY)
+{
+	((ELJPlotCurve*)_obj)->SetEndY(endY);
+}
+	
+EWXWEXPORT(double,ELJPlotCurve_GetEndY)(void* _obj)
+{
+	return ((ELJPlotCurve*)_obj)->GetEndY();
+}
+	
+EWXWEXPORT(void,ELJPlotCurve_SetOffsetY)(void* _obj, int offsetY)
+{
+	((ELJPlotCurve*)_obj)->SetOffsetY(offsetY);
+}
+	
+EWXWEXPORT(int,ELJPlotCurve_GetOffsetY)(void* _obj)
+{
+	return ((ELJPlotCurve*)_obj)->GetOffsetY();
+}
+	
+EWXWEXPORT(void,ELJPlotCurve_SetPenNormal)(void* _obj, void* pen)
+{
+	((ELJPlotCurve*)_obj)->SetPenNormal(*((wxPen*)pen));
+}
+	
+EWXWEXPORT(void,ELJPlotCurve_SetPenSelected)(void* _obj, void* pen)
+{
+	((ELJPlotCurve*)_obj)->SetPenSelected(*((wxPen*)pen));
+}
+	
+
+EWXWEXPORT(void*,wxPlotEvent_GetCurve)(void* _obj)
+{
+	return (void*)((wxPlotEvent*)_obj)->GetCurve();
+}
+	
+EWXWEXPORT(double,wxPlotEvent_GetZoom)(void* _obj)
+{
+	return ((wxPlotEvent*)_obj)->GetZoom();
+}
+	
+EWXWEXPORT(void,wxPlotEvent_SetZoom)(void* _obj, double zoom)
+{
+	((wxPlotEvent*)_obj)->SetZoom(zoom);
+}
+	
+EWXWEXPORT(int,wxPlotEvent_GetPosition)(void* _obj)
+{
+	return (int)((wxPlotEvent*)_obj)->GetPosition();
+}
+	
+EWXWEXPORT(void,wxPlotEvent_SetPosition)(void* _obj, int pos)
+{
+	((wxPlotEvent*)_obj)->SetPosition((wxInt32)pos);
+}
+	
+}
diff --git a/wxc/src/eljprintdlg.cpp b/wxc/src/eljprintdlg.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljprintdlg.cpp
@@ -0,0 +1,222 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxPrintDialog_Create) (void* parent, void* data)
+{
+    return (void*) new wxPrintDialog((wxWindow*)parent, (wxPrintDialogData*)data);
+}
+
+EWXWEXPORT(void, wxPrintDialog_GetPrintData)(void* _obj, void* _ref)
+{
+	*((wxPrintData*)_ref) = ((wxPrintDialog*)_obj)->GetPrintData();
+}
+
+	
+EWXWEXPORT(void*, wxPrintDialog_GetPrintDC)(void* _obj)
+{
+	return (void*)((wxPrintDialog*)_obj)->GetPrintDC();
+}
+	
+EWXWEXPORT(void*, wxPageSetupDialog_Create) (void* parent, void* data)
+{
+    return (void*) new wxPageSetupDialog((wxWindow*)parent, (wxPageSetupData*)data);
+}
+
+EWXWEXPORT(void, wxPageSetupDialog_GetPageSetupData)(void* _obj, void* _ref)
+{
+	*((wxPageSetupData*)_ref) = ((wxPageSetupDialog*)_obj)->GetPageSetupData();
+}
+	
+EWXWEXPORT(void*, wxPageSetupDialogData_Create)()
+{
+    return (void*) new wxPageSetupDialogData();
+}
+
+EWXWEXPORT(void*, wxPageSetupDialogData_CreateFromData)(void* printData)
+{
+    return (void*) new wxPageSetupDialogData(*((wxPrintData*)printData));
+}
+
+EWXWEXPORT(void, wxPageSetupDialogData_Delete)(void* _obj)
+{
+    delete (wxPageSetupDialogData*)_obj;
+}
+
+EWXWEXPORT(void, wxPageSetupDialogData_GetPaperSize)(void* _obj, void* w, void* h)
+{
+	wxSize tmp = ((wxPageSetupDialogData*)_obj)->GetPaperSize();
+	*(int*)w = tmp.x;
+	*(int*)h = tmp.y;
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetPaperId)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetPaperId();
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_GetMinMarginTopLeft)(void* _obj, void* x, void* y)
+{
+	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMinMarginTopLeft();
+	*(int*)x = tmp.x;
+	*(int*)y = tmp.y;
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_GetMinMarginBottomRight)(void* _obj, void* x, void* y)
+{
+	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMinMarginBottomRight();
+	*(int*)x = tmp.x;
+	*(int*)y = tmp.y;
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_GetMarginTopLeft)(void* _obj, void* x, void* y)
+{
+	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMarginTopLeft();
+	*(int*)x = tmp.x;
+	*(int*)y = tmp.y;
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_GetMarginBottomRight)(void* _obj, void* x, void* y)
+{
+	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMarginBottomRight();
+	*(int*)x = tmp.x;
+	*(int*)y = tmp.y;
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetDefaultMinMargins)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetDefaultMinMargins();
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetEnableMargins)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetEnableMargins();
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetEnableOrientation)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetEnableOrientation();
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetEnablePaper)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetEnablePaper();
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetEnablePrinter)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetEnablePrinter();
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetDefaultInfo)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetDefaultInfo();
+}
+	
+EWXWEXPORT(int, wxPageSetupDialogData_GetEnableHelp)(void* _obj)
+{
+	return (int)((wxPageSetupDialogData*)_obj)->GetEnableHelp();
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetPaperSize)(void* _obj, int w, int h)
+{
+	((wxPageSetupDialogData*)_obj)->SetPaperSize(wxSize(w, h));
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetPaperId)(void* _obj, void* id)
+{
+	((wxPageSetupDialogData*)_obj)->SetPaperId(*((wxPaperSize*)id));
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetPaperSizeId)(void* _obj, int id)
+{
+	((wxPageSetupDialogData*)_obj)->SetPaperSize((wxPaperSize)id);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetMinMarginTopLeft)(void* _obj, int x, int y)
+{
+	((wxPageSetupDialogData*)_obj)->SetMinMarginTopLeft(wxPoint(x, y));
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetMinMarginBottomRight)(void* _obj, int x, int y)
+{
+	((wxPageSetupDialogData*)_obj)->SetMinMarginBottomRight(wxPoint(x, y));
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetMarginTopLeft)(void* _obj, int x, int y)
+{
+	((wxPageSetupDialogData*)_obj)->SetMarginTopLeft(wxPoint(x, y));
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetMarginBottomRight)(void* _obj, int x, int y)
+{
+	((wxPageSetupDialogData*)_obj)->SetMarginBottomRight(wxPoint(x, y));
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetDefaultMinMargins)(void* _obj, int flag)
+{
+	((wxPageSetupDialogData*)_obj)->SetDefaultMinMargins(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetDefaultInfo)(void* _obj, int flag)
+{
+	((wxPageSetupDialogData*)_obj)->SetDefaultInfo(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_EnableMargins)(void* _obj, int flag)
+{
+	((wxPageSetupDialogData*)_obj)->EnableMargins(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_EnableOrientation)(void* _obj, int flag)
+{
+	((wxPageSetupDialogData*)_obj)->EnableOrientation(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_EnablePaper)(void* _obj, int flag)
+{
+	((wxPageSetupDialogData*)_obj)->EnablePaper(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_EnablePrinter)(void* _obj, int flag)
+{
+	((wxPageSetupDialogData*)_obj)->EnablePrinter(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_EnableHelp)(void* _obj, int flag)
+{
+	((wxPageSetupDialogData*)_obj)->EnableHelp(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_CalculateIdFromPaperSize)(void* _obj)
+{
+	((wxPageSetupDialogData*)_obj)->CalculateIdFromPaperSize();
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_CalculatePaperSizeFromId)(void* _obj)
+{
+	((wxPageSetupDialogData*)_obj)->CalculatePaperSizeFromId();
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_Assign)(void* _obj, void* data)
+{
+	*((wxPageSetupDialogData*)_obj) = *((wxPageSetupDialogData*)data);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_AssignData)(void* _obj, void* data)
+{
+	*((wxPageSetupDialogData*)_obj) = *((wxPrintData*)data);
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_GetPrintData)(void* _obj, void* _ref)
+{
+	*((wxPrintData*)_ref) = ((wxPageSetupDialogData*)_obj)->GetPrintData();
+}
+	
+EWXWEXPORT(void, wxPageSetupDialogData_SetPrintData)(void* _obj, void* printData)
+{
+	((wxPageSetupDialogData*)_obj)->SetPrintData(*((wxPrintData*)printData));
+}
+	
+}
diff --git a/wxc/src/eljprinting.cpp b/wxc/src/eljprinting.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljprinting.cpp
@@ -0,0 +1,820 @@
+#include "wrapper.h"
+
+#if defined(wxUSE_POSTSCRIPT) && (wxUSE_POSTSCRIPT==0)
+# undef wxUSE_POSTSCRIPT
+#endif
+
+#ifdef wxUSE_POSTSCRIPT
+#include "wx/generic/prntdlgg.h"
+#endif
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxPrinter_Create)(void* data)
+{
+	return (void*) new wxPrinter((wxPrintDialogData*)data);
+}
+
+EWXWEXPORT(void, wxPrinter_Delete)(void* _obj)
+{
+	delete (wxPrinter*)_obj;
+}
+
+EWXWEXPORT(void*, wxPrinter_CreateAbortWindow)(void* _obj, void* parent, void* printout)
+{
+	return (void*)((wxPrinter*)_obj)->CreateAbortWindow((wxWindow*)parent, (wxPrintout*)printout);
+}
+	
+EWXWEXPORT(void, wxPrinter_ReportError)(void* _obj, void* parent, void* printout, void* message)
+{
+	((wxPrinter*)_obj)->ReportError((wxWindow*)parent, (wxPrintout*)printout, (wxChar*)message);
+}
+	
+EWXWEXPORT(void, wxPrinter_GetPrintDialogData)(void* _obj, void* _ref)
+{
+	*((wxPrintDialogData*)_ref) = ((wxPrinter*)_obj)->GetPrintDialogData();
+}
+	
+EWXWEXPORT(int, wxPrinter_GetAbort)(void* _obj)
+{
+	return (int)((wxPrinter*)_obj)->GetAbort();
+}
+	
+EWXWEXPORT(int, wxPrinter_GetLastError)(void* _obj)
+{
+	return ((wxPrinter*)_obj)->GetLastError();
+}
+	
+EWXWEXPORT(int, wxPrinter_Setup)(void* _obj, void* parent)
+{
+	return (int)((wxPrinter*)_obj)->Setup((wxWindow*)parent);
+}
+	
+EWXWEXPORT(int, wxPrinter_Print)(void* _obj, void* parent, void* printout, int prompt)
+{
+	return (int)((wxPrinter*)_obj)->Print((wxWindow*)parent, (wxPrintout*)printout, prompt != 0);
+}
+	
+EWXWEXPORT(void*, wxPrinter_PrintDialog)(void* _obj, void* parent)
+{
+	return (void*)((wxPrinter*)_obj)->PrintDialog((wxWindow*)parent);
+}
+	
+EWXWEXPORT(void*, ELJPrintout_Create)(void* title, void* _obj, void* _DoOnBeginDocument, void* _DoOnEndDocument, void* _DoOnBeginPrinting, void* _DoOnEndPrinting, void* _DoOnPreparePrinting, void* _DoOnPrintPage, void* _DoOnHasPage, void* DoOnPageInfo)
+{
+	return (void*) new ELJPrintout( title, _obj, _DoOnBeginDocument, _DoOnEndDocument, _DoOnBeginPrinting, _DoOnEndPrinting, _DoOnPreparePrinting, _DoOnPrintPage, _DoOnHasPage, DoOnPageInfo);
+}
+EWXWEXPORT(void, ELJPrintout_Delete)(void* _obj)
+{
+	delete (ELJPrintout*)_obj;
+}
+
+EWXWEXPORT(int, ELJPrintout_GetTitle)(void* _obj, void* _buf)
+{
+	wxString title = ((ELJPrintout*)_obj)->GetTitle();
+	if (_buf) wxStrncpy ((wxChar*)_buf, title.c_str(), title.Length());
+	return title.Length();
+}
+	
+EWXWEXPORT(void*, ELJPrintout_GetDC)(void* _obj)
+{
+	return (void*)((ELJPrintout*)_obj)->GetDC();
+}
+	
+EWXWEXPORT(void, ELJPrintout_SetDC)(void* _obj, void* dc)
+{
+	((ELJPrintout*)_obj)->SetDC((wxDC*)dc);
+}
+	
+EWXWEXPORT(void, ELJPrintout_SetPageSizePixels)(void* _obj, int w, int  h)
+{
+	((ELJPrintout*)_obj)->SetPageSizePixels(w, h);
+}
+	
+EWXWEXPORT(void, ELJPrintout_GetPageSizePixels)(void* _obj, void* w, void* h)
+{
+	((ELJPrintout*)_obj)->GetPageSizePixels((int*)w, (int*)h);
+}
+	
+EWXWEXPORT(void, ELJPrintout_SetPageSizeMM)(void* _obj, int w, int  h)
+{
+	((ELJPrintout*)_obj)->SetPageSizeMM(w, h);
+}
+	
+EWXWEXPORT(void, ELJPrintout_GetPageSizeMM)(void* _obj, void* w, void* h)
+{
+	((ELJPrintout*)_obj)->GetPageSizeMM((int*)w, (int*)h);
+}
+	
+EWXWEXPORT(void, ELJPrintout_SetPPIScreen)(void* _obj, int x, int y)
+{
+	((ELJPrintout*)_obj)->SetPPIScreen(x, y);
+}
+	
+EWXWEXPORT(void, ELJPrintout_GetPPIScreen)(void* _obj, void* x, void* y)
+{
+	((ELJPrintout*)_obj)->GetPPIScreen((int*)x, (int*)y);
+}
+	
+EWXWEXPORT(void, ELJPrintout_SetPPIPrinter)(void* _obj, int x, int y)
+{
+	((ELJPrintout*)_obj)->SetPPIPrinter(x, y);
+}
+	
+EWXWEXPORT(void, ELJPrintout_GetPPIPrinter)(void* _obj, void* x, void* y)
+{
+	((ELJPrintout*)_obj)->GetPPIPrinter((int*)x, (int*)y);
+}
+	
+EWXWEXPORT(int, ELJPrintout_IsPreview)(void* _obj)
+{
+	return (int)((ELJPrintout*)_obj)->IsPreview();
+}
+	
+EWXWEXPORT(void, ELJPrintout_SetIsPreview)(void* _obj, int p)
+{
+	((ELJPrintout*)_obj)->SetIsPreview(p != 0);
+}
+
+EWXWEXPORT(void*, wxPreviewCanvas_Create) (void* preview, void* parent, int x, int y, int w, int h, int style)
+{
+	return (void*) new wxPreviewCanvas(	(wxPrintPreviewBase*)preview,
+										(wxWindow*)parent,
+                    					wxPoint(x, y),
+                    					wxSize(w, h),
+                    					(long)style);
+}
+
+EWXWEXPORT(void*, ELJPreviewFrame_Create) (void* _obj, void* _init, void* _create_canvas, void* _create_toolbar, void* preview, void* parent, void* title,int x, int y,int w, int h, int style)
+{
+    return (void*) new ELJPreviewFrame(_obj, _init, _create_canvas, _create_toolbar, preview, parent, title, x, y, w, h, style);
+}
+
+EWXWEXPORT(void, ELJPreviewFrame_Initialize) (void* _obj)
+{
+	((ELJPreviewFrame*)_obj)->Initialize();
+}
+	
+EWXWEXPORT(void, ELJPreviewFrame_SetPreviewCanvas) (void* _obj, void* obj)
+{
+	((ELJPreviewFrame*)_obj)->SetPreviewCanvas (obj);
+}
+	
+EWXWEXPORT(void, ELJPreviewFrame_SetControlBar) (void* _obj, void* obj)
+{
+	((ELJPreviewFrame*)_obj)->SetControlBar (obj);
+}
+	
+EWXWEXPORT(void, ELJPreviewFrame_SetPrintPreview) (void* _obj, void* obj)
+{
+	((ELJPreviewFrame*)_obj)->SetPrintPreview (obj);
+}
+	
+EWXWEXPORT(void*, ELJPreviewFrame_GetPreviewCanvas) (void* _obj)
+{
+	return (void*)((ELJPreviewFrame*)_obj)->GetPreviewCanvas ();
+}
+	
+EWXWEXPORT(void*, ELJPreviewFrame_GetControlBar) (void* _obj)
+{
+	return (void*)((ELJPreviewFrame*)_obj)->GetControlBar ();
+}
+	
+EWXWEXPORT(void*, ELJPreviewFrame_GetPrintPreview) (void* _obj)
+{
+	return (void*)((ELJPreviewFrame*)_obj)->GetPrintPreview ();
+}
+	
+EWXWEXPORT(void*, ELJPreviewControlBar_Create) (void* preview, int buttons, void* parent, void* title,int x, int y,int w, int h, int style)
+{
+    return (void*) new wxPreviewControlBar((wxPrintPreviewBase*)preview, (long)buttons, (wxWindow*)parent, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+
+EWXWEXPORT(void*, wxPrintPreview_CreateFromDialogData) (void* printout, void* printoutForPrinting, void* data)
+{
+    return (void*) new wxPrintPreview((wxPrintout*)printout, (wxPrintout*)printoutForPrinting, (wxPrintDialogData*)data);
+}
+
+EWXWEXPORT(void*, wxPrintPreview_CreateFromData) (void* printout, void* printoutForPrinting, void* data)
+{
+    return (void*) new wxPrintPreview((wxPrintout*)printout, (wxPrintout*)printoutForPrinting, (wxPrintData*)data);
+}
+
+EWXWEXPORT(void, wxPrintPreview_Delete)(void* _obj)
+{
+	delete (wxPrintPreview*)_obj;
+}
+
+EWXWEXPORT(int, wxPrintPreview_SetCurrentPage)(void* _obj, int pageNum)
+{
+	return (int)((wxPrintPreview*)_obj)->SetCurrentPage(pageNum);
+}
+	
+EWXWEXPORT(int, wxPrintPreview_GetCurrentPage)(void* _obj)
+{
+	return ((wxPrintPreview*)_obj)->GetCurrentPage();
+}
+	
+EWXWEXPORT(void, wxPrintPreview_SetPrintout)(void* _obj, void* printout)
+{
+	((wxPrintPreview*)_obj)->SetPrintout((wxPrintout*)printout);
+}
+	
+EWXWEXPORT(void*, wxPrintPreview_GetPrintout)(void* _obj)
+{
+	return (void*)((wxPrintPreview*)_obj)->GetPrintout();
+}
+	
+EWXWEXPORT(void*, wxPrintPreview_GetPrintoutForPrinting)(void* _obj)
+{
+	return (void*)((wxPrintPreview*)_obj)->GetPrintoutForPrinting();
+}
+	
+EWXWEXPORT(void, wxPrintPreview_SetFrame)(void* _obj, void* frame)
+{
+	((wxPrintPreview*)_obj)->SetFrame((wxFrame*)frame);
+}
+	
+EWXWEXPORT(void, wxPrintPreview_SetCanvas)(void* _obj, void* canvas)
+{
+	((wxPrintPreview*)_obj)->SetCanvas((wxPreviewCanvas*)canvas);
+}
+	
+EWXWEXPORT(void*, wxPrintPreview_GetFrame)(void* _obj)
+{
+	return (void*)((wxPrintPreview*)_obj)->GetFrame();
+}
+	
+EWXWEXPORT(void*, wxPrintPreview_GetCanvas)(void* _obj)
+{
+	return (void*)((wxPrintPreview*)_obj)->GetCanvas();
+}
+	
+EWXWEXPORT(int, wxPrintPreview_PaintPage)(void* _obj, void* canvas, void* dc)
+{
+	return (int)((wxPrintPreview*)_obj)->PaintPage((wxPreviewCanvas*)canvas, *((wxDC*)dc));
+}
+	
+EWXWEXPORT(int, wxPrintPreview_DrawBlankPage)(void* _obj, void* canvas, void* dc)
+{
+	return (int)((wxPrintPreview*)_obj)->DrawBlankPage((wxPreviewCanvas*)canvas, *((wxDC*)dc));
+}
+	
+EWXWEXPORT(int, wxPrintPreview_RenderPage)(void* _obj, int pageNum)
+{
+	return (int)((wxPrintPreview*)_obj)->RenderPage(pageNum);
+}
+	
+EWXWEXPORT(void, wxPrintPreview_GetPrintDialogData)(void* _obj, void* _ref)
+{
+	*((wxPrintDialogData*)_ref) = ((wxPrintPreview*)_obj)->GetPrintDialogData();
+}
+	
+EWXWEXPORT(void, wxPrintPreview_SetZoom)(void* _obj, int percent)
+{
+	((wxPrintPreview*)_obj)->SetZoom(percent);
+}
+	
+EWXWEXPORT(int, wxPrintPreview_GetZoom)(void* _obj)
+{
+	return ((wxPrintPreview*)_obj)->GetZoom();
+}
+	
+EWXWEXPORT(int, wxPrintPreview_GetMaxPage)(void* _obj)
+{
+	return ((wxPrintPreview*)_obj)->GetMaxPage();
+}
+	
+EWXWEXPORT(int, wxPrintPreview_GetMinPage)(void* _obj)
+{
+	return ((wxPrintPreview*)_obj)->GetMinPage();
+}
+	
+EWXWEXPORT(int, wxPrintPreview_Ok)(void* _obj)
+{
+	return (int)((wxPrintPreview*)_obj)->Ok();
+}
+	
+EWXWEXPORT(void, wxPrintPreview_SetOk)(void* _obj, int ok)
+{
+	((wxPrintPreview*)_obj)->SetOk(ok != 0);
+}
+	
+EWXWEXPORT(int, wxPrintPreview_Print)(void* _obj, int interactive)
+{
+	return (int)((wxPrintPreview*)_obj)->Print(interactive != 0);
+}
+	
+EWXWEXPORT(void, wxPrintPreview_DetermineScaling)(void* _obj)
+{
+	((wxPrintPreview*)_obj)->DetermineScaling();
+}
+	
+EWXWEXPORT(void*, wxPrintData_Create)()
+{
+	return (void*) new wxPrintData();
+}
+
+EWXWEXPORT(void, wxPrintData_Delete)(void* _obj)
+{
+    delete (wxPrintData*)_obj;
+}
+
+EWXWEXPORT(void*, wxPostScriptPrintNativeData_Create)()
+{
+#ifdef wxUSE_POSTSCRIPT
+	return (void*) new wxPostScriptPrintNativeData();
+#else
+	return NULL;
+#endif
+}
+
+EWXWEXPORT(void, wxPostScriptPrintNativeData_Delete)(void* _obj)
+{
+#ifdef wxUSE_POSTSCRIPT
+    delete (wxPostScriptPrintNativeData*)_obj;
+#endif
+}
+
+EWXWEXPORT(int, wxPrintData_GetNoCopies)(void* _obj)
+{
+	return ((wxPrintData*)_obj)->GetNoCopies();
+}
+	
+EWXWEXPORT(int, wxPrintData_GetCollate)(void* _obj)
+{
+	return (int)((wxPrintData*)_obj)->GetCollate();
+}
+	
+EWXWEXPORT(int, wxPrintData_GetOrientation)(void* _obj)
+{
+	return ((wxPrintData*)_obj)->GetOrientation();
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPrinterName)(void* _obj, void* _ref)
+{
+	wxString tmp = ((wxPrintData*)_obj)->GetPrinterName();
+	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
+	return tmp.Length();
+}
+	
+EWXWEXPORT(int, wxPrintData_GetColour)(void* _obj)
+{
+	return (int)((wxPrintData*)_obj)->GetColour();
+}
+	
+EWXWEXPORT(int, wxPrintData_GetDuplex)(void* _obj)
+{
+	return (int)((wxPrintData*)_obj)->GetDuplex();
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPaperId)(void* _obj)
+{
+	return (int)((wxPrintData*)_obj)->GetPaperId();
+}
+	
+EWXWEXPORT(void, wxPrintData_GetPaperSize)(void* _obj, void* w, void* h)
+{
+	wxSize tmp = ((wxPrintData*)_obj)->GetPaperSize();
+	*((int*)w) = tmp.x;
+	*((int*)h) = tmp.y;
+}
+	
+EWXWEXPORT(int, wxPrintData_GetQuality)(void* _obj)
+{
+	return (int)((wxPrintData*)_obj)->GetQuality();
+}
+	
+EWXWEXPORT(void, wxPrintData_SetNoCopies)(void* _obj, int v)
+{
+	((wxPrintData*)_obj)->SetNoCopies(v);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetCollate)(void* _obj, int flag)
+{
+	((wxPrintData*)_obj)->SetCollate(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetOrientation)(void* _obj, int orient)
+{
+	((wxPrintData*)_obj)->SetOrientation(orient);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterName)(void* _obj, void* name)
+{
+	((wxPrintData*)_obj)->SetPrinterName((wxChar*)name);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetColour)(void* _obj, int colour)
+{
+	((wxPrintData*)_obj)->SetColour(colour != 0);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetDuplex)(void* _obj, int duplex)
+{
+	((wxPrintData*)_obj)->SetDuplex((wxDuplexMode)duplex);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPaperId)(void* _obj, int sizeId)
+{
+	((wxPrintData*)_obj)->SetPaperId((wxPaperSize)sizeId);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPaperSize)(void* _obj, int w, int h)
+{
+	((wxPrintData*)_obj)->SetPaperSize(wxSize(w, h));
+}
+	
+EWXWEXPORT(void, wxPrintData_SetQuality)(void* _obj, int quality)
+{
+	((wxPrintData*)_obj)->SetQuality((wxPrintQuality)quality);
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPrinterCommand)(void* _obj, void* _ref)
+{
+#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
+#ifdef wxUSE_POSTSCRIPT
+	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterCommand();
+#else
+	wxString tmp = ((wxPrintData*)_obj)->GetPrinterCommand();
+#endif
+	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
+	return tmp.Length();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPrinterOptions)(void* _obj, void* _ref)
+{
+#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
+#ifdef wxUSE_POSTSCRIPT
+	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterOptions();
+#else
+	wxString tmp = ((wxPrintData*)_obj)->GetPrinterOptions();
+#endif
+	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
+	return tmp.Length();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPreviewCommand)(void* _obj, void* _ref)
+{
+#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
+#ifdef wxUSE_POSTSCRIPT
+	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetPreviewCommand();
+#else
+	wxString tmp = ((wxPrintData*)_obj)->GetPreviewCommand();
+#endif
+	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
+	return tmp.Length();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(int, wxPrintData_GetFilename)(void* _obj, void* _ref)
+{
+	wxString tmp = ((wxPrintData*)_obj)->GetFilename();
+	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
+	return tmp.Length();
+}
+	
+EWXWEXPORT(int, wxPrintData_GetFontMetricPath)(void* _obj, void* _ref)
+{
+#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
+#ifdef wxUSE_POSTSCRIPT
+	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetFontMetricPath();
+#else
+	wxString tmp = ((wxPrintData*)_obj)->GetFontMetricPath();
+#endif
+	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
+	return tmp.Length();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(double, wxPrintData_GetPrinterScaleX)(void* _obj)
+{
+#ifdef wxUSE_POSTSCRIPT
+	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterScaleX();
+#elif wxVERSION_NUMBER < 2600
+	return ((wxPrintData*)_obj)->GetPrinterScaleX();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(double, wxPrintData_GetPrinterScaleY)(void* _obj)
+{
+#ifdef wxUSE_POSTSCRIPT
+	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterScaleY();
+#elif wxVERSION_NUMBER < 2600
+	return ((wxPrintData*)_obj)->GetPrinterScaleY();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPrinterTranslateX)(void* _obj)
+{
+#ifdef wxUSE_POSTSCRIPT
+	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterTranslateX();
+#elif wxVERSION_NUMBER < 2600
+	return ((wxPrintData*)_obj)->GetPrinterTranslateX();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPrinterTranslateY)(void* _obj)
+{
+#ifdef wxUSE_POSTSCRIPT
+	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterTranslateY();
+#elif wxVERSION_NUMBER < 2600
+	return ((wxPrintData*)_obj)->GetPrinterTranslateY();
+#else
+	return false;
+#endif
+}
+	
+EWXWEXPORT(int, wxPrintData_GetPrintMode)(void* _obj)
+{
+	return (int)((wxPrintData*)_obj)->GetPrintMode();
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterCommand)(void* _obj, void* command)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterCommand((wxChar*)command);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterCommand((wxChar*)command);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterOptions)(void* _obj, void* options)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterOptions((wxChar*)options);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterOptions((wxChar*)options);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPreviewCommand)(void* _obj, void* command)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPreviewCommand((wxChar*)command);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPreviewCommand((wxChar*)command);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetFilename)(void* _obj, void* filename)
+{
+	((wxPrintData*)_obj)->SetFilename((wxChar*)filename);
+}
+	
+EWXWEXPORT(void, wxPrintData_SetFontMetricPath)(void* _obj, void* path)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetFontMetricPath((wxChar*)path);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetFontMetricPath((wxChar*)path);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterScaleX)(void* _obj, double x)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaleX(x);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterScaleX(x);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterScaleY)(void* _obj, double y)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaleY(y);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterScaleY(y);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterScaling)(void* _obj, double x, double y)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaling(x, y);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterScaling(x, y);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterTranslateX)(void* _obj, int x)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslateX((int)x);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterTranslateX((int)x);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterTranslateY)(void* _obj, int y)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslateY((int)y);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterTranslateY((long)y);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrinterTranslation)(void* _obj, int x, int y)
+{
+#ifdef wxUSE_POSTSCRIPT
+	((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslation((long)x, (long)y);
+#elif wxVERSION_NUMBER < 2600
+	((wxPrintData*)_obj)->SetPrinterTranslation((long)x, (long)y);
+#endif
+}
+	
+EWXWEXPORT(void, wxPrintData_SetPrintMode)(void* _obj, int printMode)
+{
+	((wxPrintData*)_obj)->SetPrintMode((wxPrintMode)printMode);
+}
+	
+EWXWEXPORT(void, wxPrintData_Assign)(void* _obj, void* data)
+{
+	*((wxPrintData*)_obj) = *((wxPrintData*)data);
+}
+	
+EWXWEXPORT(void*, wxPrintDialogData_CreateDefault)()
+{
+	return (void*) new wxPrintDialogData();
+}
+
+EWXWEXPORT(void*, wxPrintDialogData_CreateFromData)(void* printData)
+{
+	return (void*) new wxPrintDialogData(*((wxPrintData*)printData));
+}
+
+EWXWEXPORT(void, wxPrintDialogData_Delete) (void* _obj)
+{
+	delete (wxPrintDialogData*)_obj;
+}
+
+EWXWEXPORT(int, wxPrintDialogData_GetFromPage)(void* _obj)
+{
+	return ((wxPrintDialogData*)_obj)->GetFromPage();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetToPage)(void* _obj)
+{
+	return ((wxPrintDialogData*)_obj)->GetToPage();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetMinPage)(void* _obj)
+{
+	return ((wxPrintDialogData*)_obj)->GetMinPage();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetMaxPage)(void* _obj)
+{
+	return ((wxPrintDialogData*)_obj)->GetMaxPage();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetNoCopies)(void* _obj)
+{
+	return ((wxPrintDialogData*)_obj)->GetNoCopies();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetAllPages)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetAllPages();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetSelection)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetSelection();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetCollate)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetCollate();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetPrintToFile)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetPrintToFile();
+}
+
+EWXWEXPORT(void, wxPrintDialogData_SetFromPage)(void* _obj, int v)
+{
+	((wxPrintDialogData*)_obj)->SetFromPage(v);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetToPage)(void* _obj, int v)
+{
+	((wxPrintDialogData*)_obj)->SetToPage(v);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetMinPage)(void* _obj, int v)
+{
+	((wxPrintDialogData*)_obj)->SetMinPage(v);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetMaxPage)(void* _obj, int v)
+{
+	((wxPrintDialogData*)_obj)->SetMaxPage(v);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetNoCopies)(void* _obj, int v)
+{
+	((wxPrintDialogData*)_obj)->SetNoCopies(v);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetAllPages)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->SetAllPages(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetSelection)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->SetSelection(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetCollate)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->SetCollate(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetPrintToFile)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->SetPrintToFile(flag != 0);
+}
+
+EWXWEXPORT(void, wxPrintDialogData_EnablePrintToFile)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->EnablePrintToFile(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_EnableSelection)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->EnableSelection(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_EnablePageNumbers)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->EnablePageNumbers(flag != 0);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_EnableHelp)(void* _obj, int flag)
+{
+	((wxPrintDialogData*)_obj)->EnableHelp(flag != 0);
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetEnablePrintToFile)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetEnablePrintToFile();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetEnableSelection)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetEnableSelection();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetEnablePageNumbers)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetEnablePageNumbers();
+}
+	
+EWXWEXPORT(int, wxPrintDialogData_GetEnableHelp)(void* _obj)
+{
+	return (int)((wxPrintDialogData*)_obj)->GetEnableHelp();
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_GetPrintData)(void* _obj, void* _ref)
+{
+	*((wxPrintData*)_ref) = ((wxPrintDialogData*)_obj)->GetPrintData();
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_SetPrintData)(void* _obj, void* printData)
+{
+	((wxPrintDialogData*)_obj)->SetPrintData(*((wxPrintData*)printData));
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_Assign)(void* _obj, void* data)
+{
+	*((wxPrintDialogData*)_obj) = *((wxPrintDialogData*)data);
+}
+	
+EWXWEXPORT(void, wxPrintDialogData_AssignData)(void* _obj, void* data)
+{
+	*((wxPrintDialogData*)_obj) = *((wxPrintData*)data);
+}
+	
+}
diff --git a/wxc/src/eljprocess.cpp b/wxc/src/eljprocess.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljprocess.cpp
@@ -0,0 +1,172 @@
+#include "wrapper.h"
+#include "wx/process.h"
+
+extern "C"
+
+{
+
+EWXWEXPORT(void*, wxProcess_CreateDefault)(void* _prt, int _id)
+{
+	return (void*)new wxProcess ((wxEvtHandler*)_prt, _id);
+}
+
+EWXWEXPORT(void*, wxProcess_CreateRedirect)(void* _prt, int _rdr)
+{
+	return (void*)new wxProcess ((wxEvtHandler*)_prt, _rdr != 0);
+}
+
+EWXWEXPORT(void, wxProcess_Delete)(void* _obj)
+{
+    delete (wxProcess*)_obj;
+}
+
+EWXWEXPORT(void, wxProcess_Redirect)(void* _obj)
+{
+	((wxProcess*)_obj)->Redirect();
+}
+	
+EWXWEXPORT(int, wxProcess_IsRedirected)(void* _obj)
+{
+	return (int)((wxProcess*)_obj)->IsRedirected();
+}
+	
+EWXWEXPORT(void, wxProcess_Detach)(void* _obj)
+{
+	((wxProcess*)_obj)->Detach();
+}
+	
+EWXWEXPORT(void*, wxProcess_GetInputStream)(void* _obj)
+{
+	return (void*)((wxProcess*)_obj)->GetInputStream();
+}
+	
+EWXWEXPORT(void*, wxProcess_GetErrorStream)(void* _obj)
+{
+	return (void*)((wxProcess*)_obj)->GetErrorStream();
+}
+	
+EWXWEXPORT(void*, wxProcess_GetOutputStream)(void* _obj)
+{
+	return (void*)((wxProcess*)_obj)->GetOutputStream();
+}
+	
+EWXWEXPORT(void, wxProcess_CloseOutput)(void* _obj)
+{
+	((wxProcess*)_obj)->CloseOutput();
+}
+	
+
+EWXWEXPORT(int, wxProcessEvent_GetPid)(void* _obj)
+{
+	return ((wxProcessEvent*)_obj)->GetPid();
+}
+
+EWXWEXPORT(int, wxProcessEvent_GetExitCode)(void* _obj)
+{
+	return ((wxProcessEvent*)_obj)->GetExitCode();
+}
+
+
+EWXWEXPORT(int, wxStreamBase_GetLastError)(void* _obj)
+{
+	return (int)((wxStreamBase*)_obj)->GetLastError();
+}
+	
+EWXWEXPORT(int, wxStreamBase_IsOk)(void* _obj)
+{
+	return (int)((wxStreamBase*)_obj)->IsOk();
+}
+	
+EWXWEXPORT(int, wxStreamBase_GetSize)(void* _obj)
+{
+	return (int)((wxStreamBase*)_obj)->GetSize();
+}
+	
+
+EWXWEXPORT(void, wxOutputStream_Delete)(void* _obj)
+{
+	delete (wxOutputStream*)_obj;
+}
+
+EWXWEXPORT(void, wxOutputStream_PutC)(void* _obj, char c)
+{
+	((wxOutputStream*)_obj)->PutC(c);
+}
+	
+EWXWEXPORT(void, wxOutputStream_Write)(void* _obj, void* buffer, int size)
+{
+	((wxOutputStream*)_obj)->Write((const void*)buffer, (size_t)size);
+}
+	
+EWXWEXPORT(int, wxOutputStream_Seek)(void* _obj, int pos, int mode)
+{
+	return (int)((wxOutputStream*)_obj)->SeekO((off_t)pos, (wxSeekMode)mode);
+}
+	
+EWXWEXPORT(int, wxOutputStream_Tell)(void* _obj)
+{
+	return (int)((wxOutputStream*)_obj)->TellO();
+}
+	
+EWXWEXPORT(int, wxOutputStream_LastWrite)(void* _obj)
+{
+	return (int)((wxOutputStream*)_obj)->LastWrite();
+}
+	
+EWXWEXPORT(void, wxOutputStream_Sync)(void* _obj)
+{
+	((wxOutputStream*)_obj)->Sync();
+}
+	
+
+EWXWEXPORT(void, wxInputStream_Delete)(void* _obj)
+{
+	delete (wxInputStream*)_obj;
+}
+
+EWXWEXPORT(int, wxInputStream_Eof)(void* _obj)
+{
+	return (int)((wxInputStream*)_obj)->Eof();
+}
+	
+EWXWEXPORT(char, wxInputStream_Peek)(void* _obj)
+{
+	return ((wxInputStream*)_obj)->Peek();
+}
+	
+EWXWEXPORT(char, wxInputStream_GetC)(void* _obj)
+{
+	return ((wxInputStream*)_obj)->GetC();
+}
+	
+EWXWEXPORT(void, wxInputStream_Read)(void* _obj, void *buffer, int size)
+{
+	((wxInputStream*)_obj)->Read(buffer, (size_t)size);
+}
+	
+EWXWEXPORT(int, wxInputStream_SeekI)(void* _obj, int pos, int mode)
+{
+	return (int)((wxInputStream*)_obj)->SeekI((off_t)pos, (wxSeekMode)mode);
+}
+	
+EWXWEXPORT(int, wxInputStream_Tell)(void* _obj)
+{
+	return (int)((wxInputStream*)_obj)->TellI();
+}
+	
+EWXWEXPORT(int, wxInputStream_LastRead)(void* _obj)
+{
+	return (int)((wxInputStream*)_obj)->LastRead();
+}	
+
+EWXWEXPORT(int, wxInputStream_UngetBuffer)(void* _obj, void* buffer, int size)
+{
+	return (int)((wxInputStream*)_obj)->Ungetch((const void*)buffer, (size_t)size);
+}
+	
+EWXWEXPORT(int, wxInputStream_Ungetch)(void* _obj, char c)
+{
+	return (int)((wxInputStream*)_obj)->Ungetch(c);
+}
+	
+}
diff --git a/wxc/src/eljradiobox.cpp b/wxc/src/eljradiobox.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljradiobox.cpp
@@ -0,0 +1,105 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxRadioBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _dim, int _stl)
+{
+	wxString items[256];
+
+	for (int i = 0; i < _n; i++)
+		items[i] = ((wxChar**)_str)[i];
+
+	return (void*) new wxRadioBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _n, items, _dim, _stl, wxDefaultValidator);
+}
+
+EWXWEXPORT(int, wxRadioBox_FindString)(void* _obj, void* s)
+{
+	return ((wxRadioBox*)_obj)->FindString((wxChar*) s);
+}
+
+EWXWEXPORT(void, wxRadioBox_SetSelection)(void* _obj, int _n)
+{
+	((wxRadioBox*)_obj)->SetSelection(_n);
+}
+
+EWXWEXPORT(int, wxRadioBox_GetSelection)(void* _obj)
+{
+	return ((wxRadioBox*)_obj)->GetSelection();
+}
+
+EWXWEXPORT(void, wxRadioBox_SetItemLabel)(void* _obj, int item, void* label)
+{
+#if wxVERSION_NUMBER >= 2400
+	((wxRadioBoxBase*)_obj)->SetString(item, (wxChar*)label);
+#else
+	((wxRadioBox*)_obj)->SetLabel(item, (wxChar*)label);
+#endif
+}
+
+EWXWEXPORT(void, wxRadioBox_SetItemBitmap)(void* _obj, int item, void* bitmap)
+{
+#if wxVERSION_NUMBER < 2400
+	((wxRadioBox*)_obj)->SetLabel(item, (wxBitmap*) bitmap);
+#endif
+}
+
+EWXWEXPORT(int, wxRadioBox_GetItemLabel)(void* _obj, int item, void* _buf)
+{
+#if wxVERSION_NUMBER >= 2400
+	wxString result = ((wxRadioBox*)_obj)->GetString(item);
+#else
+	wxString result = ((wxRadioBox*)_obj)->GetLabel(item);
+#endif
+	return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(void, wxRadioBox_EnableItem)(void* _obj, int item, int enable)
+{
+	((wxRadioBox*)_obj)->Enable(item, enable != 0);
+}
+
+EWXWEXPORT(void, wxRadioBox_ShowItem)(void* _obj, int item, int show)
+{
+	((wxRadioBox*)_obj)->Show(item, show != 0);
+}
+
+EWXWEXPORT(int, wxRadioBox_GetStringSelection)(void* _obj, void* _buf)
+{
+	wxString result = ((wxRadioBox*)_obj)->GetStringSelection();
+	return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(void, wxRadioBox_SetStringSelection)(void* _obj, void* s)
+{
+	((wxRadioBox*)_obj)->SetStringSelection((wxChar*) s);
+}
+
+EWXWEXPORT(int, wxRadioBox_Number)(void* _obj)
+{
+#if wxVERSION_NUMBER >= 2400
+	return ((wxRadioBox*)_obj)->GetCount();
+#else
+	return ((wxRadioBox*)_obj)->Number();
+#endif
+}
+
+EWXWEXPORT(int, wxRadioBox_GetNumberOfRowsOrCols)(void* _obj)
+{
+#if wxVERSION_NUMBER >= 2600
+	return ((wxRadioBox*)_obj)->GetCount();
+#else
+	return ((wxRadioBox*)_obj)->GetNumberOfRowsOrCols();
+#endif
+}
+
+EWXWEXPORT(void, wxRadioBox_SetNumberOfRowsOrCols)(void* _obj, int n)
+{
+#if wxVERSION_NUMBER >= 2600
+	return;
+#else
+	((wxRadioBox*)_obj)->SetNumberOfRowsOrCols(n);
+#endif
+}
+
+}
diff --git a/wxc/src/eljradiobutton.cpp b/wxc/src/eljradiobutton.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljradiobutton.cpp
@@ -0,0 +1,21 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxRadioButton_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxRadioButton ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
+}
+
+EWXWEXPORT(void, wxRadioButton_SetValue)(void* _obj, int value)
+{
+	((wxRadioButton*)_obj)->SetValue(value != 0);
+}
+	
+EWXWEXPORT(int, wxRadioButton_GetValue)(void* _obj)
+{
+	return (int)((wxRadioButton*)_obj)->GetValue();
+}
+
+} 
diff --git a/wxc/src/eljrc.cpp b/wxc/src/eljrc.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljrc.cpp
@@ -0,0 +1,440 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+
+#ifdef __WIN32__
+#define LoadBitmap LoadBitmapA
+#define LoadIcon LoadIconA
+#endif
+
+#include "eljscintilla.h"
+#include "wx/xrc/xmlres.h"
+
+class wxMDIParentFrameXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxMDIParentFrameXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+class wxMDIChildFrameXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxMDIChildFrameXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+class wxSplitterWindowXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxSplitterWindowXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+class wxScintillaXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxScintillaXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+class wxGridXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxGridXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+wxMDIParentFrameXmlHandler::wxMDIParentFrameXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+    XRC_ADD_STYLE(wxCAPTION);
+    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
+    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
+    XRC_ADD_STYLE(wxTHICK_FRAME);
+    XRC_ADD_STYLE(wxSYSTEM_MENU);
+    XRC_ADD_STYLE(wxRESIZE_BORDER);
+    XRC_ADD_STYLE(wxRESIZE_BOX);
+
+    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
+    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxMDIParentFrameXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxMDIParentFrame);
+
+    frame->Create(m_parentAsWindow,
+                  GetID(),
+                  GetText(wxT("title")),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
+                  GetName());
+
+    if (HasParam(wxT("size")))
+        frame->SetClientSize(GetSize());
+    if (HasParam(wxT("pos")))
+        frame->Move(GetPosition());
+
+    SetupWindow(frame);
+
+    CreateChildren(frame);
+
+    if (GetBool(wxT("centered"), FALSE))
+        frame->Centre();
+
+    return frame;
+}
+
+bool wxMDIParentFrameXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxMDIParentFrame"));
+}
+
+wxMDIChildFrameXmlHandler::wxMDIChildFrameXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+    XRC_ADD_STYLE(wxCAPTION);
+    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
+    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
+    XRC_ADD_STYLE(wxTHICK_FRAME);
+    XRC_ADD_STYLE(wxSYSTEM_MENU);
+    XRC_ADD_STYLE(wxRESIZE_BORDER);
+    XRC_ADD_STYLE(wxRESIZE_BOX);
+
+    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
+    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxMDIChildFrameXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
+	
+	wxMDIParentFrame* prt = wxDynamicCast (m_parentAsWindow, wxMDIParentFrame);
+
+	if (prt == NULL)
+	{
+		wxLogError(wxT("Error in resource: wxMDIChildFrame has no wxMDIParentFrame."));
+		return NULL;
+	}
+
+    frame->Create(prt,
+                  GetID(),
+                  GetText(wxT("title")),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
+                  GetName());
+
+    SetupWindow(frame);
+
+    CreateChildren(frame);
+
+    if (GetBool(wxT("centered"), FALSE))
+        frame->Centre();
+
+    return frame;
+}
+
+bool wxMDIChildFrameXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxMDIChildFrame"));
+}
+
+wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSP_3D);
+    XRC_ADD_STYLE(wxSP_3DSASH);
+    XRC_ADD_STYLE(wxSP_BORDER);
+    XRC_ADD_STYLE(wxSP_FULLSASH);
+    XRC_ADD_STYLE(wxSP_BORDER);
+    XRC_ADD_STYLE(wxSP_NOBORDER);
+    XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);
+    XRC_ADD_STYLE(wxSP_LIVE_UPDATE);
+
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxSplitterWindowXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxSplitterWindow);
+
+    frame->Create(m_parentAsWindow,
+                  GetID(),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), wxSP_3D),
+                  GetName());
+
+    SetupWindow(frame);
+
+    CreateChildren(frame);
+	
+	if (frame->GetChildren().GetCount() != 2)
+	{
+		wxLogError(wxT("Error in resource: Splitter window needs exactly two children."));
+		return NULL;
+	}
+	
+	frame->SetSplitMode(GetLong (wxT("splitmode"), wxSPLIT_VERTICAL));
+	long sashpos = GetLong (wxT("sashposition"), 100);
+	
+	wxWindowList::Node* node = frame->GetChildren().GetFirst();
+	wxWindow* wnd1 = node->GetData();
+	wxWindow* wnd2 = node->GetNext()->GetData();
+
+	if (frame->GetSplitMode() == wxSPLIT_VERTICAL)
+		frame->SplitVertically (wnd1, wnd2, sashpos);
+	else
+		frame->SplitHorizontally (wnd1, wnd2, sashpos);
+	
+    return frame;
+}
+
+bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxSplitterWindow"));
+}
+
+wxScintillaXmlHandler::wxScintillaXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxNO_3D);
+    AddWindowStyles();
+}
+
+wxObject *wxScintillaXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxScintilla);
+	
+    frame->Create(m_parentAsWindow,
+                  GetID(),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), 0),
+				  wxDefaultValidator,
+                  GetName());
+
+    if (HasParam(wxT("size")))
+        frame->SetSize(GetSize());
+    if (HasParam(wxT("pos")))
+        frame->Move(GetPosition());
+
+    SetupWindow(frame);
+
+    return frame;
+}
+
+bool wxScintillaXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxScintilla"));
+}
+
+wxGridXmlHandler::wxGridXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxGridXmlHandler::DoCreateResource()
+{
+	wxGrid* grid = new wxGrid(m_parentAsWindow,
+                              GetID(),
+                              wxDefaultPosition, wxDefaultSize,
+                              GetStyle(wxT("style"), wxWANTS_CHARS),
+                              GetName());
+
+	long cols = GetLong (wxT("numcols"), 0);
+	long rows = GetLong (wxT("numrows"), 0);
+	
+	if (cols && rows)
+		grid->CreateGrid(cols, rows, (wxGrid::wxGridSelectionModes)GetLong (wxT("selmode"), 0));
+	
+    if (HasParam(wxT("size")))
+        grid->SetSize(GetSize());
+    if (HasParam(wxT("pos")))
+        grid->Move(GetPosition());
+
+	SetupWindow(grid);
+
+	return grid;
+}
+
+bool wxGridXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxGrid"));
+}
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxXmlResource_Create)(void* _obj, int flags)
+{
+	return (void*)new wxXmlResource(flags);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_CreateFromFile)(void* _obj, void* filemask, int flags)
+{
+	return (void*)new wxXmlResource((char*)filemask, flags);
+}
+	
+EWXWEXPORT(void,wxXmlResource_Delete)(void* _obj)
+{
+	delete (wxXmlResource*)_obj;
+}
+	
+EWXWEXPORT(int,wxXmlResource_Load)(void* _obj, void* filemask)
+{
+	wxGetApp().InitZipFileSystem();
+	return (int)((wxXmlResource*)_obj)->Load((char*)filemask);
+}
+	
+EWXWEXPORT(void,wxXmlResource_InitAllHandlers)(void* _obj)
+{
+	((wxXmlResource*)_obj)->InitAllHandlers();
+	((wxXmlResource*)_obj)->AddHandler(new wxMDIParentFrameXmlHandler());
+	((wxXmlResource*)_obj)->AddHandler(new wxMDIChildFrameXmlHandler());
+	((wxXmlResource*)_obj)->AddHandler(new wxSplitterWindowXmlHandler());
+	((wxXmlResource*)_obj)->AddHandler(new wxScintillaXmlHandler());
+	((wxXmlResource*)_obj)->AddHandler(new wxGridXmlHandler());
+}
+	
+EWXWEXPORT(void,wxXmlResource_AddHandler)(void* _obj, void* handler)
+{
+	((wxXmlResource*)_obj)->AddHandler((wxXmlResourceHandler*)handler);
+}
+	
+EWXWEXPORT(void,wxXmlResource_InsertHandler)(void* _obj, void* handler)
+{
+	((wxXmlResource*)_obj)->InsertHandler((wxXmlResourceHandler*)handler);
+}
+	
+EWXWEXPORT(void,wxXmlResource_ClearHandlers)(void* _obj)
+{
+	((wxXmlResource*)_obj)->ClearHandlers();
+}
+	
+EWXWEXPORT(void,wxXmlResource_AddSubclassFactory)(void* _obj, void* factory)
+{
+	((wxXmlResource*)_obj)->AddSubclassFactory((wxXmlSubclassFactory*)factory);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_LoadMenu)(void* _obj, void* name)
+{
+	return (void*)((wxXmlResource*)_obj)->LoadMenu((char*)name);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_LoadMenuBar)(void* _obj, void* parent, void* name)
+{
+	return (void*)((wxXmlResource*)_obj)->LoadMenuBar((wxWindow*)parent, (char*)name);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_LoadToolBar)(void* _obj, void* parent, void* name)
+{
+	return (void*)((wxXmlResource*)_obj)->LoadToolBar((wxWindow*)parent, (char*)name);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_LoadDialog)(void* _obj, void* parent, void* name)
+{
+	return (void*)((wxXmlResource*)_obj)->LoadDialog((wxWindow*)parent, (char*)name);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_LoadPanel)(void* _obj, void* parent, void* name)
+{
+	return (void*)((wxXmlResource*)_obj)->LoadPanel((wxWindow*)parent, (char*)name);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_LoadFrame)(void* _obj, void* parent, void* name)
+{
+	return (void*)((wxXmlResource*)_obj)->LoadFrame((wxWindow*)parent, (char*)name);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_LoadObject)(void* _obj, void* parent, void* name, void* classname)
+{
+	return (void*)((wxXmlResource*)_obj)->LoadObject((wxWindow*)parent, (char*)name, (char*)classname);
+}
+	
+EWXWEXPORT(int,wxXmlResource_InitializeObject)(void* _obj, void* _inst, void* parent, void* name, void* classname)
+{
+	return (int)((wxXmlResource*)_obj)->LoadObject((wxObject*)_inst, (wxWindow*)parent, (char*)name, (char*)classname);
+}
+	
+EWXWEXPORT(void,wxXmlResource_LoadBitmap)(void* _obj, void* name, void* _ref)
+{
+	*((wxBitmap*)_ref) = ((wxXmlResource*)_obj)->LoadBitmap((char*)name);
+}
+	
+EWXWEXPORT(void,wxXmlResource_LoadIcon)(void* _obj, void* name, void* _ref)
+{
+	*((wxIcon*)_ref) = ((wxXmlResource*)_obj)->LoadIcon((char*)name);
+}
+	
+EWXWEXPORT(int,wxXmlResource_AttachUnknownControl)(void* _obj, void* name, void* control, void* parent)
+{
+	return (int)((wxXmlResource*)_obj)->AttachUnknownControl((char*)name, (wxWindow*)control, (wxWindow*)parent);
+}
+	
+EWXWEXPORT(int,wxXmlResource_GetXRCID)(void* str_id)
+{
+	return wxXmlResource::GetXRCID((wxChar*)str_id);
+}
+	
+EWXWEXPORT(int,wxXmlResource_GetVersion)(void* _obj)
+{
+	return (int)((wxXmlResource*)_obj)->GetVersion();
+}
+	
+EWXWEXPORT(int,wxXmlResource_CompareVersion)(void* _obj, int major, int minor, int release, int revision)
+{
+	return ((wxXmlResource*)_obj)->CompareVersion(major, minor, release, revision);
+}
+	
+EWXWEXPORT(void*,wxXmlResource_Get)()
+{
+	return (void*)wxXmlResource::Get();
+}
+	
+EWXWEXPORT(void*,wxXmlResource_Set)(void* res)
+{
+	return (void*)wxXmlResource::Set((wxXmlResource*)res);
+}
+	
+EWXWEXPORT(int,wxXmlResource_GetFlags)(void* _obj)
+{
+	return ((wxXmlResource*)_obj)->GetFlags();
+}
+	
+EWXWEXPORT(void,wxXmlResource_SetFlags)(void* _obj, int flags)
+{
+	((wxXmlResource*)_obj)->SetFlags(flags);
+}
+	
+}
+#endif
diff --git a/wxc/src/eljregion.cpp b/wxc/src/eljregion.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljregion.cpp
@@ -0,0 +1,91 @@
+#include "wrapper.h"
+
+extern "C"
+{
+	
+EWXWEXPORT(void*, wxRegion_CreateDefault) ()
+{
+	return (void*) new wxRegion();
+}
+
+EWXWEXPORT(void*, wxRegion_CreateFromRect) (int x, int y, int w, int h)
+{
+	return (void*) new wxRegion((wxCoord)x, (wxCoord)y, (wxCoord)w, (wxCoord)h);
+}
+
+EWXWEXPORT(void, wxRegion_Delete) (void* _obj)
+{
+	delete (wxRegion*)_obj;
+}
+
+EWXWEXPORT(void, wxRegion_Assign)(void* _obj, void* region)
+{
+	*((wxRegion*)_obj) = *((wxRegion*)region);
+}
+
+EWXWEXPORT(void, wxRegion_Clear)(void* _obj)
+{
+	((wxRegion*)_obj)->Clear();
+}
+	
+EWXWEXPORT(int, wxRegion_UnionRect)(void* _obj, int x, int y, int width, int height)
+{
+	return (int)((wxRegion*)_obj)->Union((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(int, wxRegion_UnionRegion)(void* _obj, void* region)
+{
+	return (int)((wxRegion*)_obj)->Union(*((wxRegion*)region));
+}
+	
+EWXWEXPORT(int, wxRegion_IntersectRect)(void* _obj, int x, int y, int width, int height)
+{
+	return (int)((wxRegion*)_obj)->Intersect((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(int, wxRegion_IntersectRegion)(void* _obj, void* region)
+{
+	return (int)((wxRegion*)_obj)->Intersect(*((wxRegion*)region));
+}
+	
+EWXWEXPORT(int, wxRegion_SubtractRect)(void* _obj, int x, int y, int width, int height)
+{
+	return (int)((wxRegion*)_obj)->Subtract((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(int, wxRegion_SubtractRegion)(void* _obj, void* region)
+{
+	return (int)((wxRegion*)_obj)->Subtract(*((wxRegion*)region));
+}
+	
+EWXWEXPORT(int, wxRegion_XorRect)(void* _obj, int x, int y, int width, int height)
+{
+	return (int)((wxRegion*)_obj)->Xor((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+EWXWEXPORT(int, wxRegion_XorRegion)(void* _obj, void* region)
+{
+	return (int)((wxRegion*)_obj)->Xor(*((wxRegion*)region));
+}
+	
+EWXWEXPORT(void, wxRegion_GetBox)(void* _obj, void* x, void* y, void* w, void* h)
+{
+	((wxRegion*)_obj)->GetBox(*((wxCoord*)x), *((wxCoord*)y), *((wxCoord*)w), *((wxCoord*)h));
+}
+	
+EWXWEXPORT(int, wxRegion_Empty)(void* _obj)
+{
+	return (int)((wxRegion*)_obj)->Empty();
+}
+	
+EWXWEXPORT(int, wxRegion_ContainsPoint)(void* _obj, int x, int y)
+{
+	return (int)((wxRegion*)_obj)->Contains((wxCoord)x, (wxCoord)y);
+}
+	
+EWXWEXPORT(int, wxRegion_ContainsRect)(void* _obj, int x, int y, int width, int height)
+{
+	return (int)((wxRegion*)_obj)->Contains((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
+}
+	
+}
diff --git a/wxc/src/eljregioniter.cpp b/wxc/src/eljregioniter.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljregioniter.cpp
@@ -0,0 +1,61 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxRegionIterator_Create)()
+{
+	return (void*) new wxRegionIterator();
+}
+
+EWXWEXPORT(void*, wxRegionIterator_CreateFromRegion)(void* region)
+{
+	return (void*) new wxRegionIterator(*((wxRegion*)region));
+}
+
+EWXWEXPORT(void, wxRegionIterator_Delete)(void* _obj)
+{
+	delete (wxRegionIterator*)_obj;
+}
+
+EWXWEXPORT(void, wxRegionIterator_Reset)(void* _obj)
+{
+	((wxRegionIterator*)_obj)->Reset();
+}
+	
+EWXWEXPORT(void, wxRegionIterator_ResetToRegion)(void* _obj, void* region)
+{
+	((wxRegionIterator*)_obj)->Reset(*((wxRegion*)region));
+}
+	
+EWXWEXPORT(int, wxRegionIterator_HaveRects)(void* _obj)
+{
+	return (int)((wxRegionIterator*)_obj)->HaveRects();
+}
+
+EWXWEXPORT(void, wxRegionIterator_Next)(void* _obj)
+{
+	(*((wxRegionIterator*)_obj))++;
+}
+	
+EWXWEXPORT(int, wxRegionIterator_GetX)(void* _obj)
+{
+	return ((wxRegionIterator*)_obj)->GetX();
+}
+	
+EWXWEXPORT(int, wxRegionIterator_GetY)(void* _obj)
+{
+	return ((wxRegionIterator*)_obj)->GetY();
+}
+	
+EWXWEXPORT(int, wxRegionIterator_GetWidth)(void* _obj)
+{
+	return ((wxRegionIterator*)_obj)->GetWidth();
+}
+	
+EWXWEXPORT(int, wxRegionIterator_GetHeight)(void* _obj)
+{
+	return ((wxRegionIterator*)_obj)->GetHeight();
+}
+	
+}
diff --git a/wxc/src/eljsash.cpp b/wxc/src/eljsash.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljsash.cpp
@@ -0,0 +1,286 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxSashWindow_Create) (void* _par, int _id, int _x, int _y, int _w, int _h, int _stl)
+{
+	return (void*) new wxSashWindow ((wxWindow*)_par, _id, wxPoint(_x, _y), wxSize (_w, _h), (long)_stl);
+}
+
+EWXWEXPORT(void, wxSashWindow_SetSashVisible)(void* _obj, int edge, int sash)
+{
+	((wxSashWindow*)_obj)->SetSashVisible((wxSashEdgePosition)edge, sash != 0);
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetSashVisible)(void* _obj, int edge)
+{
+	return (int)((wxSashWindow*)_obj)->GetSashVisible((wxSashEdgePosition)edge);
+}
+	
+EWXWEXPORT(void, wxSashWindow_SetSashBorder)(void* _obj, int edge, int border)
+{
+	((wxSashWindow*)_obj)->SetSashBorder((wxSashEdgePosition)edge, border != 0);
+}
+	
+EWXWEXPORT(int, wxSashWindow_HasBorder)(void* _obj, int edge)
+{
+	return (int)((wxSashWindow*)_obj)->HasBorder((wxSashEdgePosition)edge);
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetEdgeMargin)(void* _obj, int edge)
+{
+	return ((wxSashWindow*)_obj)->GetEdgeMargin((wxSashEdgePosition)edge);
+}
+	
+EWXWEXPORT(void, wxSashWindow_SetDefaultBorderSize)(void* _obj, int width)
+{
+	((wxSashWindow*)_obj)->SetDefaultBorderSize(width);
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetDefaultBorderSize)(void* _obj)
+{
+	return ((wxSashWindow*)_obj)->GetDefaultBorderSize();
+}
+	
+EWXWEXPORT(void, wxSashWindow_SetExtraBorderSize)(void* _obj, int width)
+{
+	((wxSashWindow*)_obj)->SetExtraBorderSize(width);
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetExtraBorderSize)(void* _obj)
+{
+	return ((wxSashWindow*)_obj)->GetExtraBorderSize();
+}
+	
+EWXWEXPORT(void, wxSashWindow_SetMinimumSizeX)(void* _obj, int min)
+{
+	((wxSashWindow*)_obj)->SetMinimumSizeX(min);
+}
+	
+EWXWEXPORT(void, wxSashWindow_SetMinimumSizeY)(void* _obj, int min)
+{
+	((wxSashWindow*)_obj)->SetMinimumSizeY(min);
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetMinimumSizeX)(void* _obj)
+{
+	return ((wxSashWindow*)_obj)->GetMinimumSizeX();
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetMinimumSizeY)(void* _obj)
+{
+	return ((wxSashWindow*)_obj)->GetMinimumSizeY();
+}
+	
+EWXWEXPORT(void, wxSashWindow_SetMaximumSizeX)(void* _obj, int max)
+{
+	((wxSashWindow*)_obj)->SetMaximumSizeX(max);
+}
+	
+EWXWEXPORT(void, wxSashWindow_SetMaximumSizeY)(void* _obj, int max)
+{
+	((wxSashWindow*)_obj)->SetMaximumSizeY(max);
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetMaximumSizeX)(void* _obj)
+{
+	return ((wxSashWindow*)_obj)->GetMaximumSizeX();
+}
+	
+EWXWEXPORT(int, wxSashWindow_GetMaximumSizeY)(void* _obj)
+{
+	return ((wxSashWindow*)_obj)->GetMaximumSizeY();
+}
+
+
+EWXWEXPORT(void*, wxSashEvent_Create) (int id, int edge)
+{
+	return (void*) new wxSashEvent(id, (wxSashEdgePosition)edge);
+}
+
+EWXWEXPORT(void, wxSashEvent_SetEdge)(void* _obj, int edge)
+{
+	((wxSashEvent*)_obj)->SetEdge((wxSashEdgePosition)edge);
+}
+	
+EWXWEXPORT(int, wxSashEvent_GetEdge)(void* _obj)
+{
+	return (int)((wxSashEvent*)_obj)->GetEdge();
+}
+	
+EWXWEXPORT(void, wxSashEvent_SetDragRect)(void* _obj, int x, int y , int w, int h)
+{
+	((wxSashEvent*)_obj)->SetDragRect(wxRect (x, y , w, h));
+}
+	
+EWXWEXPORT(void, wxSashEvent_GetDragRect)(void* _obj, void* x, void* y , void* w, void* h)
+{
+	wxRect tmp = ((wxSashEvent*)_obj)->GetDragRect();
+	(*(int*)x) = tmp.x;
+	(*(int*)y) = tmp.y;
+	(*(int*)w) = tmp.width;
+	(*(int*)h) = tmp.height;
+}
+	
+EWXWEXPORT(void, wxSashEvent_SetDragStatus)(void* _obj, int status)
+{
+	((wxSashEvent*)_obj)->SetDragStatus((wxSashDragStatus)status);
+}
+	
+EWXWEXPORT(int, wxSashEvent_GetDragStatus)(void* _obj)
+{
+	return (int)((wxSashEvent*)_obj)->GetDragStatus();
+}
+	
+
+EWXWEXPORT(void*, wxSashLayoutWindow_Create) (void* _par, int _id, int _x, int _y, int _w, int _h, int _stl)
+{
+	return (void*) new wxSashLayoutWindow ((wxWindow*)_par, _id, wxPoint(_x, _y), wxSize (_w, _h), (long)_stl);
+}
+
+EWXWEXPORT(int, wxSashLayoutWindow_GetAlignment)(void* _obj)
+{
+	return (int)((wxSashLayoutWindow*)_obj)->GetAlignment();
+}
+	
+EWXWEXPORT(int, wxSashLayoutWindow_GetOrientation)(void* _obj)
+{
+	return (int)((wxSashLayoutWindow*)_obj)->GetOrientation();
+}
+	
+EWXWEXPORT(void, wxSashLayoutWindow_SetAlignment)(void* _obj, int align)
+{
+	((wxSashLayoutWindow*)_obj)->SetAlignment((wxLayoutAlignment)align);
+}
+	
+EWXWEXPORT(void, wxSashLayoutWindow_SetOrientation)(void* _obj, int orient)
+{
+	((wxSashLayoutWindow*)_obj)->SetOrientation((wxLayoutOrientation)orient);
+}
+	
+EWXWEXPORT(void, wxSashLayoutWindow_SetDefaultSize)(void* _obj, int w, int h)
+{
+	((wxSashLayoutWindow*)_obj)->SetDefaultSize(wxSize(w, h));
+}
+	
+
+EWXWEXPORT(void*, wxQueryLayoutInfoEvent_Create) (int id)
+{
+	return (void*) new wxQueryLayoutInfoEvent(id);
+}
+
+EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetRequestedLength)(void* _obj, int length)
+{
+	((wxQueryLayoutInfoEvent*)_obj)->SetRequestedLength(length);
+}
+	
+EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetRequestedLength)(void* _obj)
+{
+	return ((wxQueryLayoutInfoEvent*)_obj)->GetRequestedLength();
+}
+	
+EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetFlags)(void* _obj, int flags)
+{
+	((wxQueryLayoutInfoEvent*)_obj)->SetFlags(flags);
+}
+	
+EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetFlags)(void* _obj)
+{
+	return ((wxQueryLayoutInfoEvent*)_obj)->GetFlags();
+}
+	
+EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetSize)(void* _obj, int w, int h)
+{
+	((wxQueryLayoutInfoEvent*)_obj)->SetSize(wxSize(w, h));
+}
+	
+EWXWEXPORT(void, wxQueryLayoutInfoEvent_GetSize)(void* _obj, void* w, void* h)
+{
+	wxSize tmp = ((wxQueryLayoutInfoEvent*)_obj)->GetSize();
+	(*(int*)w) = tmp.x;
+	(*(int*)h) = tmp.y;
+}
+	
+EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetOrientation)(void* _obj, int orient)
+{
+	((wxQueryLayoutInfoEvent*)_obj)->SetOrientation((wxLayoutOrientation)orient);
+}
+	
+EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetOrientation)(void* _obj)
+{
+	return (int)((wxQueryLayoutInfoEvent*)_obj)->GetOrientation();
+}
+	
+EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetAlignment)(void* _obj, int align)
+{
+	((wxQueryLayoutInfoEvent*)_obj)->SetAlignment((wxLayoutAlignment)align);
+}
+	
+EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetAlignment)(void* _obj)
+{
+	return (int)((wxQueryLayoutInfoEvent*)_obj)->GetAlignment();
+}
+	
+
+EWXWEXPORT(void*, wxCalculateLayoutEvent_Create) (int id)
+{
+	return (void*) new wxCalculateLayoutEvent(id);
+}
+
+EWXWEXPORT(void, wxCalculateLayoutEvent_SetFlags)(void* _obj, int flags)
+{
+	((wxCalculateLayoutEvent*)_obj)->SetFlags(flags);
+}
+	
+EWXWEXPORT(int, wxCalculateLayoutEvent_GetFlags)(void* _obj)
+{
+	return ((wxCalculateLayoutEvent*)_obj)->GetFlags();
+}
+	
+EWXWEXPORT(void, wxCalculateLayoutEvent_SetRect)(void* _obj, int x, int y , int w, int h)
+{
+	((wxCalculateLayoutEvent*)_obj)->SetRect(wxRect(x, y, w, h));
+}
+	
+EWXWEXPORT(void, wxCalculateLayoutEvent_GetRect)(void* _obj, void* x, void* y , void* w, void* h)
+{
+	wxRect tmp = ((wxCalculateLayoutEvent*)_obj)->GetRect();
+	(*(int*)x) = tmp.x;
+	(*(int*)y) = tmp.y;
+	(*(int*)w) = tmp.width;
+	(*(int*)h) = tmp.height;
+}
+
+EWXWEXPORT(void*, wxLayoutAlgorithm_Create)()
+{
+	return (void*) new wxLayoutAlgorithm();
+}
+
+EWXWEXPORT(void, wxLayoutAlgorithm_Delete)(void* _obj)
+{
+	delete (wxLayoutAlgorithm*)_obj;
+}
+
+EWXWEXPORT(int, wxLayoutAlgorithm_LayoutMDIFrame)(void* _obj, void* frame, int x, int y , int w, int h, int use)
+{
+	wxRect* r = NULL;
+	if (use) r = new wxRect(x, y, w, h);
+	
+	int result = (int)((wxLayoutAlgorithm*)_obj)->LayoutMDIFrame((wxMDIParentFrame*)frame, r);
+	
+	if (r) delete r;
+	return result;
+}
+	
+EWXWEXPORT(int, wxLayoutAlgorithm_LayoutFrame)(void* _obj, void* frame, void* mainWindow)
+{
+	return (int)((wxLayoutAlgorithm*)_obj)->LayoutFrame((wxFrame*)frame, (wxWindow*)mainWindow);
+}
+	
+EWXWEXPORT(int, wxLayoutAlgorithm_LayoutWindow)(void* _obj, void* frame, void* mainWindow)
+{
+	return (int)((wxLayoutAlgorithm*)_obj)->LayoutWindow((wxFrame*)frame, (wxWindow*)mainWindow);
+}
+	
+}
diff --git a/wxc/src/eljscintilla.cpp b/wxc/src/eljscintilla.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljscintilla.cpp
@@ -0,0 +1,236 @@
+#include "wrapper.h"
+#include "eljscintilla.h"
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxScintilla, wxControl)
+
+#ifdef __WIN32__
+bool wxScintilla::EnsureDll()
+{
+	static bool done = FALSE;
+
+	if (done) return TRUE;
+
+	done = TRUE;
+	return (bool)LoadLibrary (wxT("SciLexer.dll"));
+}
+
+bool wxScintilla::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)
+{
+	sc_eiffel = NULL;
+	sc_object = NULL;
+	
+	if (!EnsureDll())
+		return FALSE;
+		
+    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
+        return FALSE;
+
+    parent->AddChild((wxButton *)this);
+
+    long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD /* | WS_CLIPSIBLINGS */ ;
+
+    m_hWnd = (WXHWND)CreateWindowEx
+                     (
+                      m_windowStyle,
+                      /* MakeExtendedStyle(m_windowStyle), */
+                      wxT("Scintilla"),
+                      wxT(""),
+                      msStyle,
+                      0, 0, 0, 0,
+                      GetWinHwnd(parent),
+                      (HMENU)m_windowId,
+                      wxGetInstance(),
+                      NULL
+                     );
+
+    if (m_hWnd == 0)
+    {
+        wxString msg;
+#ifdef __WIN16__
+        msg.Printf(wxT("CreateWindowEx failed"));
+#else
+        msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (long) GetLastError());
+#endif
+        wxFAIL_MSG(msg);
+    }
+
+	m_proc = (ScExec)SendMessage((HWND)m_hWnd, 2184, 0, 0);
+	m_obj  = (void*) SendMessage((HWND)m_hWnd, 2185, 0, 0);
+
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin(m_hWnd);
+
+    SetSize(pos.x, pos.y, size.x, size.y);
+
+    return TRUE;
+}
+
+wxSize wxScintilla::GetDefaultSize()
+{
+    static wxSize s_sizeSci;
+
+    if ( s_sizeSci.x == 0 )
+    {
+		s_sizeSci.x = 200;
+		s_sizeSci.y = 200;
+	}
+	
+	return s_sizeSci;
+
+}
+
+bool wxScintilla::MSWOnNotify(int idCtrl,
+                              WXLPARAM lParam,
+                              WXLPARAM* result)
+{
+    wxCommandEvent event(wxEVT_NULL, m_windowId);
+    wxEventType eventType = wxEVT_NULL;
+    NMHDR *hdr1 = (NMHDR*) lParam;
+    switch ( hdr1->code )
+    {
+        case NM_CLICK:
+            eventType = wxEVT_COMMAND_LEFT_CLICK;
+            break;
+
+        case NM_DBLCLK:
+            eventType = wxEVT_COMMAND_LEFT_DCLICK;
+            break;
+
+        case NM_RCLICK:
+            eventType = wxEVT_COMMAND_RIGHT_CLICK;
+            break;
+
+        case NM_RDBLCLK:
+            eventType = wxEVT_COMMAND_RIGHT_DCLICK;
+            break;
+
+        case NM_SETFOCUS:
+            eventType = wxEVT_COMMAND_SET_FOCUS;
+            break;
+
+        case NM_KILLFOCUS:
+            eventType = wxEVT_COMMAND_KILL_FOCUS;
+            break;
+
+        case NM_RETURN:
+            eventType = wxEVT_COMMAND_ENTER;
+            break;
+
+        default:
+			if (hdr1->hwndFrom == (void*)m_hWnd)
+				if (sc_eiffel && sc_object)
+					return sc_eiffel(sc_object, (void*)lParam) != 0;
+				else
+					break;
+			else
+            	return wxWindow::MSWOnNotify(idCtrl, lParam, result);
+    }
+
+    event.SetEventType(eventType);
+    event.SetEventObject(this);
+
+    return GetEventHandler()->ProcessEvent(event);
+}
+#else
+bool wxScintilla::EnsureDll()
+{
+	return FALSE;
+}
+
+bool wxScintilla::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)
+{
+	sc_eiffel = NULL;
+	sc_object = NULL;
+
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxScintilla creation failed") );
+	    return FALSE;
+    }
+
+	m_widget = scintilla_new();
+	
+	if (m_widget)
+	{
+		scintilla_set_id (m_widget, id);
+
+		m_proc = (ScExec)scintilla_send_message(m_widget, 2184, 0, 0);
+		m_obj  = (void*) scintilla_send_message(m_widget, 2185, 0, 0);
+
+		gtk_signal_connect( GTK_OBJECT(m_widget), SCINTILLA_NOTIFY,
+			GTK_SIGNAL_FUNC(wxScintilla::gtk_scintilla_notify_callback), (gpointer*)this );
+	  
+    	m_parent->DoAddChild( this );
+  
+    	PostCreation();
+
+	    SetSize(pos.x, pos.y, size.x, size.y);
+		
+		Show (TRUE);
+		
+		return TRUE;
+	}
+	return FALSE;
+}
+
+wxSize wxScintilla::GetDefaultSize()
+{
+    static wxSize s_sizeSci;
+
+    if ( s_sizeSci.x == 0 )
+    {
+		s_sizeSci.x = 200;
+		s_sizeSci.y = 200;
+	}
+	
+	return s_sizeSci;
+
+}
+
+void wxScintilla::gtk_scintilla_notify_callback(GtkWidget*, gint /*wParam*/, gpointer lParam, wxScintilla* wxSci)
+{
+	if (wxSci->sc_object && wxSci->sc_eiffel)
+		wxSci->sc_eiffel(wxSci->sc_object, (void*)lParam);
+}
+
+#endif
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxScintilla_Create) (void* obj, void* fnc, void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	wxScintilla* result = new wxScintilla ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
+	result->SetEiffelCB(obj, fnc);
+
+	return (void*)result;
+}
+
+EWXWEXPORT(int, wxScintilla_Exec) (void* obj, int code, int param1, int param2)
+{
+	return ((wxScintilla*)obj)->m_proc(((wxScintilla*)obj)->m_obj, code, param1, param2);
+}
+
+EWXWEXPORT(void, wxScintilla_SetEiffelCB) (void* obj, void* eif, void* fnc)
+{
+	((wxScintilla*)obj)->SetEiffelCB(eif, fnc);
+}
+
+}
diff --git a/wxc/src/eljscintilla.h b/wxc/src/eljscintilla.h
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljscintilla.h
@@ -0,0 +1,79 @@
+#ifndef __ELJSCINTILLA_H
+#define __ELJSCINTILLA_H
+
+#ifdef __WIN32__
+#include "wx/msw/private.h"
+#include <commctrl.h>
+#else
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#if GTK_MAJOR_VERSION < 2
+#define SCINTILLA_NOTIFY "notify"
+#else
+#define SCINTILLA_NOTIFY "sci-notify"
+#endif
+extern "C"
+{
+typedef unsigned long uptr_t;
+typedef long sptr_t;
+
+GtkWidget*	scintilla_new		(void);
+void		scintilla_set_id	(GtkWidget*, int id);
+sptr_t	scintilla_send_message	(GtkWidget*, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+}
+#endif
+
+extern "C"
+{
+
+typedef int  _cdecl (*ScNotify)(void*, void*);
+typedef int  _cdecl (*ScExec)  (void*, int, int, int);
+
+}
+
+class wxScintilla : public wxControl
+{
+DECLARE_DYNAMIC_CLASS(wxScintilla)
+
+public:
+    wxScintilla() { }
+    wxScintilla(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxT("wxScintilla"))
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxT("wxScintilla"));
+
+    static wxSize GetDefaultSize();
+
+#ifdef __WIN32__
+	bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result);
+#else
+	static void gtk_scintilla_notify_callback(GtkWidget*, gint, gpointer lParam, wxScintilla* scitew);
+#endif
+
+	ScExec m_proc;
+	void* m_obj;
+
+	ScNotify sc_eiffel;
+	void* sc_object;
+	
+	void SetEiffelCB (void* _obj, void* _fnc) {sc_object = _obj; sc_eiffel = (ScNotify)_fnc;};
+
+protected:
+    virtual wxSize DoGetBestSize() const
+	{return GetDefaultSize();};
+
+private:
+	bool EnsureDll();
+};
+
+#endif
diff --git a/wxc/src/eljscrollbar.cpp b/wxc/src/eljscrollbar.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljscrollbar.cpp
@@ -0,0 +1,41 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxScrollBar_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxScrollBar ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(int, wxScrollBar_GetThumbPosition)(void* _obj)
+{
+	return ((wxScrollBar*)_obj)->GetThumbPosition();
+}
+	
+EWXWEXPORT(int, wxScrollBar_GetThumbSize)(void* _obj)
+{
+	return ((wxScrollBar*)_obj)->GetThumbSize();
+}
+	
+EWXWEXPORT(int, wxScrollBar_GetPageSize)(void* _obj)
+{
+	return ((wxScrollBar*)_obj)->GetPageSize();
+}
+	
+EWXWEXPORT(int, wxScrollBar_GetRange)(void* _obj)
+{
+	return ((wxScrollBar*)_obj)->GetRange();
+}
+	
+EWXWEXPORT(void, wxScrollBar_SetThumbPosition)(void* _obj, int viewStart)
+{
+	((wxScrollBar*)_obj)->SetThumbPosition(viewStart);
+}
+	
+EWXWEXPORT(void, wxScrollBar_SetScrollbar)(void* _obj, int position, int thumbSize, int range, int pageSize, int refresh)
+{
+	((wxScrollBar*)_obj)->SetScrollbar(position, thumbSize, range, pageSize, refresh != 0);
+}
+
+}
diff --git a/wxc/src/eljscrolledwindow.cpp b/wxc/src/eljscrolledwindow.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljscrolledwindow.cpp
@@ -0,0 +1,106 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxScrolledWindow_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxScrolledWindow ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void, wxScrolledWindow_SetTargetWindow)(void* _obj, void* target)
+{
+	((wxScrolledWindow*)_obj)->SetTargetWindow((wxWindow*)target);
+}
+	
+EWXWEXPORT(void*, wxScrolledWindow_GetTargetWindow)(void* _obj)
+{
+	return (void*)((wxScrolledWindow*)_obj)->GetTargetWindow();
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_SetScrollbars)(void* _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, int noRefresh)
+{
+	((wxScrolledWindow*)_obj)->SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_Scroll)(void* _obj, int x_pos, int y_pos)
+{
+	((wxScrolledWindow*)_obj)->Scroll(x_pos, y_pos);
+}
+	
+EWXWEXPORT(int, wxScrolledWindow_GetScrollPageSize)(void* _obj, int orient)
+{
+	return ((wxScrolledWindow*)_obj)->GetScrollPageSize(orient);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_SetScrollPageSize)(void* _obj, int orient, int pageSize)
+{
+	((wxScrolledWindow*)_obj)->SetScrollPageSize(orient, pageSize);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_GetScrollPixelsPerUnit)(void* _obj, void* x_unit, void* y_unit)
+{
+	((wxScrolledWindow*)_obj)->GetScrollPixelsPerUnit((int*)x_unit, (int*)y_unit);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_EnableScrolling)(void* _obj, int x_scrolling, int y_scrolling)
+{
+	((wxScrolledWindow*)_obj)->EnableScrolling(x_scrolling != 0, y_scrolling != 0);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_GetViewStart)(void* _obj, void* x, void* y)
+{
+	((wxScrolledWindow*)_obj)->GetViewStart((int*)x, (int*)y);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_ViewStart)(void* _obj, void* x, void* y)
+{
+	((wxScrolledWindow*)_obj)->GetViewStart((int*)x, (int*)y);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_GetVirtualSize)(void* _obj, void* x, void* y)
+{
+	((wxScrolledWindow*)_obj)->GetVirtualSize((int*)x, (int*)y);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_SetScale)(void* _obj, double xs, double ys)
+{
+	((wxScrolledWindow*)_obj)->SetScale(xs, ys);
+}
+	
+EWXWEXPORT(double, wxScrolledWindow_GetScaleX)(void* _obj)
+{
+	return ((wxScrolledWindow*)_obj)->GetScaleX();
+}
+	
+EWXWEXPORT(double, wxScrolledWindow_GetScaleY)(void* _obj)
+{
+	return ((wxScrolledWindow*)_obj)->GetScaleY();
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_CalcScrolledPosition)(void* _obj, int x, int y, void* xx, void* yy)
+{
+	((wxScrolledWindow*)_obj)->CalcScrolledPosition(x, y, (int*)xx, (int*)yy);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_CalcUnscrolledPosition)(void* _obj, int x, int y, void* xx, void* yy)
+{
+	((wxScrolledWindow*)_obj)->CalcUnscrolledPosition(x, y, (int*)xx, (int*)yy);
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_AdjustScrollbars)(void* _obj)
+{
+	((wxScrolledWindow*)_obj)->AdjustScrollbars();
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_OnDraw)(void* _obj, void* dc)
+{
+	((wxScrolledWindow*)_obj)->OnDraw(*((wxDC*)dc));
+}
+	
+EWXWEXPORT(void, wxScrolledWindow_PrepareDC)(void* _obj, void* dc)
+{
+	((wxScrolledWindow*)_obj)->PrepareDC(*((wxDC*)dc));
+}
+
+}
diff --git a/wxc/src/eljsingleinst.cpp b/wxc/src/eljsingleinst.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljsingleinst.cpp
@@ -0,0 +1,29 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+#include "wx/snglinst.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxSingleInstanceChecker_CreateDefault)()
+{
+	return (void*)new wxSingleInstanceChecker();
+}
+	
+EWXWEXPORT(int,wxSingleInstanceChecker_Create)(void* _obj, void* name, void* path)
+{
+	return (int)((wxSingleInstanceChecker*)_obj)->Create((wxChar*)name, (wxChar*)path);
+}
+	
+EWXWEXPORT(int,wxSingleInstanceChecker_IsAnotherRunning)(void* _obj)
+{
+	return (int)((wxSingleInstanceChecker*)_obj)->IsAnotherRunning();
+}
+	
+EWXWEXPORT(void,wxSingleInstanceChecker_Delete)(void* _obj)
+{
+	delete (wxSingleInstanceChecker*)_obj;
+}
+	
+}
+#endif
diff --git a/wxc/src/eljsizer.cpp b/wxc/src/eljsizer.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljsizer.cpp
@@ -0,0 +1,487 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxSizerItem_Create)(int width, int height, int option, int flag, int border, void* userData)
+{
+	return (void*) new wxSizerItem(width, height, option, flag, border, new ELJDataObject(userData));
+}
+	
+EWXWEXPORT(void*, wxSizerItem_CreateInWindow)(void* window, int option, int flag, int border, void* userData )
+{
+	return (void*) new wxSizerItem((wxWindow*)window, option, flag, border, new ELJDataObject(userData));
+}
+	
+EWXWEXPORT(void*, wxSizerItem_CreateInSizer)(void* sizer, int option, int flag, int border, void* userData )
+{
+	return (void*) new wxSizerItem((wxSizer*) sizer, option, flag, border, new ELJDataObject(userData));
+}
+	
+EWXWEXPORT(void, wxSizerItem_GetSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizerItem*)_obj)->GetSize();
+	(*(int*)_h) = res.GetHeight();
+	(*(int*)_w) = res.GetWidth();
+}
+	
+EWXWEXPORT(void, wxSizerItem_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizerItem*)_obj)->CalcMin();
+	(*(int*)_h) = res.GetHeight();
+	(*(int*)_w) = res.GetWidth();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetDimension)(void* _obj,  int _x, int _y, int _w, int _h)
+{
+	((wxSizerItem*)_obj)->SetDimension(wxPoint(_x, _y), wxSize(_w, _h));
+}
+	
+EWXWEXPORT(void, wxSizerItem_GetMinSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizerItem*)_obj)->GetMinSize();
+	(*(int*)_h) = res.GetHeight();
+	(*(int*)_w) = res.GetWidth();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetRatio)(void* _obj,  int width, int height)
+{
+	((wxSizerItem*)_obj)->SetRatio(width, height);
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetFloatRatio)(void* _obj,  float ratio)
+{
+	((wxSizerItem*)_obj)->SetRatio(ratio);
+}
+	
+EWXWEXPORT(float, wxSizerItem_GetRatio)(void* _obj)
+{
+	return ((wxSizerItem*)_obj)->GetRatio();
+}
+	
+EWXWEXPORT(int, wxSizerItem_IsWindow)(void* _obj)
+{
+	return (int)((wxSizerItem*)_obj)->IsWindow();
+}
+	
+EWXWEXPORT(int, wxSizerItem_IsSizer)(void* _obj)
+{
+	return (int)((wxSizerItem*)_obj)->IsSizer();
+}
+	
+EWXWEXPORT(int, wxSizerItem_IsSpacer)(void* _obj)
+{
+	return (int)((wxSizerItem*)_obj)->IsSpacer();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetInitSize)(void* _obj, int x, int y)
+{
+	((wxSizerItem*)_obj)->SetInitSize(x, y);
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetOption)(void* _obj, int option)
+{
+#if (wxVERSION_NUMBER <= 2600)
+	((wxSizerItem*)_obj)->SetOption(option);
+#else
+	((wxSizerItem*)_obj)->SetProportion(option);
+#endif
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetFlag)(void* _obj, int flag)
+{
+	((wxSizerItem*)_obj)->SetFlag(flag);
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetBorder)(void* _obj, int border)
+{
+	((wxSizerItem*)_obj)->SetBorder(border);
+}
+	
+EWXWEXPORT(void*, wxSizerItem_GetWindow)(void* _obj)
+{
+	return (void*)((wxSizerItem*)_obj)->GetWindow();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetWindow)(void* _obj, void* window)
+{
+	((wxSizerItem*)_obj)->SetWindow((wxWindow*) window);
+}
+	
+EWXWEXPORT(void*, wxSizerItem_GetSizer)(void* _obj)
+{
+	return (void*)((wxSizerItem*)_obj)->GetSizer();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetSizer)(void* _obj, void* sizer)
+{
+	((wxSizerItem*)_obj)->SetSizer((wxSizer*) sizer);
+}
+	
+EWXWEXPORT(int, wxSizerItem_GetOption)(void* _obj)
+{
+#if (wxVERSION_NUMBER < 2600)
+	return ((wxSizerItem*)_obj)->GetOption();
+#else
+	return ((wxSizerItem*)_obj)->GetProportion();
+#endif
+}
+	
+EWXWEXPORT(int, wxSizerItem_GetFlag)(void* _obj)
+{
+	return ((wxSizerItem*)_obj)->GetFlag();
+}
+	
+EWXWEXPORT(int, wxSizerItem_GetBorder)(void* _obj)
+{
+	return ((wxSizerItem*)_obj)->GetBorder();
+}
+	
+EWXWEXPORT(void*, wxSizerItem_GetUserData)(void* _obj)
+{
+	return ((ELJDataObject*)((wxSizerItem*)_obj)->GetUserData())->data;
+}
+	
+EWXWEXPORT(void, wxSizerItem_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	wxPoint res = ((wxSizerItem*)_obj)->GetPosition();
+	(*(int*)_x) = res.x;
+	(*(int*)_y) = res.y;
+}
+	
+EWXWEXPORT(void, wxSizer_AddWindow)(void* _obj, void* window, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Add((wxWindow*)window, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_AddSizer)(void* _obj, void* sizer, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Add((wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_Add)(void* _obj, int width, int height, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Add(width, height, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_InsertWindow)(void* _obj, int before, void* window, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Insert(before, (wxWindow*)window, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_InsertSizer)(void* _obj, int before, void* sizer, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Insert(before, (wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_Insert)(void* _obj, int before, int width, int height, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Insert(before, width, height, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_PrependWindow)(void* _obj, void* window, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Prepend((wxWindow*)window, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_PrependSizer)(void* _obj, void* sizer, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Prepend((wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_Prepend)(void* _obj, int width, int height, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Prepend(width, height, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(int, wxSizer_RemoveWindow)(void* _obj, void* window)
+{
+#if (wxVERSION_NUMBER < 2600)
+	return (int)((wxSizer*)_obj)->Remove((wxWindow*) window);
+#else
+	return (int)((wxSizer*)_obj)->Detach((wxWindow*) window);
+#endif
+}
+	
+EWXWEXPORT(int, wxSizer_RemoveSizer)(void* _obj, void* sizer)
+{
+	return (int)((wxSizer*)_obj)->Remove((wxSizer*) sizer);
+}
+	
+EWXWEXPORT(int, wxSizer_Remove)(void* _obj, int pos)
+{
+	return (int)((wxSizer*)_obj)->Remove(pos);
+}
+	
+EWXWEXPORT(void, wxSizer_SetMinSize)(void* _obj, int width, int height)
+{
+	((wxSizer*)_obj)->SetMinSize(width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_SetItemMinSizeWindow)(void* _obj, void* window, int width, int height)
+{
+	((wxSizer*)_obj)->SetItemMinSize((wxWindow*) window, width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_SetItemMinSizeSizer)(void* _obj, void* sizer, int width, int height)
+{
+	((wxSizer*)_obj)->SetItemMinSize((wxSizer*) sizer, width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_SetItemMinSize)(void* _obj, int pos, int width, int height )
+{
+	((wxSizer*)_obj)->SetItemMinSize(pos, width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_GetSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizer*)_obj)->GetSize();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxSizer_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	wxPoint res = ((wxSizer*)_obj)->GetPosition();
+	(*(int*)_x) = res.x;
+	(*(int*)_y) = res.y;
+}
+	
+EWXWEXPORT(void, wxSizer_GetMinSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizer*)_obj)->GetMinSize();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxSizer_RecalcSizes)(void* _obj)
+{
+	((wxSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxSizer_Layout)(void* _obj)
+{
+	((wxSizer*)_obj)->Layout();
+}
+	
+EWXWEXPORT(void, wxSizer_Fit)(void* _obj, void* window )
+{
+	((wxSizer*)_obj)->Fit((wxWindow*) window);
+}
+	
+EWXWEXPORT(void, wxSizer_SetSizeHints)(void* _obj, void* window )
+{
+	((wxSizer*)_obj)->SetSizeHints((wxWindow*) window);
+}
+	
+EWXWEXPORT(int, wxSizer_GetChildren)(void* _obj, void* _res, int _cnt)
+{
+	if (_res && (unsigned int)_cnt == ((wxSizer*)_obj)->GetChildren().GetCount())
+	{
+		int i = 0;
+#if (wxVERSION_NUMBER < 2600)
+		wxNode* node = NULL;
+		wxList list = ((wxSizer*)_obj)->GetChildren();
+	
+		
+		while ((node = list.Item(i++)))
+			((void**)_res)[i] = (void*)node->GetData();
+#else
+		wxSizerItemList::compatibility_iterator node = ((wxSizer*)_obj)->GetChildren().GetFirst();
+		while (node)
+		{
+			((void**)_res)[i] = node->GetData();
+			++i;
+		}
+#endif
+		return i;
+	}
+	else
+		return ((wxSizer*)_obj)->GetChildren().GetCount();
+}
+	
+EWXWEXPORT(void, wxSizer_SetDimension)(void* _obj, int x, int y, int width, int height)
+{
+	((wxSizer*)_obj)->SetDimension(x, y, width, height);
+}
+	
+EWXWEXPORT(void*, wxGridSizer_Create)(int rows, int cols, int vgap, int hgap)
+{
+	return (void*) new wxGridSizer(rows, cols, vgap, hgap);
+}
+	
+EWXWEXPORT(void, wxGridSizer_RecalcSizes)(void* _obj)
+{
+	((wxGridSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxGridSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxGridSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetCols)(void* _obj, int cols )
+{
+	((wxGridSizer*)_obj)->SetCols(cols);
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetRows)(void* _obj, int rows)
+{
+	((wxGridSizer*)_obj)->SetRows(rows);
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetVGap)(void* _obj, int gap)
+{
+	((wxGridSizer*)_obj)->SetVGap(gap);
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetHGap)(void* _obj, int gap)
+{
+	((wxGridSizer*)_obj)->SetHGap(gap);
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetCols)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetCols();
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetRows)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetRows();
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetVGap)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetVGap();
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetHGap)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetHGap();
+}
+	
+EWXWEXPORT(void*, wxFlexGridSizer_Create)(int rows, int cols, int vgap, int hgap)
+{
+	return new wxFlexGridSizer(rows, cols, vgap, hgap);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_RecalcSizes)(void* _obj)
+{
+	((wxFlexGridSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxFlexGridSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_AddGrowableRow)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->AddGrowableRow(idx);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_RemoveGrowableRow)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->RemoveGrowableRow(idx);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_AddGrowableCol)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->AddGrowableCol(idx);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_RemoveGrowableCol)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->RemoveGrowableCol(idx);
+}
+	
+EWXWEXPORT(void*, wxBoxSizer_Create)(int orient )
+{
+	return (void*) new wxBoxSizer(orient);
+}
+	
+EWXWEXPORT(void, wxBoxSizer_RecalcSizes)(void* _obj)
+{
+	((wxBoxSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxBoxSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxBoxSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(int, wxBoxSizer_GetOrientation)(void* _obj)
+{
+	return ((wxBoxSizer*)_obj)->GetOrientation();
+}
+	
+EWXWEXPORT(void*, wxStaticBoxSizer_Create)(void* box, int orient)
+{
+	return (void*) new wxStaticBoxSizer((wxStaticBox*) box, orient );
+}
+	
+EWXWEXPORT(void, wxStaticBoxSizer_RecalcSizes)(void* _obj)
+{
+	((wxStaticBoxSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxStaticBoxSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxStaticBoxSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void*, wxStaticBoxSizer_GetStaticBox)(void* _obj)
+{
+	return (void*)((wxStaticBoxSizer*)_obj)->GetStaticBox();
+}
+	
+EWXWEXPORT(void*, wxNotebookSizer_Create)(void* nb)
+{
+#if (wxVERSION_NUMBER < 2600)
+	return (void*) new wxNotebookSizer((wxNotebook*)nb);
+#else
+	return NULL;
+#endif
+}
+	
+EWXWEXPORT(void, wxNotebookSizer_RecalcSizes)(void* _obj)
+{
+#if (wxVERSION_NUMBER < 2600)
+	((wxNotebookSizer*)_obj)->RecalcSizes();
+#endif
+}
+	
+EWXWEXPORT(void, wxNotebookSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+#if (wxVERSION_NUMBER < 2600)
+	wxSize res = ((wxNotebookSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+#endif
+}
+	
+EWXWEXPORT(void*, wxNotebookSizer_GetNotebook)(void* _obj)
+{
+#if (wxVERSION_NUMBER < 2600)
+	return (void*)((wxNotebookSizer*)_obj)->GetNotebook();
+#else
+	return NULL;
+#endif
+}
+	
+}
diff --git a/wxc/src/eljslider.cpp b/wxc/src/eljslider.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljslider.cpp
@@ -0,0 +1,107 @@
+#include "wrapper.h"
+#include "wx/slider.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxSlider_Create) (void* _prt, int _id, int _init, int _min, int _max, int _lft, int _top, int _wdt, int _hgt, long _stl)
+{
+	return (void*) new wxSlider ((wxWindow*)_prt, _id, _init, _min, _max, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(int,wxSlider_GetValue)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetValue();
+}
+	
+EWXWEXPORT(void,wxSlider_SetValue)(void* _obj, int value)
+{
+	((wxSlider*)_obj)->SetValue(value);
+}
+	
+EWXWEXPORT(void,wxSlider_SetRange)(void* _obj, int minValue, int maxValue)
+{
+	((wxSlider*)_obj)->SetRange(minValue, maxValue);
+}
+	
+EWXWEXPORT(int,wxSlider_GetMin)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetMin();
+}
+	
+EWXWEXPORT(int,wxSlider_GetMax)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetMax();
+}
+	
+EWXWEXPORT(void,wxSlider_SetTickFreq)(void* _obj, int n, int pos)
+{
+	((wxSlider*)_obj)->SetTickFreq(n, pos);
+}
+	
+EWXWEXPORT(int,wxSlider_GetTickFreq)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetTickFreq();
+}
+	
+EWXWEXPORT(void,wxSlider_SetPageSize)(void* _obj, int pageSize)
+{
+	((wxSlider*)_obj)->SetPageSize(pageSize);
+}
+	
+EWXWEXPORT(int,wxSlider_GetPageSize)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetPageSize();
+}
+	
+EWXWEXPORT(void,wxSlider_ClearSel)(void* _obj)
+{
+	((wxSlider*)_obj)->ClearSel();
+}
+	
+EWXWEXPORT(void,wxSlider_ClearTicks)(void* _obj)
+{
+	((wxSlider*)_obj)->ClearTicks();
+}
+	
+EWXWEXPORT(void,wxSlider_SetLineSize)(void* _obj, int lineSize)
+{
+	((wxSlider*)_obj)->SetLineSize(lineSize);
+}
+	
+EWXWEXPORT(int,wxSlider_GetLineSize)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetLineSize();
+}
+	
+EWXWEXPORT(int,wxSlider_GetSelEnd)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetSelEnd();
+}
+	
+EWXWEXPORT(int,wxSlider_GetSelStart)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetSelStart();
+}
+	
+EWXWEXPORT(void,wxSlider_SetSelection)(void* _obj, int minPos, int maxPos)
+{
+	((wxSlider*)_obj)->SetSelection(minPos, maxPos);
+}
+	
+EWXWEXPORT(void,wxSlider_SetThumbLength)(void* _obj, int len)
+{
+	((wxSlider*)_obj)->SetThumbLength(len);
+}
+	
+EWXWEXPORT(int,wxSlider_GetThumbLength)(void* _obj)
+{
+	return ((wxSlider*)_obj)->GetThumbLength();
+}
+	
+EWXWEXPORT(void,wxSlider_SetTick)(void* _obj, int tickPos)
+{
+	((wxSlider*)_obj)->SetTick(tickPos);
+}
+	
+} 
diff --git a/wxc/src/eljspinctrl.cpp b/wxc/src/eljspinctrl.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljspinctrl.cpp
@@ -0,0 +1,66 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxSpinCtrl_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, long _stl, int _min, int _max, int _init)
+{
+	return (void*) new wxSpinCtrl ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, _min, _max, _init);
+}
+
+EWXWEXPORT(void, wxSpinCtrl_SetValue)(void* _obj, int val)
+{
+	((wxSpinCtrl*)_obj)->SetValue(val);
+}
+	
+EWXWEXPORT(int, wxSpinCtrl_GetValue)(void* _obj)
+{
+	return ((wxSpinCtrl*)_obj)->GetValue();
+}
+	
+EWXWEXPORT(void, wxSpinCtrl_SetRange)(void* _obj, int min_val, int max_val)
+{
+	((wxSpinCtrl*)_obj)->SetRange(min_val, max_val);
+}
+	
+EWXWEXPORT(int, wxSpinCtrl_GetMin)(void* _obj)
+{
+	return ((wxSpinCtrl*)_obj)->GetMin();
+}
+	
+EWXWEXPORT(int, wxSpinCtrl_GetMax)(void* _obj)
+{
+	return ((wxSpinCtrl*)_obj)->GetMax();
+}
+
+EWXWEXPORT(void*, wxSpinButton_Create)(void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, long _stl)
+{
+	return (void*) new wxSpinButton ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(int, wxSpinButton_GetValue)(void* _obj)
+{
+	return ((wxSpinButton*)_obj)->GetValue();
+}
+	
+EWXWEXPORT(int, wxSpinButton_GetMin)(void* _obj)
+{
+	return ((wxSpinButton*)_obj)->GetMin();
+}
+	
+EWXWEXPORT(int, wxSpinButton_GetMax)(void* _obj)
+{
+	return ((wxSpinButton*)_obj)->GetMax();
+}
+	
+EWXWEXPORT(void, wxSpinButton_SetValue)(void* _obj, int val)
+{
+	((wxSpinButton*)_obj)->SetValue(val);
+}
+	
+EWXWEXPORT(void, wxSpinButton_SetRange)(void* _obj, int minVal, int maxVal)
+{
+	((wxSpinButton*)_obj)->SetRange(minVal, maxVal);
+}
+	
+}
diff --git a/wxc/src/eljsplitterwindow.cpp b/wxc/src/eljsplitterwindow.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljsplitterwindow.cpp
@@ -0,0 +1,101 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxSplitterWindow_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxSplitterWindow ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void*, wxSplitterWindow_GetWindow1)(void* _obj)
+{
+	return (void*)((wxSplitterWindow*)_obj)->GetWindow1();
+}
+	
+EWXWEXPORT(void*, wxSplitterWindow_GetWindow2)(void* _obj)
+{
+	return (void*)((wxSplitterWindow*)_obj)->GetWindow2();
+}
+	
+EWXWEXPORT(void, wxSplitterWindow_SetSplitMode)(void* _obj, int mode)
+{
+	((wxSplitterWindow*)_obj)->SetSplitMode(mode);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_GetSplitMode)(void* _obj)
+{
+	return ((wxSplitterWindow*)_obj)->GetSplitMode();
+}
+	
+EWXWEXPORT(void, wxSplitterWindow_Initialize)(void* _obj, void* window)
+{
+	((wxSplitterWindow*)_obj)->Initialize((wxWindow*)window);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_SplitVertically)(void* _obj, void* window1, void* window2, int sashPosition)
+{
+	return (int)((wxSplitterWindow*)_obj)->SplitVertically((wxWindow*)window1, (wxWindow*)window2, sashPosition);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_SplitHorizontally)(void* _obj, void* window1, void* window2, int sashPosition)
+{
+	return (int)((wxSplitterWindow*)_obj)->SplitHorizontally((wxWindow*)window1, (wxWindow*)window2, sashPosition);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_Unsplit)(void* _obj, void* toRemove)
+{
+	return (int)((wxSplitterWindow*)_obj)->Unsplit((wxWindow*)toRemove);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_ReplaceWindow)(void* _obj, void* winOld, void* winNew)
+{
+	return (int)((wxSplitterWindow*)_obj)->ReplaceWindow((wxWindow*)winOld, (wxWindow*)winNew);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_IsSplit)(void* _obj)
+{
+	return (int)((wxSplitterWindow*)_obj)->IsSplit();
+}
+	
+EWXWEXPORT(void, wxSplitterWindow_SetSashSize)(void* _obj, int width)
+{
+	((wxSplitterWindow*)_obj)->SetSashSize(width);
+}
+	
+EWXWEXPORT(void, wxSplitterWindow_SetBorderSize)(void* _obj, int width)
+{
+	((wxSplitterWindow*)_obj)->SetBorderSize(width);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_GetSashSize)(void* _obj)
+{
+	return ((wxSplitterWindow*)_obj)->GetSashSize();
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_GetBorderSize)(void* _obj)
+{
+	return ((wxSplitterWindow*)_obj)->GetBorderSize();
+}
+	
+EWXWEXPORT(void, wxSplitterWindow_SetSashPosition)(void* _obj, int position, int redraw)
+{
+	((wxSplitterWindow*)_obj)->SetSashPosition(position, redraw != 0);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_GetSashPosition)(void* _obj)
+{
+	return ((wxSplitterWindow*)_obj)->GetSashPosition();
+}
+	
+EWXWEXPORT(void, wxSplitterWindow_SetMinimumPaneSize)(void* _obj, int min)
+{
+	((wxSplitterWindow*)_obj)->SetMinimumPaneSize(min);
+}
+	
+EWXWEXPORT(int, wxSplitterWindow_GetMinimumPaneSize)(void* _obj)
+{
+	return ((wxSplitterWindow*)_obj)->GetMinimumPaneSize();
+}
+	
+}
diff --git a/wxc/src/eljstaticbox.cpp b/wxc/src/eljstaticbox.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljstaticbox.cpp
@@ -0,0 +1,11 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxStaticBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxStaticBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+}
diff --git a/wxc/src/eljstaticline.cpp b/wxc/src/eljstaticline.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljstaticline.cpp
@@ -0,0 +1,21 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxStaticLine_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxStaticLine ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(int, wxStaticLine_IsVertical) (void* _obj)
+{
+	return (int)((wxStaticLine*)_obj)->IsVertical ();
+}
+	
+EWXWEXPORT(int, wxStaticLine_GetDefaultSize) (void* _obj)
+{
+	return ((wxStaticLine*)_obj)->GetDefaultSize ();
+}
+
+}
diff --git a/wxc/src/eljstatictext.cpp b/wxc/src/eljstatictext.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljstatictext.cpp
@@ -0,0 +1,11 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxStaticText_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxStaticText ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+}
diff --git a/wxc/src/eljstatusbar.cpp b/wxc/src/eljstatusbar.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljstatusbar.cpp
@@ -0,0 +1,63 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxStatusBar_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+#if wxVERSION_NUMBER >= 2400
+	return (void*) new wxStatusBar ((wxWindow*)_prt, _id, _stl);
+#else
+	return (void*) new wxStatusBar ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+#endif
+}
+
+EWXWEXPORT(void, wxStatusBar_SetFieldsCount)(void* _obj, int number, int* widths)
+{
+	((wxStatusBar*)_obj)->SetFieldsCount(number, widths);
+}
+	
+EWXWEXPORT(int, wxStatusBar_GetFieldsCount)(void* _obj)
+{
+	return ((wxStatusBar*)_obj)->GetFieldsCount();
+}
+	
+EWXWEXPORT(void, wxStatusBar_SetStatusText)(void* _obj, void* text, int number)
+{
+	((wxStatusBar*)_obj)->SetStatusText((wxChar*)text, number);
+}
+	
+EWXWEXPORT(int, wxStatusBar_GetStatusText)(void* _obj, int number, void* _buf)
+{
+	wxString result = ((wxStatusBar*)_obj)->GetStatusText(number);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxStatusBar_SetStatusWidths)(void* _obj, int n, int* widths)
+{
+	((wxStatusBar*)_obj)->SetStatusWidths(n, widths);
+}
+
+/*	
+EWXWEXPORT(int, wxStatusBar_GetFieldRect)(void* _obj, int i, wxRect& rect)
+{
+	return (int)((wxStatusBar*)_obj)->GetFieldRect(int i, wxRect& rect);
+}
+*/
+	
+EWXWEXPORT(void, wxStatusBar_SetMinHeight)(void* _obj, int height)
+{
+	((wxStatusBar*)_obj)->SetMinHeight(height);
+}
+	
+EWXWEXPORT(int, wxStatusBar_GetBorderX)(void* _obj)
+{
+	return ((wxStatusBar*)_obj)->GetBorderX();
+}
+	
+EWXWEXPORT(int, wxStatusBar_GetBorderY)(void* _obj)
+{
+	return ((wxStatusBar*)_obj)->GetBorderY();
+}
+	
+}
diff --git a/wxc/src/eljsystemsettings.cpp b/wxc/src/eljsystemsettings.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljsystemsettings.cpp
@@ -0,0 +1,21 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void, wxSystemSettings_GetSystemColour)(wxSystemColour index, void* _ref)
+{
+	*((wxColour*)_ref) = wxSystemSettings::GetColour(index);
+}
+
+EWXWEXPORT(void, wxSystemSettings_GetSystemFont)(wxSystemFont index, void* _ref)
+{
+	*((wxFont*)_ref) = wxSystemSettings::GetFont(index);
+}
+
+EWXWEXPORT(int, wxSystemSettings_GetSystemMetric)(wxSystemMetric index)
+{
+	return wxSystemSettings::GetMetric(index);
+}
+
+}
diff --git a/wxc/src/eljtextctrl.cpp b/wxc/src/eljtextctrl.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljtextctrl.cpp
@@ -0,0 +1,188 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxTextCtrl_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, long _stl)
+{
+	return (void*) new wxTextCtrl ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
+}
+
+EWXWEXPORT(int, wxTextCtrl_GetValue)(void* _obj, void* _buf)
+{
+	wxString result = ((wxTextCtrl*)_obj)->GetValue();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_SetValue)(void* _obj, wxChar* value)
+{
+	((wxTextCtrl*)_obj)->SetValue(value);
+}
+	
+EWXWEXPORT(int, wxTextCtrl_GetLineLength)(void* _obj, long lineNo)
+{
+	return ((wxTextCtrl*)_obj)->GetLineLength(lineNo);
+}
+	
+EWXWEXPORT(int, wxTextCtrl_GetLineText)(void* _obj, long lineNo, void* _buf)
+{
+	wxString result = ((wxTextCtrl*)_obj)->GetLineText(lineNo);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxTextCtrl_GetNumberOfLines)(void* _obj)
+{
+	return ((wxTextCtrl*)_obj)->GetNumberOfLines();
+}
+	
+EWXWEXPORT(int, wxTextCtrl_IsModified)(void* _obj)
+{
+	return (int)((wxTextCtrl*)_obj)->IsModified();
+}
+	
+EWXWEXPORT(int, wxTextCtrl_IsEditable)(void* _obj)
+{
+	return (int)((wxTextCtrl*)_obj)->IsEditable();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_GetSelection)(void* _obj, void* from, void* to)
+{
+	((wxTextCtrl*)_obj)->GetSelection((long*) from, (long*) to);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Clear)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->Clear();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Replace)(void* _obj, long from, long to, wxChar* value)
+{
+	((wxTextCtrl*)_obj)->Replace(from, to, value);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Remove)(void* _obj, long from, long to)
+{
+	((wxTextCtrl*)_obj)->Remove(from, to);
+}
+	
+EWXWEXPORT(int, wxTextCtrl_LoadFile)(void* _obj, wxChar* file)
+{
+	return (int)((wxTextCtrl*)_obj)->LoadFile(file);
+}
+	
+EWXWEXPORT(int, wxTextCtrl_SaveFile)(void* _obj, wxChar* file)
+{
+	return (int)((wxTextCtrl*)_obj)->SaveFile(file);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_DiscardEdits)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->DiscardEdits();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_WriteText)(void* _obj, wxChar* text)
+{
+	((wxTextCtrl*)_obj)->WriteText(text);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_AppendText)(void* _obj, wxChar* text)
+{
+	((wxTextCtrl*)_obj)->AppendText(text);
+}
+	
+EWXWEXPORT(long, wxTextCtrl_XYToPosition)(void* _obj, long x, long y)
+{
+	return ((wxTextCtrl*)_obj)->XYToPosition(x, y);
+}
+	
+EWXWEXPORT(int, wxTextCtrl_PositionToXY)(void* _obj, long pos, long *x, long *y)
+{
+	return (int)((wxTextCtrl*)_obj)->PositionToXY(pos, x, y);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_ShowPosition)(void* _obj, long pos)
+{
+	((wxTextCtrl*)_obj)->ShowPosition(pos);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Copy)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->Copy();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Cut)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->Cut();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Paste)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->Paste();
+}
+	
+EWXWEXPORT(int, wxTextCtrl_CanCopy)(void* _obj)
+{
+	return (int)((wxTextCtrl*)_obj)->CanCopy();
+}
+	
+EWXWEXPORT(int, wxTextCtrl_CanCut)(void* _obj)
+{
+	return (int)((wxTextCtrl*)_obj)->CanCut();
+}
+	
+EWXWEXPORT(int, wxTextCtrl_CanPaste)(void* _obj)
+{
+	return (int)((wxTextCtrl*)_obj)->CanPaste();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Undo)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->Undo();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_Redo)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->Redo();
+}
+	
+EWXWEXPORT(int, wxTextCtrl_CanUndo)(void* _obj)
+{
+	return (int)((wxTextCtrl*)_obj)->CanUndo();
+}
+	
+EWXWEXPORT(int, wxTextCtrl_CanRedo)(void* _obj)
+{
+	return (int)((wxTextCtrl*)_obj)->CanRedo();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_SetInsertionPoint)(void* _obj, long pos)
+{
+	((wxTextCtrl*)_obj)->SetInsertionPoint(pos);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_SetInsertionPointEnd)(void* _obj)
+{
+	((wxTextCtrl*)_obj)->SetInsertionPointEnd();
+}
+	
+EWXWEXPORT(long, wxTextCtrl_GetInsertionPoint)(void* _obj)
+{
+	return ((wxTextCtrl*)_obj)->GetInsertionPoint();
+}
+	
+EWXWEXPORT(long, wxTextCtrl_GetLastPosition)(void* _obj)
+{
+	return ((wxTextCtrl*)_obj)->GetLastPosition();
+}
+	
+EWXWEXPORT(void, wxTextCtrl_SetSelection)(void* _obj, long from, long to)
+{
+	((wxTextCtrl*)_obj)->SetSelection(from, to);
+}
+	
+EWXWEXPORT(void, wxTextCtrl_SetEditable)(void* _obj, int editable)
+{
+	((wxTextCtrl*)_obj)->SetEditable(editable != 0);
+}
+	
+}
diff --git a/wxc/src/eljtglbtn.cpp b/wxc/src/eljtglbtn.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljtglbtn.cpp
@@ -0,0 +1,39 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+#include "wx/tglbtn.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxToggleButton_Create)(void* parent, int id, void* label, int x, int y, int w, int h, int style)
+{
+	return (void*)new wxToggleButton((wxWindow*)parent, (wxWindowID)id, (wxChar*)label, wxPoint(x, y), wxSize(w, h), (long)style);
+}
+	
+EWXWEXPORT(void,wxToggleButton_SetValue)(void* _obj, int state)
+{
+	((wxToggleButton*)_obj)->SetValue(state != 0);
+}
+	
+EWXWEXPORT(int,wxToggleButton_GetValue)(void* _obj)
+{
+	return (int)((wxToggleButton*)_obj)->GetValue();
+}
+	
+EWXWEXPORT(void,wxToggleButton_SetLabel)(void* _obj, void* label)
+{
+	((wxToggleButton*)_obj)->SetLabel((wxChar*)label);
+}
+	
+EWXWEXPORT(int,wxToggleButton_Enable)(void* _obj, int enable)
+{
+	return (int)((wxToggleButton*)_obj)->Enable(enable != 0);
+}
+
+EWXWEXPORT(int,expEVT_COMMAND_TOGGLEBUTTON_CLICKED)()
+{
+	return wxEVT_COMMAND_TOGGLEBUTTON_CLICKED;
+}
+	
+}
+#endif
diff --git a/wxc/src/eljthread.cpp b/wxc/src/eljthread.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljthread.cpp
@@ -0,0 +1,110 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxCriticalSection_Create) ()
+{
+	return (void*) new wxCriticalSection ();
+}
+
+EWXWEXPORT(void, wxCriticalSection_Delete) (void* _obj)
+{
+	delete (wxCriticalSection*)_obj;
+}
+
+EWXWEXPORT(void, wxCriticalSection_Enter) (void* _obj)
+{
+	((wxCriticalSection*)_obj)->Enter();
+}
+
+EWXWEXPORT(void, wxCriticalSection_Leave) (void* _obj)
+{
+	((wxCriticalSection*)_obj)->Leave();
+}
+
+
+EWXWEXPORT(void*, wxMutex_Create) ()
+{
+	return (void*) new wxMutex ();
+}
+
+EWXWEXPORT(void, wxMutex_Delete) (void* _obj)
+{
+	delete (wxMutex*)_obj;
+}
+
+EWXWEXPORT(int, wxMutex_Lock) (void* _obj)
+{
+	return (int)((wxMutex*)_obj)->Lock();
+}
+
+EWXWEXPORT(int, wxMutex_TryLock) (void* _obj)
+{
+	return (int)((wxMutex*)_obj)->TryLock();
+}
+
+EWXWEXPORT(int, wxMutex_Unlock) (void* _obj)
+{
+	return (int)((wxMutex*)_obj)->Unlock();
+}
+
+EWXWEXPORT(int, wxMutex_IsLocked) (void* _obj)
+{
+#if wxVERSION_NUMBER >= 2400
+	return 0;
+#else
+	return (int)((wxMutex*)_obj)->IsLocked();
+#endif
+}
+
+EWXWEXPORT(void*, wxCondition_Create) (void* _mutex)
+{
+#if wxVERSION_NUMBER < 2400
+	return (void*) new wxCondition ();
+#else
+	return (void*) new wxCondition (*((wxMutex*)_mutex));
+#endif
+}
+
+EWXWEXPORT(void, wxCondition_Delete) (void* _obj)
+{
+	delete (wxCondition*)_obj;
+}
+
+EWXWEXPORT(void, wxCondition_Wait) (void* _obj)
+{
+	((wxCondition*)_obj)->Wait();
+}
+
+EWXWEXPORT(int, wxCondition_WaitFor) (void* _obj, int sec, int nsec)
+{
+#if wxVERSION_NUMBER >= 2400
+	return (int)((wxCondition*)_obj)->WaitTimeout((unsigned long)nsec);
+#else
+	return (int)((wxCondition*)_obj)->Wait((unsigned long)sec, (unsigned long)nsec);
+#endif
+}
+
+EWXWEXPORT(void, wxCondition_Signal) (void* _obj)
+{
+	((wxCondition*)_obj)->Signal();
+}
+
+EWXWEXPORT(void, wxCondition_Broadcast) (void* _obj)
+{
+	((wxCondition*)_obj)->Broadcast();
+}
+
+
+EWXWEXPORT(void, wxMutexGui_Enter) ()
+{
+	wxMutexGuiEnter();
+}
+
+EWXWEXPORT(void, wxMutexGui_Leave) ()
+{
+	wxMutexGuiLeave();
+}
+
+}
diff --git a/wxc/src/eljtimer.cpp b/wxc/src/eljtimer.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljtimer.cpp
@@ -0,0 +1,72 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxTimer_Create) (void* _prt, int _id)
+{
+	return (void*) new wxTimer ((wxEvtHandler*)_prt, _id);
+}
+
+EWXWEXPORT(void, wxTimer_Delete) (void* _obj)
+{
+	delete (wxTimer*)_obj;
+}
+
+EWXWEXPORT(int, wxTimer_Start) (void* _obj, int _int, int _one)
+{
+	return (int)((wxTimer*)_obj)->Start (_int, _one != 0);
+}
+
+EWXWEXPORT(void, wxTimer_Stop) (void* _obj)
+{
+	((wxTimer*)_obj)->Stop();
+}
+
+EWXWEXPORT(int, wxTimer_IsRuning) (void* _obj)
+{
+	return (int)((wxTimer*)_obj)->IsRunning();
+}
+
+EWXWEXPORT(int, wxTimer_IsOneShot) (void* _obj)
+{
+	return (int)((wxTimer*)_obj)->IsOneShot();
+}
+
+EWXWEXPORT(int, wxTimer_GetInterval) (void* _obj)
+{
+	return ((wxTimer*)_obj)->GetInterval();
+}
+
+
+EWXWEXPORT(void*,wxStopWatch_Create)()
+{
+	return (void*)new wxStopWatch();
+}
+	
+EWXWEXPORT(void,wxStopWatch_Delete)(void* _obj)
+{
+	delete (wxStopWatch*)_obj;
+}
+	
+EWXWEXPORT(void,wxStopWatch_Start)(void* _obj, int _t)
+{
+	((wxStopWatch*)_obj)->Start((long)_t);
+}
+	
+EWXWEXPORT(void,wxStopWatch_Pause)(void* _obj)
+{
+	((wxStopWatch*)_obj)->Pause();
+}
+	
+EWXWEXPORT(void,wxStopWatch_Resume)(void* _obj)
+{
+	((wxStopWatch*)_obj)->Resume();
+}
+	
+EWXWEXPORT(int,wxStopWatch_Time)(void* _obj)
+{
+	return (int)((wxStopWatch*)_obj)->Time();
+}
+	
+}
diff --git a/wxc/src/eljtipwnd.cpp b/wxc/src/eljtipwnd.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljtipwnd.cpp
@@ -0,0 +1,29 @@
+#include "wrapper.h"
+#if wxVERSION_NUMBER >= 2400
+#include "wx/tipwin.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*,wxTipWindow_Create)(void*parent, void* text, int maxLength)
+{
+	return (void*)new wxTipWindow((wxWindow*)parent, (wxChar*)text, (wxCoord)maxLength);
+}
+	
+EWXWEXPORT(void,wxTipWindow_SetTipWindowPtr)(void* _obj, void* windowPtr)
+{
+	((wxTipWindow*)_obj)->SetTipWindowPtr((wxTipWindow**)windowPtr);
+}
+	
+EWXWEXPORT(void,wxTipWindow_SetBoundingRect)(void* _obj, int x, int y, int w, int h)
+{
+	((wxTipWindow*)_obj)->SetBoundingRect(wxRect(x, y, w, h));
+}
+	
+EWXWEXPORT(void,wxTipWindow_Close)(void* _obj)
+{
+	((wxTipWindow*)_obj)->Close();
+}
+
+}
+#endif
diff --git a/wxc/src/eljtoolbar.cpp b/wxc/src/eljtoolbar.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljtoolbar.cpp
@@ -0,0 +1,170 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxToolBar_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new wxToolBar ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
+}
+
+EWXWEXPORT(void, wxToolBar_Delete) (void* _obj)
+{
+	delete (wxToolBar*)_obj;
+}
+
+EWXWEXPORT(int, wxToolBar_AddControl) (void* _obj, void* ctrl)
+{
+	return ((wxToolBar*)_obj)->AddControl ((wxControl*)ctrl) != NULL;
+}
+
+EWXWEXPORT(void, wxToolBar_AddSeparator) (void* _obj)
+{
+	((wxToolBar*)_obj)->AddSeparator ();
+}
+
+EWXWEXPORT(void, wxToolBar_AddTool) (void* _obj, int id, void* bmp, void* shelp, void* lhelp)
+{
+	((wxToolBar*)_obj)->AddTool (id, *(wxBitmap*)bmp, (wxChar*)shelp, (wxChar*)lhelp);
+}
+
+EWXWEXPORT(void, wxToolBar_AddToolEx) (void* _obj, int id, void* bmp1, void* bmp2, int tgl, int x, int y, void* dat, void* shelp, void* lhelp)
+{
+	((wxToolBar*)_obj)->AddTool (id, *(wxBitmap*)bmp1, *(wxBitmap*)bmp2, tgl != 0, x, y, (wxObject*)dat, (wxChar*)shelp, (wxChar*)lhelp);
+}
+
+EWXWEXPORT(int, wxToolBar_DeleteTool) (void* _obj, int id)
+{
+	return (int)((wxToolBar*)_obj)->DeleteTool (id);
+}
+
+EWXWEXPORT(int, wxToolBar_DeleteToolByPos) (void* _obj, int pos)
+{
+	return (int)((wxToolBar*)_obj)->DeleteToolByPos (pos);
+}
+
+EWXWEXPORT(void, wxToolBar_EnableTool) (void* _obj, int id, int enb)
+{
+	((wxToolBar*)_obj)->EnableTool (id, enb != 0);
+}
+
+EWXWEXPORT(void, wxToolBar_GetToolSize) (void* _obj, void* x, void* y)
+{
+	*((int*)x) = ((wxToolBar*)_obj)->GetToolSize().x;
+	*((int*)y) = ((wxToolBar*)_obj)->GetToolSize().y;
+}
+
+EWXWEXPORT(void, wxToolBar_GetToolBitmapSize) (void* _obj, void* x, void* y)
+{
+	*((int*)x) = ((wxToolBar*)_obj)->GetToolBitmapSize().x;
+	*((int*)y) = ((wxToolBar*)_obj)->GetToolBitmapSize().y;
+}
+
+EWXWEXPORT(void, wxToolBar_GetMargins) (void* _obj, void* x, void* y)
+{
+	*((int*)x) = ((wxToolBar*)_obj)->GetMargins().x;
+	*((int*)y) = ((wxToolBar*)_obj)->GetMargins().y;
+}
+
+EWXWEXPORT(void*, wxToolBar_GetToolClientData) (void* _obj, int id)
+{
+	return (void*)((wxToolBar*)_obj)->GetToolClientData (id);
+}
+
+EWXWEXPORT(int, wxToolBar_GetToolEnabled) (void* _obj, int id)
+{
+	return (int)((wxToolBar*)_obj)->GetToolEnabled (id);
+}
+
+EWXWEXPORT(int, wxToolBar_GetToolLongHelp) (void* _obj, int id, void* _buf)
+{
+	wxString result =((wxToolBar*)_obj)->GetToolLongHelp (id);
+	return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(int, wxToolBar_GetToolPacking) (void* _obj)
+{
+	return ((wxToolBar*)_obj)->GetToolPacking ();
+}
+
+EWXWEXPORT(int, wxToolBar_GetToolShortHelp) (void* _obj, int id, void* _buf)
+{
+	wxString result =((wxToolBar*)_obj)->GetToolShortHelp (id);
+	return copyStrToBuf(_buf, result);
+}
+
+EWXWEXPORT(int, wxToolBar_GetToolState) (void* _obj, int id)
+{
+	return (int)((wxToolBar*)_obj)->GetToolState (id);
+}
+
+EWXWEXPORT(void, wxToolBar_InsertControl) (void* _obj, int pos, void* ctrl)
+{
+	((wxToolBar*)_obj)->InsertControl ((size_t)pos, (wxControl*) ctrl);
+}
+
+EWXWEXPORT(void, wxToolBar_InsertSeparator) (void* _obj, int pos)
+{
+	((wxToolBar*)_obj)->InsertSeparator ((size_t)pos);
+}
+
+EWXWEXPORT(void, wxToolBar_InsertTool) (void* _obj, int pos, int id, void* bmp1, void* bmp2, int tgl, void* dat, void* shelp, void* lhelp)
+{
+	((wxToolBar*)_obj)->InsertTool ((size_t)pos, id, *(wxBitmap*)bmp1, *(wxBitmap*)bmp2, tgl != 0, (wxObject*)dat, (wxChar*)shelp, (wxChar*)lhelp);
+}
+
+EWXWEXPORT(int, wxToolBar_Realize) (void* _obj)
+{
+	return (int)((wxToolBar*)_obj)->Realize ();
+}
+
+EWXWEXPORT(void, wxToolBar_RemoveTool) (void* _obj, int id)
+{
+	((wxToolBar*)_obj)->RemoveTool (id);
+}
+
+EWXWEXPORT(void, wxToolBar_SetMargins) (void* _obj, int x, int y)
+{
+#ifdef __WIN32__
+	((wxToolBar*)_obj)->SetMargins(wxSize(x, y));
+#else
+	((wxToolBar*)_obj)->SetMargins(x, y);
+#endif
+}
+
+EWXWEXPORT(void, wxToolBar_SetToolBitmapSize) (void* _obj, int x, int y)
+{
+	((wxToolBar*)_obj)->SetToolBitmapSize (wxSize(x, y));
+}
+
+EWXWEXPORT(void, wxToolBar_SetToolClientData) (void* _obj, int id, void* dat)
+{
+	((wxToolBar*)_obj)->SetToolClientData (id, (wxObject*)dat);
+}
+
+EWXWEXPORT(void, wxToolBar_SetToolLongHelp) (void* _obj, int id, void* str)
+{
+	((wxToolBar*)_obj)->SetToolLongHelp (id, (wxChar*)str);
+}
+
+EWXWEXPORT(void, wxToolBar_SetToolPacking) (void* _obj, int val)
+{
+	((wxToolBar*)_obj)->SetToolPacking (val);
+}
+
+EWXWEXPORT(void, wxToolBar_SetToolShortHelp) (void* _obj, int id, void* str)
+{
+	((wxToolBar*)_obj)->SetToolShortHelp (id, (wxChar*)str);
+}
+
+EWXWEXPORT(void, wxToolBar_SetToolSeparation) (void* _obj, int val)
+{
+	((wxToolBar*)_obj)->SetToolSeparation (val);
+}
+
+EWXWEXPORT(void, wxToolBar_ToggleTool) (void* _obj, int id, int val)
+{
+	((wxToolBar*)_obj)->ToggleTool (id, val != 0);
+}
+
+}
diff --git a/wxc/src/eljtreectrl.cpp b/wxc/src/eljtreectrl.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljtreectrl.cpp
@@ -0,0 +1,391 @@
+#include "wrapper.h"
+
+class ELJTreeItemData : public wxTreeItemData
+{
+	public:
+		void* data;
+		ELJTreeItemData(void* _data) {data = _data;};
+};
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxTreeItemId_Create) ()
+{
+	return new wxTreeItemId();
+}
+
+EWXWEXPORT(void, wxTreeItemId_Delete) (void* _obj)
+{
+	delete (wxTreeItemId*)_obj;
+}
+
+EWXWEXPORT(int, wxTreeItemId_IsOk) (void* _obj)
+{
+	return (int)((wxTreeItemId*)_obj)->IsOk();
+}
+
+IMPLEMENT_DYNAMIC_CLASS(ELJTreeControl,wxTreeCtrl)
+
+
+EWXWEXPORT(void*, wxTreeCtrl_Create) (void* _obj, void* _cmp, void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
+{
+	return (void*) new ELJTreeControl (_obj, _cmp, (wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
+}
+
+EWXWEXPORT(int, wxTreeCtrl_GetCount)(void* _obj)
+{
+	int result =(int)((ELJTreeControl*)_obj)->GetCount();
+#ifdef __WXGTK__
+	wxTreeItemId t = ((ELJTreeControl*)_obj)->GetRootItem();
+	if (t.IsOk()) result++;
+#endif
+	return result;
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_GetIndent)(void* _obj)
+{
+	return ((ELJTreeControl*)_obj)->GetIndent();
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetIndent)(void* _obj, int indent)
+{
+	((ELJTreeControl*)_obj)->SetIndent(indent);
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_GetSpacing)(void* _obj)
+{
+	return (int)((ELJTreeControl*)_obj)->GetSpacing();
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetSpacing)(void* _obj, int spacing)
+{
+	((ELJTreeControl*)_obj)->SetSpacing(spacing);
+}
+	
+EWXWEXPORT(void*, wxTreeCtrl_GetImageList)(void* _obj)
+{
+	return (void*)((ELJTreeControl*)_obj)->GetImageList();
+}
+	
+EWXWEXPORT(void*, wxTreeCtrl_GetStateImageList)(void* _obj)
+{
+	return (void*)((ELJTreeControl*)_obj)->GetStateImageList();
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetImageList)(void* _obj, void* imageList)
+{
+	((ELJTreeControl*)_obj)->SetImageList((wxImageList*) imageList);
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetStateImageList)(void* _obj, void* imageList)
+{
+	((ELJTreeControl*)_obj)->SetStateImageList((wxImageList*) imageList);
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_GetItemText)(void* _obj, void* item, void* _buf)
+{
+	wxString result = ((ELJTreeControl*)_obj)->GetItemText(*(wxTreeItemId*)item);
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_GetItemImage)(void* _obj, void* item, int which)
+{
+	return ((ELJTreeControl*)_obj)->GetItemImage(*((wxTreeItemId*) item), (wxTreeItemIcon) which);
+}
+	
+EWXWEXPORT(void*, wxTreeCtrl_GetItemData)(void* _obj, void* item)
+{
+	return ((ELJTreeItemData*)((ELJTreeControl*)_obj)->GetItemData(*((wxTreeItemId*) item)))->data;
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemText)(void* _obj, void* item, void* text)
+{
+	((ELJTreeControl*)_obj)->SetItemText(*((wxTreeItemId*) item), (char*)text);
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemImage)(void* _obj, void* item, int image, int which)
+{
+	((ELJTreeControl*)_obj)->SetItemImage(*((wxTreeItemId*)item), image, (wxTreeItemIcon)which);
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemData)(void* _obj, void* item, void* data)
+{
+	((ELJTreeControl*)_obj)->SetItemData(*((wxTreeItemId*) item), new ELJTreeItemData (data));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemHasChildren)(void* _obj, void* item, int has)
+{
+	((ELJTreeControl*)_obj)->SetItemHasChildren(*((wxTreeItemId*)item), has != 0);
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemBold)(void* _obj, void* item, int bold)
+{
+	((ELJTreeControl*)_obj)->SetItemBold(*((wxTreeItemId*) item), bold != 0);
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemDropHighlight)(void* _obj, void* item, int highlight)
+{
+#ifdef __WIN32__
+	((ELJTreeControl*)_obj)->SetItemDropHighlight(*((wxTreeItemId*) item), highlight != 0);
+#endif
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemTextColour)(void* _obj, void* item, void* col)
+{
+	((ELJTreeControl*)_obj)->SetItemTextColour(*((wxTreeItemId*)item), *((wxColour*) col));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemBackgroundColour)(void* _obj, void* item, void* col)
+{
+	((ELJTreeControl*)_obj)->SetItemBackgroundColour(*((wxTreeItemId*) item), *((wxColour*) col));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SetItemFont)(void* _obj, void* item, void* font)
+{
+	((ELJTreeControl*)_obj)->SetItemFont(*((wxTreeItemId*) item), *((wxFont*) font));
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_IsVisible)(void* _obj, void* item)
+{
+	return (int)((ELJTreeControl*)_obj)->IsVisible(*((wxTreeItemId*) item));
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_ItemHasChildren)(void* _obj, void* item)
+{
+	return (int)((ELJTreeControl*)_obj)->ItemHasChildren(*((wxTreeItemId*) item));
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_IsExpanded)(void* _obj, void* item)
+{
+	return (int)((ELJTreeControl*)_obj)->IsExpanded(*((wxTreeItemId*) item));
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_IsSelected)(void* _obj, void* item)
+{
+	return (int)((ELJTreeControl*)_obj)->IsSelected(*((wxTreeItemId*) item));
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_IsBold)(void* _obj, void* item)
+{
+	return (int)((ELJTreeControl*)_obj)->IsBold(*((wxTreeItemId*) item));
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_GetChildrenCount)(void* _obj, void* item, int recursively)
+{
+	return ((ELJTreeControl*)_obj)->GetChildrenCount(*((wxTreeItemId*) item), recursively);
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetRootItem)(void* _obj, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetRootItem();
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetSelection)(void* _obj, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetSelection();
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_GetSelections)(void* _obj, void* selections)
+{
+	int result = 0;
+	wxArrayTreeItemIds sel;
+	result = ((ELJTreeControl*)_obj)->GetSelections(sel);
+	
+	if (selections)
+	{
+		for (int i = 0; i < result; i++)
+			*(((wxTreeItemId**)selections)[i]) = sel[i];
+	}
+	return result;		
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetParent)(void* _obj, void* item, void* _item)
+{
+#if wxVERSION_NUMBER < 2400
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetParent(*((wxTreeItemId*)item));
+#else
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetItemParent(*((wxTreeItemId*)item));
+#endif
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetFirstChild)(void* _obj, void* item, void* cookie, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetFirstChild(*((wxTreeItemId*)item), *((long*)cookie));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetNextChild)(void* _obj, void* item, void* cookie, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetNextChild(*((wxTreeItemId*)item), *((long*)cookie));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetLastChild)(void* _obj, void* item, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetLastChild(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetNextSibling)(void* _obj, void* item, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetNextSibling(*((wxTreeItemId*) item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetPrevSibling)(void* _obj, void* item, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetPrevSibling(*((wxTreeItemId*) item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetFirstVisibleItem)(void* _obj, void* item, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetFirstVisibleItem();
+}
+
+EWXWEXPORT(void, wxTreeCtrl_GetNextVisible)(void* _obj, void* item, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetNextVisible(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_GetPrevVisible)(void* _obj, void* item, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetPrevVisible(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_AddRoot)(void* _obj, void* text, int image, int selectedImage, void* data, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->AddRoot((char*) text, image, selectedImage, new ELJTreeItemData(data));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_PrependItem)(void* _obj, void* parent, void* text, int image, int selectedImage, void* data, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->PrependItem(*((wxTreeItemId*)parent), (char*)text, image, selectedImage, new ELJTreeItemData(data));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_InsertItem)(void* _obj, void* parent, void* idPrevious, void* text, int image, int selectedImage, void* data, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->InsertItem(*((wxTreeItemId*)parent), *((wxTreeItemId*)idPrevious), (char*)text, image, selectedImage, new ELJTreeItemData(data));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_InsertItemByIndex)(void* _obj, void* parent, int index, void* text, int image, int selectedImage, void* data, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->InsertItem(*((wxTreeItemId*)parent), index, (char*)text, image, selectedImage, new ELJTreeItemData(data));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_AppendItem)(void* _obj, void* parent, void* text, int image, int selectedImage, void* data, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->AppendItem(*((wxTreeItemId*) parent), (char*)text, image, selectedImage, new ELJTreeItemData(data));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_Delete)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->Delete(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_DeleteChildren)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->DeleteChildren(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_DeleteAllItems)(void* _obj)
+{
+	((ELJTreeControl*)_obj)->DeleteAllItems();
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_Expand)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->Expand(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_Collapse)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->Collapse(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_CollapseAndReset)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->CollapseAndReset(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_Toggle)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->Toggle(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_Unselect)(void* _obj)
+{
+	((ELJTreeControl*)_obj)->Unselect();
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_UnselectAll)(void* _obj)
+{
+	((ELJTreeControl*)_obj)->UnselectAll();
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SelectItem)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->SelectItem(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_EnsureVisible)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->EnsureVisible(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_ScrollTo)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->ScrollTo(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_EditLabel)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->EditLabel(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void*, wxTreeCtrl_GetEditControl)(void* _obj)
+{
+#ifdef __WIN32__
+	return (void*)((ELJTreeControl*)_obj)->GetEditControl();
+#else
+	return NULL;
+#endif
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_EndEditLabel)(void* _obj, void* item, int discardChanges)
+{
+#ifdef __WIN32__
+	((ELJTreeControl*)_obj)->EndEditLabel(*((wxTreeItemId*)item), discardChanges != 0);
+#endif
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_OnCompareItems)(void* _obj, void* item1, void* item2)
+{
+	return ((ELJTreeControl*)_obj)->OnCompareItems(*((wxTreeItemId*)item1), *((wxTreeItemId*)item2));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_SortChildren)(void* _obj, void* item)
+{
+	((ELJTreeControl*)_obj)->SortChildren(*((wxTreeItemId*)item));
+}
+	
+EWXWEXPORT(void, wxTreeCtrl_HitTest)(void* _obj, int _x, int _y, void* flags, void* _item)
+{
+	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->HitTest(wxPoint(_x, _y), *((int*)flags));
+}
+	
+EWXWEXPORT(int, wxTreeCtrl_GetBoundingRect)(void* _obj, void* item, int textOnly, void* _x, void* _y, void* _w, void* _h)
+{
+#ifdef __WIN32__
+	wxRect rct;
+	int result = ((ELJTreeControl*)_obj)->GetBoundingRect(*((wxTreeItemId*)item), rct, textOnly != 0);
+	if (result)
+	{
+		*((int*)_x) = rct.x;
+		*((int*)_y) = rct.y;
+		*((int*)_w) = rct.width;
+		*((int*)_h) = rct.height;
+	}
+	return result;
+#else
+	return 0;
+#endif
+}
+	
+}
diff --git a/wxc/src/eljvalidator.cpp b/wxc/src/eljvalidator.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljvalidator.cpp
@@ -0,0 +1,152 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxValidator_Create)()
+{
+	return (void*) new wxValidator();
+}
+
+EWXWEXPORT(void, wxValidator_Delete)(void* _obj)
+{
+	delete (wxValidator*)_obj;
+}
+
+EWXWEXPORT(int, wxValidator_Validate)(void* _obj, void* parent)
+{
+	return (int)((wxValidator*)_obj)->Validate((wxWindow*)parent);
+}
+	
+EWXWEXPORT(int, wxValidator_TransferToWindow)(void* _obj)
+{
+	return (int)((wxValidator*)_obj)->TransferToWindow();
+}
+	
+EWXWEXPORT(int, wxValidator_TransferFromWindow)(void* _obj)
+{
+	return (int)((wxValidator*)_obj)->TransferFromWindow();
+}
+	
+EWXWEXPORT(void*, wxValidator_GetWindow)(void* _obj)
+{
+	return (void*)((wxValidator*)_obj)->GetWindow();
+}
+	
+EWXWEXPORT(void, wxValidator_SetWindow)(void* _obj, void* win)
+{
+	((wxValidator*)_obj)->SetWindow((wxWindowBase*)win);
+}
+	
+EWXWEXPORT(int, wxValidator_IsSilent)()
+{
+	return (int)wxValidator::IsSilent();
+}
+	
+EWXWEXPORT(void, wxValidator_SetBellOnError)(int doIt)
+{
+	wxValidator::SetBellOnError(doIt != 0);
+}
+	
+EWXWEXPORT(void*, wxTextValidator_Create)(int style, void* val)
+{
+	return (void*) new wxTextValidator((long)style, new wxString);
+}
+
+EWXWEXPORT(int, wxTextValidator_GetStyle)(void* _obj)
+{
+	return (int)((wxTextValidator*)_obj)->GetStyle();
+}
+	
+EWXWEXPORT(void, wxTextValidator_SetStyle)(void* _obj, int style)
+{
+	((wxTextValidator*)_obj)->SetStyle((long) style);
+}
+	
+EWXWEXPORT(void, wxTextValidator_SetIncludeList)(void* _obj, void* list, int count)
+{
+#if (wxVERSION_NUMBER <= 2600)
+	wxStringList str;
+	
+	for (int i = 0; i < count; i++)
+		str.Add(((wxChar**)list)[i]);
+		
+	((wxTextValidator*)_obj)->SetIncludeList(str);
+#else
+	((wxTextValidator*)_obj)->SetIncludes((const wxArrayString&)list);
+#endif
+}
+	
+EWXWEXPORT(int, wxTextValidator_GetIncludeList)(void* _obj, void* _ref)
+{
+#if (wxVERSION_NUMBER <= 2600)
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < ((wxTextValidator*)_obj)->GetIncludeList().GetCount(); i++)
+			((const wxChar**)_ref)[i] = wxStrdup(((wxTextValidator*)_obj)->GetIncludeList().Item(i)->GetData());
+	}
+	return ((wxTextValidator*)_obj)->GetIncludeList().GetCount();
+#else
+	wxArrayString arr = ((wxTextValidator*)_obj)->GetIncludes();
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((const wxChar**)_ref)[i] = wxStrdup (arr.Item(i).c_str());
+	}
+	return arr.GetCount();
+#endif
+}
+	
+EWXWEXPORT(void, wxTextValidator_SetExcludeList)(void* _obj, void* list, int count)
+{
+#if (wxVERSION_NUMBER <= 2600)
+	wxStringList str;
+	
+	for (int i = 0; i < count; i++)
+		str.Add(((wxChar**)list)[i]);
+		
+	((wxTextValidator*)_obj)->SetExcludeList(str);
+#else
+	((wxTextValidator*)_obj)->SetExcludes((const wxArrayString&)list);
+#endif
+}
+	
+EWXWEXPORT(int, wxTextValidator_GetExcludeList)(void* _obj, void* _ref)
+{
+#if (wxVERSION_NUMBER <= 2600)
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < ((wxTextValidator*)_obj)->GetExcludeList().GetCount(); i++)
+			((const wxChar**)_ref)[i] = ((wxTextValidator*)_obj)->GetExcludeList().Item(i)->GetData();
+	}
+	return ((wxTextValidator*)_obj)->GetExcludeList().GetCount();
+#else
+	wxArrayString arr = ((wxTextValidator*)_obj)->GetExcludes();
+	if (_ref)
+	{
+		for (unsigned int i = 0; i < arr.GetCount(); i++)
+			((const wxChar**)_ref)[i] = wxStrdup (arr.Item(i).c_str());
+	}
+	return arr.GetCount();
+#endif
+}
+	
+EWXWEXPORT(void, wxTextValidator_OnChar)(void* _obj, void* event)
+{
+	((wxTextValidator*)_obj)->OnChar(*((wxKeyEvent*)event));
+}
+
+EWXWEXPORT(void*, ELJTextValidator_Create) (void* _obj, void* _fnc, void* _txt, long _stl)
+{
+	return new ELJTextValidator(_obj, _fnc, _txt, _stl);
+}
+
+}
+
+bool ELJTextValidator::Validate(wxWindow* _prt)
+{
+	if (obj && fnc)
+		return fnc(obj) != 0;
+	else
+		return wxTextValidator::Validate(_prt);
+}
diff --git a/wxc/src/eljwindow.cpp b/wxc/src/eljwindow.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljwindow.cpp
@@ -0,0 +1,681 @@
+#include "wrapper.h"
+#include "wx/tooltip.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxWindow_Create)(void* _prt, int _id, int _x, int _y, int _w, int _h, int _stl)
+{
+	return (void*)new wxWindow((wxWindow*)_prt, (wxWindowID)_id, wxPoint(_x, _y), wxSize(_w, _h), (long)_stl);
+}
+	
+EWXWEXPORT(int, wxWindow_Close)(void* _obj, int _force)
+{
+	return (int)((wxWindow*)_obj)->Close(_force != 0);
+}
+	
+EWXWEXPORT(int, wxWindow_Destroy)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->Destroy();
+}
+	
+EWXWEXPORT(void, wxWindow_Clear)(void* _obj)
+{
+#if wxCHECK_VERSION(2,5,0)
+        ((wxWindow*)_obj)->ClearBackground();
+#else
+	((wxWindow*)_obj)->Clear();
+#endif
+}
+	
+EWXWEXPORT(void, wxWindow_Fit)(void* _obj)
+{
+	((wxWindow*)_obj)->Fit();
+}
+	
+EWXWEXPORT(int, wxWindow_DestroyChildren)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->DestroyChildren();
+}
+	
+EWXWEXPORT(int, wxWindow_IsBeingDeleted)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->IsBeingDeleted();
+}
+	
+EWXWEXPORT(void, wxWindow_SetLabel)(void* _obj, wxChar* _title)
+{
+	((wxWindow*)_obj)->SetLabel(_title);
+}
+	
+EWXWEXPORT(int, wxWindow_GetLabel)(void* _obj, void* _buf)
+{
+	wxString result = ((wxWindow*)_obj)->GetLabel().c_str();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(int, wxWindow_GetLabelEmpty)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->GetLabel().IsEmpty();
+}
+	
+EWXWEXPORT(void, wxWindow_SetName)(void* _obj, wxChar* _name)
+{
+	((wxWindow*)_obj)->SetName(_name);
+}
+	
+EWXWEXPORT(int, wxWindow_GetName)(void* _obj, void* _buf)
+{
+	wxString result =((wxWindow*)_obj)->GetName();
+	return copyStrToBuf(_buf, result);
+}
+	
+EWXWEXPORT(void, wxWindow_SetId)(void* _obj, int _id)
+{
+	((wxWindow*)_obj)->SetId(_id);
+}
+	
+EWXWEXPORT(int, wxWindow_GetId)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->GetId();
+}
+	
+EWXWEXPORT(void, wxWindow_SetSize)(void* _obj,  int x, int y, int width, int height, int sizeFlags)
+{
+	((wxWindow*)_obj)->SetSize(x, y, width, height, sizeFlags);
+}
+	
+EWXWEXPORT(void, wxWindow_Move)(void* _obj,  int x, int y )
+{
+	((wxWindow*)_obj)->Move( x, y );
+}
+	
+EWXWEXPORT(void, wxWindow_Raise)(void* _obj)
+{
+	((wxWindow*)_obj)->Raise();
+}
+	
+EWXWEXPORT(void, wxWindow_Lower)(void* _obj)
+{
+	((wxWindow*)_obj)->Lower();
+}
+	
+EWXWEXPORT(void, wxWindow_SetClientSize)(void* _obj, int width, int height )
+{
+	((wxWindow*)_obj)->SetClientSize( width, height );
+}
+	
+EWXWEXPORT(void, wxWindow_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	((wxWindow*)_obj)->GetPosition((int*)_x, (int*)_y);
+}
+	
+EWXWEXPORT(void, wxWindow_GetSize)(void* _obj, void* _w, void* _h)
+{
+	((wxWindow*)_obj)->GetSize((int*)_w, (int*)_h);
+}
+	
+EWXWEXPORT(void, wxWindow_GetRect)(void* _obj, int* x, int* y, int* w, int* h)
+{
+	wxRect rc = ((wxWindow*)_obj)->GetRect();
+	*x = rc.x;
+	*y = rc.y;
+	*w = rc.width;
+	*h = rc.height;
+}
+	
+EWXWEXPORT(void, wxWindow_GetClientSize)(void* _obj, void* _w, void* _h)
+{
+	((wxWindow*)_obj)->GetClientSize((int*)_w, (int*)_h);
+}
+	
+EWXWEXPORT(void, wxWindow_GetBestSize)(void* _obj, void* _w, void* _h)
+{
+	((wxWindow*)_obj)->GetBestSize((int*)_w, (int*)_h);
+}
+	
+EWXWEXPORT(void, wxWindow_Center)(void* _obj, int direction)
+{
+	((wxWindow*)_obj)->Center( direction );
+}
+	
+EWXWEXPORT(void, wxWindow_CenterOnParent)(void* _obj, int dir)
+{
+	((wxWindow*)_obj)->CenterOnParent(dir);
+}
+	
+EWXWEXPORT(void, wxWindow_SetSizeHints)(void* _obj, int minW, int minH,int maxW, int maxH, int incW, int incH)
+{
+	((wxWindow*)_obj)->SetSizeHints( minW, minH, maxW, maxH, incW, incH );
+}
+	
+EWXWEXPORT(int, wxWindow_GetMinWidth)(void* _obj)
+{
+	return ((wxWindow*)_obj)->GetMinWidth();
+}
+	
+EWXWEXPORT(int, wxWindow_GetMinHeight)(void* _obj)
+{
+	return ((wxWindow*)_obj)->GetMinHeight();
+}
+	
+EWXWEXPORT(int, wxWindow_GetMaxWidth)(void* _obj)
+{
+	return ((wxWindow*)_obj)->GetMaxWidth();
+}
+
+EWXWEXPORT(int, wxWindow_GetMaxHeight)(void* _obj)
+{
+	return ((wxWindow*)_obj)->GetMaxHeight();
+}
+	
+EWXWEXPORT(int, wxWindow_Show)(void* _obj)
+{
+	return ((wxWindow*)_obj)->Show();
+}
+	
+EWXWEXPORT(int, wxWindow_Hide)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->Hide();
+}
+	
+EWXWEXPORT(int, wxWindow_Enable)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->Enable();
+}
+
+EWXWEXPORT(int, wxWindow_Disable)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->Disable();
+}
+	
+EWXWEXPORT(int, wxWindow_IsShown)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->IsShown();
+}
+	
+EWXWEXPORT(int, wxWindow_IsEnabled)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->IsEnabled();
+}
+	
+EWXWEXPORT(void, wxWindow_SetWindowStyleFlag)(void* _obj, long style)
+{
+	((wxWindow*)_obj)->SetWindowStyleFlag( style );
+}
+	
+EWXWEXPORT(int, wxWindow_GetWindowStyleFlag)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->GetWindowStyleFlag();
+}
+	
+EWXWEXPORT(int, wxWindow_HasFlag)(void* _obj, int flag)
+{
+	return (int)((wxWindow*)_obj)->HasFlag(flag);
+}
+	
+EWXWEXPORT(void, wxWindow_SetExtraStyle)(void* _obj, long exStyle)
+{
+	((wxWindow*)_obj)->SetExtraStyle(exStyle);
+}
+	
+EWXWEXPORT(void, wxWindow_MakeModal)(void* _obj, int modal)
+{
+	((wxWindow*)_obj)->MakeModal(modal != 0);
+}
+	
+EWXWEXPORT(void, wxWindow_SetFocus)(void* _obj)
+{
+	((wxWindow*)_obj)->SetFocus();
+}
+	
+EWXWEXPORT(void*, wxWindow_FindFocus)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->FindFocus();
+}
+	
+EWXWEXPORT(int, wxWindow_GetChildren)(void* _obj, void* _res, int _cnt)
+{
+	if (_res && (unsigned int)_cnt == ((wxWindow*)_obj)->GetChildren().GetCount())
+	{
+		unsigned int i = 0;
+		wxWindowListNode* node = ((wxWindow*)_obj)->GetChildren().GetFirst();
+	
+		while (node)
+		{
+			((void**)_res)[i++] = (void*)(node->GetData());
+			node = node->GetNext();
+		}
+
+		return i;
+	}
+	else
+		return ((wxWindow*)_obj)->GetChildren().GetCount();
+}
+	
+EWXWEXPORT(void*, wxWindow_GetParent)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetParent();
+}
+	
+EWXWEXPORT(int, wxWindow_IsTopLevel)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->IsTopLevel();
+}
+	
+EWXWEXPORT(void*, wxWindow_FindWindow)(void* _obj, wxChar* name )
+{
+	return (void*)((wxWindow*)_obj)->FindWindow( name );
+}
+	
+EWXWEXPORT(void, wxWindow_AddChild)(void* _obj, void* child )
+{
+	((wxWindow*)_obj)->AddChild( (wxWindowBase*) child );
+}
+	
+EWXWEXPORT(void, wxWindow_RemoveChild)(void* _obj, void* child )
+{
+	((wxWindow*)_obj)->RemoveChild( (wxWindowBase*) child );
+}
+	
+EWXWEXPORT(void*, wxWindow_GetEventHandler)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetEventHandler();
+}
+	
+EWXWEXPORT(void, wxWindow_PushEventHandler)(void* _obj, void* handler )
+{
+	((wxWindow*)_obj)->PushEventHandler( (wxEvtHandler*) handler );
+}
+	
+EWXWEXPORT(void*, wxWindow_PopEventHandler)(void* _obj, int deleteHandler)
+{
+	return (void*)((wxWindow*)_obj)->PopEventHandler(deleteHandler != 0);
+}
+	
+EWXWEXPORT(void, wxWindow_SetValidator)(void* _obj, void* validator )
+{
+	((wxWindow*)_obj)->SetValidator(*((wxValidator*)validator));
+}
+	
+EWXWEXPORT(void*, wxWindow_GetValidator)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetValidator();
+}
+	
+EWXWEXPORT(void, wxWindow_SetClientData)(void* _obj, void *data )
+{
+	((wxWindow*)_obj)->SetClientData( data );
+}
+	
+EWXWEXPORT(void*, wxWindow_GetClientData)(void* _obj)
+{
+	return (void*) ((wxWindow*)_obj)->GetClientData();
+}
+	
+EWXWEXPORT(int, wxWindow_Validate)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->Validate();
+}
+	
+EWXWEXPORT(int, wxWindow_TransferDataToWindow)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->TransferDataToWindow();
+}
+	
+EWXWEXPORT(int, wxWindow_TransferDataFromWindow)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->TransferDataFromWindow();
+}
+	
+EWXWEXPORT(void, wxWindow_InitDialog)(void* _obj)
+{
+	((wxWindow*)_obj)->InitDialog();
+}
+	
+EWXWEXPORT(void, wxWindow_SetAcceleratorTable)(void* _obj, void* accel )
+{
+	((wxWindow*)_obj)->SetAcceleratorTable(*((wxAcceleratorTable*) accel));
+}
+	
+EWXWEXPORT(void, wxWindow_ConvertPixelsToDialog)(void* _obj, int* x, int* y)
+{
+	wxPoint pt = ((wxWindow*)_obj)->ConvertPixelsToDialog(wxPoint(*x, *y));
+	*x = pt.x;
+	*y = pt.y;
+}
+	
+EWXWEXPORT(void, wxWindow_ConvertDialogToPixels)(void* _obj, int* x, int* y)
+{
+	wxPoint pt = ((wxWindow*)_obj)->ConvertDialogToPixels(wxPoint(*x, *y));
+	*x = pt.x;
+	*y = pt.y;
+}
+	
+EWXWEXPORT(void, wxWindow_WarpPointer)(void* _obj, int x, int y)
+{
+	((wxWindow*)_obj)->WarpPointer(x, y);
+}
+	
+EWXWEXPORT(void, wxWindow_CaptureMouse)(void* _obj)
+{
+	((wxWindow*)_obj)->CaptureMouse();
+}
+	
+EWXWEXPORT(void, wxWindow_ReleaseMouse)(void* _obj)
+{
+	((wxWindow*)_obj)->ReleaseMouse();
+}
+	
+EWXWEXPORT(void, wxWindow_Refresh)(void* _obj, int eraseBackground)
+{
+	((wxWindow*)_obj)->Refresh(eraseBackground != 0, (const wxRect*) NULL);
+}
+	
+EWXWEXPORT(void, wxWindow_RefreshRect)(void* _obj, int eraseBackground, int x, int y, int w, int h)
+{
+	const wxRect rect(x, y, w, h);
+	((wxWindow*)_obj)->Refresh(eraseBackground != 0, &rect);
+}
+	
+EWXWEXPORT(void, wxWindow_PrepareDC)(void* _obj, void* dc)
+{
+	((wxWindow*)_obj)->PrepareDC(*((wxDC*)dc));
+}
+	
+EWXWEXPORT(void*, wxWindow_GetUpdateRegion)(void* _obj)
+{
+	return (void*) (&((wxWindow*)_obj)->GetUpdateRegion());
+}
+	
+EWXWEXPORT(int, wxWindow_IsExposed)(void* _obj,  int x, int y, int w, int h )
+{
+	return (int)((wxWindow*)_obj)->IsExposed( x, y, w, h );
+}
+	
+EWXWEXPORT(int, wxWindow_SetBackgroundColour)(void* _obj, void* colour)
+{
+	return (int)((wxWindow*)_obj)->SetBackgroundColour(*((wxColour*) colour));
+}
+	
+EWXWEXPORT(int, wxWindow_SetForegroundColour)(void* _obj, void* colour)
+{
+	return (int)((wxWindow*)_obj)->SetForegroundColour(*((wxColour*) colour));
+}
+	
+EWXWEXPORT(void, wxWindow_GetBackgroundColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxWindow*)_obj)->GetBackgroundColour();
+}
+	
+EWXWEXPORT(void, wxWindow_GetForegroundColour)(void* _obj, void* colour)
+{
+	*((wxColour*)colour) = ((wxWindow*)_obj)->GetForegroundColour();
+}
+	
+EWXWEXPORT(int, wxWindow_SetCursor)(void* _obj, void* cursor)
+{
+	return (int)((wxWindow*)_obj)->SetCursor(*((wxCursor*) cursor));
+}
+	
+EWXWEXPORT(void*, wxWindow_GetCursor)(void* _obj)
+{
+	return (void*) (&((wxWindow*)_obj)->GetCursor());
+}
+	
+EWXWEXPORT(int, wxWindow_SetFont)(void* _obj,  void* font)
+{
+	return (int)((wxWindow*)_obj)->SetFont( *((wxFont*)font) );
+}
+	
+EWXWEXPORT(void, wxWindow_GetFont)(void* _obj, void* _font)
+{
+	(*(wxFont*)_font) = ((wxWindow*)_obj)->GetFont();
+}
+	
+EWXWEXPORT(void, wxWindow_SetCaret)(void* _obj, void* caret)
+{
+	((wxWindow*)_obj)->SetCaret((wxCaret*)caret);
+}
+	
+EWXWEXPORT(void*, wxWindow_GetCaret)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetCaret();
+}
+	
+EWXWEXPORT(int, wxWindow_GetCharHeight)(void* _obj)
+{
+	return ((wxWindow*)_obj)->GetCharHeight();
+}
+	
+EWXWEXPORT(int, wxWindow_GetCharWidth)(void* _obj)
+{
+	return ((wxWindow*)_obj)->GetCharWidth();
+}
+	
+EWXWEXPORT(void, wxWindow_GetTextExtent)(void* _obj, wxChar* string, int* x, int* y, int* descent, int* externalLeading, void* theFont)
+{
+	((wxWindow*)_obj)->GetTextExtent(string, x,  y, descent, externalLeading, (const wxFont*) theFont );
+}
+	
+EWXWEXPORT(void, wxWindow_ScreenToClient)(void* _obj, int *x, int *y)
+{
+	((wxWindow*)_obj)->ScreenToClient(x, y);
+}
+	
+EWXWEXPORT(void, wxWindow_UpdateWindowUI)(void* _obj)
+{
+	((wxWindow*)_obj)->UpdateWindowUI();
+}
+	
+EWXWEXPORT(int, wxWindow_PopupMenu)(void* _obj, void* menu, int x, int y )
+{
+	return (int)((wxWindow*)_obj)->PopupMenu((wxMenu*) menu, x, y );
+}
+	
+EWXWEXPORT(void, wxWindow_SetScrollPos)(void* _obj, int orient, int pos, int refresh)
+{
+	((wxWindow*)_obj)->SetScrollPos( orient, pos, refresh != 0);
+}
+	
+EWXWEXPORT(int, wxWindow_GetScrollPos)(void* _obj, int orient )
+{
+	return ((wxWindow*)_obj)->GetScrollPos( orient );
+}
+	
+EWXWEXPORT(int, wxWindow_GetScrollThumb)(void* _obj, int orient )
+{
+	return ((wxWindow*)_obj)->GetScrollThumb( orient );
+}
+	
+EWXWEXPORT(int, wxWindow_GetScrollRange)(void* _obj, int orient )
+{
+	return ((wxWindow*)_obj)->GetScrollRange( orient );
+}
+	
+EWXWEXPORT(void, wxWindow_ScrollWindow)(void* _obj, int dx, int dy)
+{
+	((wxWindow*)_obj)->ScrollWindow(dx, dy, (const wxRect*) NULL);
+}
+	
+EWXWEXPORT(void, wxWindow_ScrollWindowRect)(void* _obj, int dx, int dy, int x, int y, int w, int h)
+{
+	const wxRect rect(x, y, w, h);
+	((wxWindow*)_obj)->ScrollWindow(dx, dy, &rect);
+}
+	
+EWXWEXPORT(void, wxWindow_SetToolTip)(void* _obj, wxChar* tip )
+{
+	((wxWindow*)_obj)->SetToolTip( tip );
+}
+	
+EWXWEXPORT(int, wxWindow_GetToolTip)(void* _obj, void* _buf)
+{
+	wxToolTip* tip = ((wxWindow*)_obj)->GetToolTip();
+
+	if (tip)
+	{
+                wxString res = tip->GetTip();
+		return copyStrToBuf(_buf, res);
+	}
+	return 0;
+}
+	
+EWXWEXPORT(void, wxWindow_SetDropTarget)(void* _obj, void* dropTarget )
+{
+	((wxWindow*)_obj)->SetDropTarget((wxDropTarget*) dropTarget);
+}
+	
+EWXWEXPORT(void*, wxWindow_GetDropTarget)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetDropTarget();
+}
+	
+EWXWEXPORT(void, wxWindow_SetConstraints)(void* _obj, void* constraints )
+{
+	((wxWindow*)_obj)->SetConstraints((wxLayoutConstraints*) constraints);
+}
+	
+EWXWEXPORT(void*, wxWindow_GetConstraints)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetConstraints();
+}
+	
+EWXWEXPORT(void, wxWindow_SetAutoLayout)(void* _obj, int autoLayout )
+{
+	((wxWindow*)_obj)->SetAutoLayout( autoLayout != 0 );
+}
+	
+EWXWEXPORT(int, wxWindow_GetAutoLayout)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->GetAutoLayout();
+}
+	
+EWXWEXPORT(int, wxWindow_Layout)(void* _obj)
+{
+	return (int)((wxWindow*)_obj)->Layout();
+}
+	
+EWXWEXPORT(void, wxWindow_UnsetConstraints)(void* _obj, void* c)
+{
+	((wxWindow*)_obj)->UnsetConstraints((wxLayoutConstraints*) c);
+}
+	
+EWXWEXPORT(void*, wxWindow_GetConstraintsInvolvedIn)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetConstraintsInvolvedIn();
+}
+	
+EWXWEXPORT(void, wxWindow_AddConstraintReference)(void* _obj, void* otherWin)
+{
+	((wxWindow*)_obj)->AddConstraintReference((wxWindowBase*) otherWin);
+}
+	
+EWXWEXPORT(void, wxWindow_RemoveConstraintReference)(void* _obj, void* otherWin)
+{
+	((wxWindow*)_obj)->RemoveConstraintReference((wxWindowBase*) otherWin);
+}
+	
+EWXWEXPORT(void, wxWindow_DeleteRelatedConstraints)(void* _obj)
+{
+	((wxWindow*)_obj)->DeleteRelatedConstraints();
+}
+	
+EWXWEXPORT(void, wxWindow_ResetConstraints)(void* _obj)
+{
+	((wxWindow*)_obj)->ResetConstraints();
+}
+	
+EWXWEXPORT(void, wxWindow_SetConstraintSizes)(void* _obj, int recurse)
+{
+	((wxWindow*)_obj)->SetConstraintSizes(recurse != 0);
+}
+	
+EWXWEXPORT(int, wxWindow_LayoutPhase1)(void* _obj, int *noChanges)
+{
+	return (int)((wxWindow*)_obj)->LayoutPhase1(noChanges);
+}
+	
+EWXWEXPORT(int, wxWindow_LayoutPhase2)(void* _obj, int *noChanges)
+{
+	return (int)((wxWindow*)_obj)->LayoutPhase2(noChanges);
+}
+	
+EWXWEXPORT(int, wxWindow_DoPhase)(void* _obj, int phase)
+{
+	return (int)((wxWindow*)_obj)->DoPhase(phase);
+}
+	
+EWXWEXPORT(void, wxWindow_SetSizeConstraint)(void* _obj, int x, int y, int w, int h)
+{
+	((wxWindow*)_obj)->SetSizeConstraint(x, y, w, h);
+}
+	
+EWXWEXPORT(void, wxWindow_MoveConstraint)(void* _obj, int x, int y)
+{
+	((wxWindow*)_obj)->MoveConstraint(x, y);
+}
+	
+EWXWEXPORT(void, wxWindow_GetSizeConstraint)(void* _obj, int *w, int *h)
+{
+	((wxWindow*)_obj)->GetSizeConstraint(w, h);
+}
+	
+EWXWEXPORT(void, wxWindow_GetClientSizeConstraint)(void* _obj, int *w, int *h)
+{
+	((wxWindow*)_obj)->GetClientSizeConstraint(w, h);
+}
+	
+EWXWEXPORT(void, wxWindow_GetPositionConstraint)(void* _obj, int *x, int *y)
+{
+	((wxWindow*)_obj)->GetPositionConstraint(x, y);
+}
+	
+EWXWEXPORT(void, wxWindow_SetSizer)(void* _obj, void* sizer )
+{
+	((wxWindow*)_obj)->SetSizer( (wxSizer*) sizer );
+}
+	
+EWXWEXPORT(void*, wxWindow_GetSizer)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetSizer();
+}
+	
+EWXWEXPORT(void*, wxWindow_GetHandle)(void* _obj)
+{
+	return (void*)((wxWindow*)_obj)->GetHandle();
+}
+	
+EWXWEXPORT(void, wxWindow_SetScrollbar)(void* _obj, int orient, int pos, int thumbVisible, int range, int refresh)
+{
+    ((wxWindow*)_obj)->SetScrollbar(orient, pos, thumbVisible, range, refresh != 0);
+}
+
+EWXWEXPORT(int, wxWindow_Reparent)(void* _obj, void* _par)
+{
+	return (int)((wxWindow*)_obj)->Reparent((wxWindow*)_par);
+}
+
+EWXWEXPORT(void, wxWindow_GetAdjustedBestSize)(void* _obj, void* _w, void* _h)
+{
+#if (wxVERSION_NUMBER < 2800)
+	wxSize sz = ((wxWindow*)_obj)->GetAdjustedBestSize();
+#else
+	wxSize sz = ((wxWindow*)_obj)->GetEffectiveMinSize();
+#endif
+        *((int*)_w) = sz.GetWidth();
+        *((int*)_h) = sz.GetHeight();
+}
+
+EWXWEXPORT(void, wxWindow_Freeze)(void* _obj)
+{
+	((wxWindow*)_obj)->Freeze();
+}
+
+EWXWEXPORT(void, wxWindow_Thaw)(void* _obj)
+{
+	((wxWindow*)_obj)->Thaw();
+}
+
+	
+}
diff --git a/wxc/src/eljwizard.cpp b/wxc/src/eljwizard.cpp
new file mode 100644
--- /dev/null
+++ b/wxc/src/eljwizard.cpp
@@ -0,0 +1,79 @@
+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxWizard_Create) (void* _prt, int _id, void* _txt, void* _bmp, int _lft, int _top, int _wdt, int _hgt)
+{
+	wxBitmap bmp = wxNullBitmap;
+	if (_bmp) bmp = *((wxBitmap*)_bmp);
+#if wxVERSION_NUMBER >= 2400
+	return (void*) new wxWizard ((wxWindow*)_prt, _id, (wxChar*)_txt, bmp, wxPoint(_lft, _top));
+#else
+	return (void*) wxWizard::Create ((wxWindow*)_prt, _id, (wxChar*)_txt, bmp, wxPoint(_lft, _top), wxSize(_wdt, _hgt));
+#endif
+}
+
+EWXWEXPORT(int, wxWizard_RunWizard)(void* _obj, void* firstPage)
+{
+	return (int)((wxWizard*)_obj)->RunWizard((wxWizardPage*)firstPage);
+}
+	
+EWXWEXPORT(void*, wxWizard_GetCurrentPage)(void* _obj)
+{
+	return (void*)((wxWizard*)_obj)->GetCurrentPage();
+}
+	
+EWXWEXPORT(void, wxWizard_Chain)(void* f, void* s)
+{
+	wxWizardPageSimple::Chain((wxWizardPageSimple*)f, (wxWizardPageSimple*)s);
+}
+	
+EWXWEXPORT(void, wxWizard_SetPageSize)(void* _obj, int w, int h)
+{
+	((wxWizard*)_obj)->SetPageSize(wxSize(w, h));
+}
+	
+EWXWEXPORT(void, wxWizard_GetPageSize)(void* _obj, void* w, void* h)
+{
+	wxSize tmp = ((wxWizard*)_obj)->GetPageSize();
+	*((int*)w) = tmp.x;
+	*((int*)h) = tmp.y;
+}
+	
+EWXWEXPORT(void*, wxWizardPageSimple_Create) (void* _prt)
+{
+	return (void*)new wxWizardPageSimple ((wxWizard*)_prt);
+}
+
+EWXWEXPORT(void*, wxWizardPageSimple_GetPrev)(void* _obj)
+{
+	return (void*)((wxWizardPageSimple*)_obj)->GetPrev();
+}
+	
+EWXWEXPORT(void*, wxWizardPageSimple_GetNext)(void* _obj)
+{
+	return (void*)((wxWizardPageSimple*)_obj)->GetNext();
+}
+	
+EWXWEXPORT(void, wxWizardPageSimple_GetBitmap)(void* _obj, void* _ref)
+{
+	*((wxBitmap*)_ref) = ((wxWizardPageSimple*)_obj)->GetBitmap();
+}
+	
+EWXWEXPORT(void, wxWizardPageSimple_SetPrev)(void* _obj, void* prev)
+{
+	((wxWizardPageSimple*)_obj)->SetPrev((wxWizardPage*)prev);
+}
+	
+EWXWEXPORT(void, wxWizardPageSimple_SetNext)(void* _obj, void* next)
+{
+	((wxWizardPageSimple*)_obj)->SetNext((wxWizardPage*)next);
+}
+
+EWXWEXPORT(int, wxWizardEvent_GetDirection)(void* _obj)
+{
+	return (int)((wxWizardEvent*)_obj)->GetDirection();
+}
+	
+}
diff --git a/wxc/src/ewxw/Scintilla.h b/wxc/src/ewxw/Scintilla.h
deleted file mode 100644
--- a/wxc/src/ewxw/Scintilla.h
+++ /dev/null
@@ -1,619 +0,0 @@
-// Scintilla source code edit control
-/** @file Scintilla.h
- ** Interface to the edit control.
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-// Most of this file is automatically generated from the Scintilla.iface interface definition
-// file which contains any comments about the definitions. HFacer.py does the generation.
-
-#ifndef SCINTILLA_H
-#define SCINTILLA_H
-
-#if PLAT_WIN
-// Return false on failure:
-bool Scintilla_RegisterClasses(void *hInstance);
-bool Scintilla_ReleaseResources();
-#endif
-int Scintilla_LinkLexers();
-
-// Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
-// hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
-// May need to be changed for 64 bit platforms.
-#ifdef __int3264
-typedef ULONG_PTR uptr_t;
-typedef LONG_PTR sptr_t;
-#else
-typedef unsigned long uptr_t;
-typedef long sptr_t;
-#endif
-
-typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-
-//++Autogenerated -- start of section automatically generated from Scintilla.iface
-#define INVALID_POSITION -1
-#define SCI_START 2000
-#define SCI_OPTIONAL_START 3000
-#define SCI_LEXER_START 4000
-#define SCI_ADDTEXT 2001
-#define SCI_ADDSTYLEDTEXT 2002
-#define SCI_INSERTTEXT 2003
-#define SCI_CLEARALL 2004
-#define SCI_CLEARDOCUMENTSTYLE 2005
-#define SCI_GETLENGTH 2006
-#define SCI_GETCHARAT 2007
-#define SCI_GETCURRENTPOS 2008
-#define SCI_GETANCHOR 2009
-#define SCI_GETSTYLEAT 2010
-#define SCI_REDO 2011
-#define SCI_SETUNDOCOLLECTION 2012
-#define SCI_SELECTALL 2013
-#define SCI_SETSAVEPOINT 2014
-#define SCI_GETSTYLEDTEXT 2015
-#define SCI_CANREDO 2016
-#define SCI_MARKERLINEFROMHANDLE 2017
-#define SCI_MARKERDELETEHANDLE 2018
-#define SCI_GETUNDOCOLLECTION 2019
-#define SCWS_INVISIBLE 0
-#define SCWS_VISIBLEALWAYS 1
-#define SCWS_VISIBLEAFTERINDENT 2
-#define SCI_GETVIEWWS 2020
-#define SCI_SETVIEWWS 2021
-#define SCI_POSITIONFROMPOINT 2022
-#define SCI_POSITIONFROMPOINTCLOSE 2023
-#define SCI_GOTOLINE 2024
-#define SCI_GOTOPOS 2025
-#define SCI_SETANCHOR 2026
-#define SCI_GETCURLINE 2027
-#define SCI_GETENDSTYLED 2028
-#define SC_EOL_CRLF 0
-#define SC_EOL_CR 1
-#define SC_EOL_LF 2
-#define SCI_CONVERTEOLS 2029
-#define SCI_GETEOLMODE 2030
-#define SCI_SETEOLMODE 2031
-#define SCI_STARTSTYLING 2032
-#define SCI_SETSTYLING 2033
-#define SCI_GETBUFFEREDDRAW 2034
-#define SCI_SETBUFFEREDDRAW 2035
-#define SCI_SETTABWIDTH 2036
-#define SCI_GETTABWIDTH 2121
-#define SC_CP_UTF8 65001
-#define SCI_SETCODEPAGE 2037
-#define SCI_SETUSEPALETTE 2039
-#define MARKER_MAX 31
-#define SC_MARK_CIRCLE 0
-#define SC_MARK_ROUNDRECT 1
-#define SC_MARK_ARROW 2
-#define SC_MARK_SMALLRECT 3
-#define SC_MARK_SHORTARROW 4
-#define SC_MARK_EMPTY 5
-#define SC_MARK_ARROWDOWN 6
-#define SC_MARK_MINUS 7
-#define SC_MARK_PLUS 8
-#define SC_MARK_VLINE 9
-#define SC_MARK_LCORNER 10
-#define SC_MARK_TCORNER 11
-#define SC_MARK_BOXPLUS 12
-#define SC_MARK_BOXPLUSCONNECTED 13
-#define SC_MARK_BOXMINUS 14
-#define SC_MARK_BOXMINUSCONNECTED 15
-#define SC_MARK_LCORNERCURVE 16
-#define SC_MARK_TCORNERCURVE 17
-#define SC_MARK_CIRCLEPLUS 18
-#define SC_MARK_CIRCLEPLUSCONNECTED 19
-#define SC_MARK_CIRCLEMINUS 20
-#define SC_MARK_CIRCLEMINUSCONNECTED 21
-#define SC_MARK_BACKGROUND 22
-#define SC_MARK_CHARACTER 10000
-#define SC_MARKNUM_FOLDEREND 25
-#define SC_MARKNUM_FOLDEROPENMID 26
-#define SC_MARKNUM_FOLDERMIDTAIL 27
-#define SC_MARKNUM_FOLDERTAIL 28
-#define SC_MARKNUM_FOLDERSUB 29
-#define SC_MARKNUM_FOLDER 30
-#define SC_MARKNUM_FOLDEROPEN 31
-#define SC_MASK_FOLDERS 0xFE000000
-#define SCI_MARKERDEFINE 2040
-#define SCI_MARKERSETFORE 2041
-#define SCI_MARKERSETBACK 2042
-#define SCI_MARKERADD 2043
-#define SCI_MARKERDELETE 2044
-#define SCI_MARKERDELETEALL 2045
-#define SCI_MARKERGET 2046
-#define SCI_MARKERNEXT 2047
-#define SCI_MARKERPREVIOUS 2048
-#define SC_MARGIN_SYMBOL 0
-#define SC_MARGIN_NUMBER 1
-#define SCI_SETMARGINTYPEN 2240
-#define SCI_GETMARGINTYPEN 2241
-#define SCI_SETMARGINWIDTHN 2242
-#define SCI_GETMARGINWIDTHN 2243
-#define SCI_SETMARGINMASKN 2244
-#define SCI_GETMARGINMASKN 2245
-#define SCI_SETMARGINSENSITIVEN 2246
-#define SCI_GETMARGINSENSITIVEN 2247
-#define STYLE_DEFAULT 32
-#define STYLE_LINENUMBER 33
-#define STYLE_BRACELIGHT 34
-#define STYLE_BRACEBAD 35
-#define STYLE_CONTROLCHAR 36
-#define STYLE_INDENTGUIDE 37
-#define STYLE_LASTPREDEFINED 39
-#define STYLE_MAX 127
-#define SC_CHARSET_ANSI 0
-#define SC_CHARSET_DEFAULT 1
-#define SC_CHARSET_BALTIC 186
-#define SC_CHARSET_CHINESEBIG5 136
-#define SC_CHARSET_EASTEUROPE 238
-#define SC_CHARSET_GB2312 134
-#define SC_CHARSET_GREEK 161
-#define SC_CHARSET_HANGUL 129
-#define SC_CHARSET_MAC 77
-#define SC_CHARSET_OEM 255
-#define SC_CHARSET_RUSSIAN 204
-#define SC_CHARSET_SHIFTJIS 128
-#define SC_CHARSET_SYMBOL 2
-#define SC_CHARSET_TURKISH 162
-#define SC_CHARSET_JOHAB 130
-#define SC_CHARSET_HEBREW 177
-#define SC_CHARSET_ARABIC 178
-#define SC_CHARSET_VIETNAMESE 163
-#define SC_CHARSET_THAI 222
-#define SCI_STYLECLEARALL 2050
-#define SCI_STYLESETFORE 2051
-#define SCI_STYLESETBACK 2052
-#define SCI_STYLESETBOLD 2053
-#define SCI_STYLESETITALIC 2054
-#define SCI_STYLESETSIZE 2055
-#define SCI_STYLESETFONT 2056
-#define SCI_STYLESETEOLFILLED 2057
-#define SCI_STYLERESETDEFAULT 2058
-#define SCI_STYLESETUNDERLINE 2059
-#define SC_CASE_MIXED 0
-#define SC_CASE_UPPER 1
-#define SC_CASE_LOWER 2
-#define SCI_STYLESETCASE 2060
-#define SCI_STYLESETCHARACTERSET 2066
-#define SCI_SETSELFORE 2067
-#define SCI_SETSELBACK 2068
-#define SCI_SETCARETFORE 2069
-#define SCI_ASSIGNCMDKEY 2070
-#define SCI_CLEARCMDKEY 2071
-#define SCI_CLEARALLCMDKEYS 2072
-#define SCI_SETSTYLINGEX 2073
-#define SCI_STYLESETVISIBLE 2074
-#define SCI_GETCARETPERIOD 2075
-#define SCI_SETCARETPERIOD 2076
-#define SCI_SETWORDCHARS 2077
-#define SCI_BEGINUNDOACTION 2078
-#define SCI_ENDUNDOACTION 2079
-#define INDIC_MAX 7
-#define INDIC_PLAIN 0
-#define INDIC_SQUIGGLE 1
-#define INDIC_TT 2
-#define INDIC_DIAGONAL 3
-#define INDIC_STRIKE 4
-#define INDIC0_MASK 0x20
-#define INDIC1_MASK 0x40
-#define INDIC2_MASK 0x80
-#define INDICS_MASK 0xE0
-#define SCI_INDICSETSTYLE 2080
-#define SCI_INDICGETSTYLE 2081
-#define SCI_INDICSETFORE 2082
-#define SCI_INDICGETFORE 2083
-#define SCI_SETSTYLEBITS 2090
-#define SCI_GETSTYLEBITS 2091
-#define SCI_SETLINESTATE 2092
-#define SCI_GETLINESTATE 2093
-#define SCI_GETMAXLINESTATE 2094
-#define SCI_GETCARETLINEVISIBLE 2095
-#define SCI_SETCARETLINEVISIBLE 2096
-#define SCI_GETCARETLINEBACK 2097
-#define SCI_SETCARETLINEBACK 2098
-#define SCI_STYLESETCHANGEABLE 2099
-#define SCI_AUTOCSHOW 2100
-#define SCI_AUTOCCANCEL 2101
-#define SCI_AUTOCACTIVE 2102
-#define SCI_AUTOCPOSSTART 2103
-#define SCI_AUTOCCOMPLETE 2104
-#define SCI_AUTOCSTOPS 2105
-#define SCI_AUTOCSETSEPARATOR 2106
-#define SCI_AUTOCGETSEPARATOR 2107
-#define SCI_AUTOCSELECT 2108
-#define SCI_AUTOCSETCANCELATSTART 2110
-#define SCI_AUTOCGETCANCELATSTART 2111
-#define SCI_AUTOCSETFILLUPS 2112
-#define SCI_AUTOCSETCHOOSESINGLE 2113
-#define SCI_AUTOCGETCHOOSESINGLE 2114
-#define SCI_AUTOCSETIGNORECASE 2115
-#define SCI_AUTOCGETIGNORECASE 2116
-#define SCI_USERLISTSHOW 2117
-#define SCI_AUTOCSETAUTOHIDE 2118
-#define SCI_AUTOCGETAUTOHIDE 2119
-#define SCI_AUTOCSETDROPRESTOFWORD 2270
-#define SCI_AUTOCGETDROPRESTOFWORD 2271
-#define SCI_SETINDENT 2122
-#define SCI_GETINDENT 2123
-#define SCI_SETUSETABS 2124
-#define SCI_GETUSETABS 2125
-#define SCI_SETLINEINDENTATION 2126
-#define SCI_GETLINEINDENTATION 2127
-#define SCI_GETLINEINDENTPOSITION 2128
-#define SCI_GETCOLUMN 2129
-#define SCI_SETHSCROLLBAR 2130
-#define SCI_GETHSCROLLBAR 2131
-#define SCI_SETINDENTATIONGUIDES 2132
-#define SCI_GETINDENTATIONGUIDES 2133
-#define SCI_SETHIGHLIGHTGUIDE 2134
-#define SCI_GETHIGHLIGHTGUIDE 2135
-#define SCI_GETLINEENDPOSITION 2136
-#define SCI_GETCODEPAGE 2137
-#define SCI_GETCARETFORE 2138
-#define SCI_GETUSEPALETTE 2139
-#define SCI_GETREADONLY 2140
-#define SCI_SETCURRENTPOS 2141
-#define SCI_SETSELECTIONSTART 2142
-#define SCI_GETSELECTIONSTART 2143
-#define SCI_SETSELECTIONEND 2144
-#define SCI_GETSELECTIONEND 2145
-#define SCI_SETPRINTMAGNIFICATION 2146
-#define SCI_GETPRINTMAGNIFICATION 2147
-#define SC_PRINT_NORMAL 0
-#define SC_PRINT_INVERTLIGHT 1
-#define SC_PRINT_BLACKONWHITE 2
-#define SC_PRINT_COLOURONWHITE 3
-#define SC_PRINT_COLOURONWHITEDEFAULTBG 4
-#define SCI_SETPRINTCOLOURMODE 2148
-#define SCI_GETPRINTCOLOURMODE 2149
-#define SCFIND_WHOLEWORD 2
-#define SCFIND_MATCHCASE 4
-#define SCFIND_WORDSTART 0x00100000
-#define SCFIND_REGEXP 0x00200000
-#define SCI_FINDTEXT 2150
-#define SCI_FORMATRANGE 2151
-#define SCI_GETFIRSTVISIBLELINE 2152
-#define SCI_GETLINE 2153
-#define SCI_GETLINECOUNT 2154
-#define SCI_SETMARGINLEFT 2155
-#define SCI_GETMARGINLEFT 2156
-#define SCI_SETMARGINRIGHT 2157
-#define SCI_GETMARGINRIGHT 2158
-#define SCI_GETMODIFY 2159
-#define SCI_SETSEL 2160
-#define SCI_GETSELTEXT 2161
-#define SCI_GETTEXTRANGE 2162
-#define SCI_HIDESELECTION 2163
-#define SCI_POINTXFROMPOSITION 2164
-#define SCI_POINTYFROMPOSITION 2165
-#define SCI_LINEFROMPOSITION 2166
-#define SCI_POSITIONFROMLINE 2167
-#define SCI_LINESCROLL 2168
-#define SCI_SCROLLCARET 2169
-#define SCI_REPLACESEL 2170
-#define SCI_SETREADONLY 2171
-#define SCI_NULL 2172
-#define SCI_CANPASTE 2173
-#define SCI_CANUNDO 2174
-#define SCI_EMPTYUNDOBUFFER 2175
-#define SCI_UNDO 2176
-#define SCI_CUT 2177
-#define SCI_COPY 2178
-#define SCI_PASTE 2179
-#define SCI_CLEAR 2180
-#define SCI_SETTEXT 2181
-#define SCI_GETTEXT 2182
-#define SCI_GETTEXTLENGTH 2183
-#define SCI_GETDIRECTFUNCTION 2184
-#define SCI_GETDIRECTPOINTER 2185
-#define SCI_SETOVERTYPE 2186
-#define SCI_GETOVERTYPE 2187
-#define SCI_SETCARETWIDTH 2188
-#define SCI_GETCARETWIDTH 2189
-#define SCI_SETTARGETSTART 2190
-#define SCI_GETTARGETSTART 2191
-#define SCI_SETTARGETEND 2192
-#define SCI_GETTARGETEND 2193
-#define SCI_REPLACETARGET 2194
-#define SCI_REPLACETARGETRE 2195
-#define SCI_SEARCHINTARGET 2197
-#define SCI_SETSEARCHFLAGS 2198
-#define SCI_GETSEARCHFLAGS 2199
-#define SCI_CALLTIPSHOW 2200
-#define SCI_CALLTIPCANCEL 2201
-#define SCI_CALLTIPACTIVE 2202
-#define SCI_CALLTIPPOSSTART 2203
-#define SCI_CALLTIPSETHLT 2204
-#define SCI_CALLTIPSETBACK 2205
-#define SCI_VISIBLEFROMDOCLINE 2220
-#define SCI_DOCLINEFROMVISIBLE 2221
-#define SC_FOLDLEVELBASE 0x400
-#define SC_FOLDLEVELWHITEFLAG 0x1000
-#define SC_FOLDLEVELHEADERFLAG 0x2000
-#define SC_FOLDLEVELNUMBERMASK 0x0FFF
-#define SCI_SETFOLDLEVEL 2222
-#define SCI_GETFOLDLEVEL 2223
-#define SCI_GETLASTCHILD 2224
-#define SCI_GETFOLDPARENT 2225
-#define SCI_SHOWLINES 2226
-#define SCI_HIDELINES 2227
-#define SCI_GETLINEVISIBLE 2228
-#define SCI_SETFOLDEXPANDED 2229
-#define SCI_GETFOLDEXPANDED 2230
-#define SCI_TOGGLEFOLD 2231
-#define SCI_ENSUREVISIBLE 2232
-#define SCI_SETFOLDFLAGS 2233
-#define SCI_ENSUREVISIBLEENFORCEPOLICY 2234
-#define SCI_SETTABINDENTS 2260
-#define SCI_GETTABINDENTS 2261
-#define SCI_SETBACKSPACEUNINDENTS 2262
-#define SCI_GETBACKSPACEUNINDENTS 2263
-#define SC_TIME_FOREVER 10000000
-#define SCI_SETMOUSEDWELLTIME 2264
-#define SCI_GETMOUSEDWELLTIME 2265
-#define SCI_WORDSTARTPOSITION 2266
-#define SCI_WORDENDPOSITION 2267
-#define SC_WRAP_NONE 0
-#define SC_WRAP_WORD 1
-#define SCI_SETWRAPMODE 2268
-#define SCI_GETWRAPMODE 2269
-#define SC_CACHE_NONE 0
-#define SC_CACHE_CARET 1
-#define SC_CACHE_PAGE 2
-#define SC_CACHE_DOCUMENT 3
-#define SCI_SETLAYOUTCACHE 2272
-#define SCI_GETLAYOUTCACHE 2273
-#define SCI_SETSCROLLWIDTH 2274
-#define SCI_GETSCROLLWIDTH 2275
-#define SCI_TEXTWIDTH 2276
-#define SCI_SETENDATLASTLINE 2277
-#define SCI_GETENDATLASTLINE 2278
-#define SCI_LINEDOWN 2300
-#define SCI_LINEDOWNEXTEND 2301
-#define SCI_LINEUP 2302
-#define SCI_LINEUPEXTEND 2303
-#define SCI_CHARLEFT 2304
-#define SCI_CHARLEFTEXTEND 2305
-#define SCI_CHARRIGHT 2306
-#define SCI_CHARRIGHTEXTEND 2307
-#define SCI_WORDLEFT 2308
-#define SCI_WORDLEFTEXTEND 2309
-#define SCI_WORDRIGHT 2310
-#define SCI_WORDRIGHTEXTEND 2311
-#define SCI_HOME 2312
-#define SCI_HOMEEXTEND 2313
-#define SCI_LINEEND 2314
-#define SCI_LINEENDEXTEND 2315
-#define SCI_DOCUMENTSTART 2316
-#define SCI_DOCUMENTSTARTEXTEND 2317
-#define SCI_DOCUMENTEND 2318
-#define SCI_DOCUMENTENDEXTEND 2319
-#define SCI_PAGEUP 2320
-#define SCI_PAGEUPEXTEND 2321
-#define SCI_PAGEDOWN 2322
-#define SCI_PAGEDOWNEXTEND 2323
-#define SCI_EDITTOGGLEOVERTYPE 2324
-#define SCI_CANCEL 2325
-#define SCI_DELETEBACK 2326
-#define SCI_TAB 2327
-#define SCI_BACKTAB 2328
-#define SCI_NEWLINE 2329
-#define SCI_FORMFEED 2330
-#define SCI_VCHOME 2331
-#define SCI_VCHOMEEXTEND 2332
-#define SCI_ZOOMIN 2333
-#define SCI_ZOOMOUT 2334
-#define SCI_DELWORDLEFT 2335
-#define SCI_DELWORDRIGHT 2336
-#define SCI_LINECUT 2337
-#define SCI_LINEDELETE 2338
-#define SCI_LINETRANSPOSE 2339
-#define SCI_LOWERCASE 2340
-#define SCI_UPPERCASE 2341
-#define SCI_LINESCROLLDOWN 2342
-#define SCI_LINESCROLLUP 2343
-#define SCI_DELETEBACKNOTLINE 2344
-#define SCI_MOVECARETINSIDEVIEW 2401
-#define SCI_LINELENGTH 2350
-#define SCI_BRACEHIGHLIGHT 2351
-#define SCI_BRACEBADLIGHT 2352
-#define SCI_BRACEMATCH 2353
-#define SCI_GETVIEWEOL 2355
-#define SCI_SETVIEWEOL 2356
-#define SCI_GETDOCPOINTER 2357
-#define SCI_SETDOCPOINTER 2358
-#define SCI_SETMODEVENTMASK 2359
-#define EDGE_NONE 0
-#define EDGE_LINE 1
-#define EDGE_BACKGROUND 2
-#define SCI_GETEDGECOLUMN 2360
-#define SCI_SETEDGECOLUMN 2361
-#define SCI_GETEDGEMODE 2362
-#define SCI_SETEDGEMODE 2363
-#define SCI_GETEDGECOLOUR 2364
-#define SCI_SETEDGECOLOUR 2365
-#define SCI_SEARCHANCHOR 2366
-#define SCI_SEARCHNEXT 2367
-#define SCI_SEARCHPREV 2368
-#define CARET_SLOP 0x01
-#define CARET_CENTER 0x02
-#define CARET_STRICT 0x04
-#define CARET_XEVEN 0x08
-#define CARET_XJUMPS 0x10
-#define SCI_SETCARETPOLICY 2369
-#define SCI_LINESONSCREEN 2370
-#define SCI_USEPOPUP 2371
-#define SCI_SELECTIONISRECTANGLE 2372
-#define SCI_SETZOOM 2373
-#define SCI_GETZOOM 2374
-#define SCI_CREATEDOCUMENT 2375
-#define SCI_ADDREFDOCUMENT 2376
-#define SCI_RELEASEDOCUMENT 2377
-#define SCI_GETMODEVENTMASK 2378
-#define SCI_SETFOCUS 2380
-#define SCI_GETFOCUS 2381
-#define SCI_SETSTATUS 2382
-#define SCI_GETSTATUS 2383
-#define SCI_SETMOUSEDOWNCAPTURES 2384
-#define SCI_GETMOUSEDOWNCAPTURES 2385
-#define SC_CURSORNORMAL -1
-#define SC_CURSORWAIT 3
-#define SCI_SETCURSOR 2386
-#define SCI_GETCURSOR 2387
-#define SCI_SETCONTROLCHARSYMBOL 2388
-#define SCI_GETCONTROLCHARSYMBOL 2389
-#define SCI_WORDPARTLEFT 2390
-#define SCI_WORDPARTLEFTEXTEND 2391
-#define SCI_WORDPARTRIGHT 2392
-#define SCI_WORDPARTRIGHTEXTEND 2393
-#define VISIBLE_SLOP 0x01
-#define VISIBLE_STRICT 0x04
-#define SCI_SETVISIBLEPOLICY 2394
-#define SCI_DELLINELEFT 2395
-#define SCI_DELLINERIGHT 2396
-#define SCI_SETXOFFSET 2397
-#define SCI_GETXOFFSET 2398
-#define SCI_GRABFOCUS 2400
-#define SCI_STARTRECORD 3001
-#define SCI_STOPRECORD 3002
-#define SCI_SETLEXER 4001
-#define SCI_GETLEXER 4002
-#define SCI_COLOURISE 4003
-#define SCI_SETPROPERTY 4004
-#define SCI_SETKEYWORDS 4005
-#define SCI_SETLEXERLANGUAGE 4006
-#define SC_MOD_INSERTTEXT 0x1
-#define SC_MOD_DELETETEXT 0x2
-#define SC_MOD_CHANGESTYLE 0x4
-#define SC_MOD_CHANGEFOLD 0x8
-#define SC_PERFORMED_USER 0x10
-#define SC_PERFORMED_UNDO 0x20
-#define SC_PERFORMED_REDO 0x40
-#define SC_LASTSTEPINUNDOREDO 0x100
-#define SC_MOD_CHANGEMARKER 0x200
-#define SC_MOD_BEFOREINSERT 0x400
-#define SC_MOD_BEFOREDELETE 0x800
-#define SC_MODEVENTMASKALL 0xF77
-#define SCEN_CHANGE 768
-#define SCEN_SETFOCUS 512
-#define SCEN_KILLFOCUS 256
-#define SCK_DOWN 300
-#define SCK_UP 301
-#define SCK_LEFT 302
-#define SCK_RIGHT 303
-#define SCK_HOME 304
-#define SCK_END 305
-#define SCK_PRIOR 306
-#define SCK_NEXT 307
-#define SCK_DELETE 308
-#define SCK_INSERT 309
-#define SCK_ESCAPE 7
-#define SCK_BACK 8
-#define SCK_TAB 9
-#define SCK_RETURN 13
-#define SCK_ADD 310
-#define SCK_SUBTRACT 311
-#define SCK_DIVIDE 312
-#define KeyMod SCMOD_
-#define SCMOD_SHIFT 1
-#define SCMOD_CTRL 2
-#define SCMOD_ALT 4
-#define Lexer SCLEX_
-#define SCN_STYLENEEDED 2000
-#define SCN_CHARADDED 2001
-#define SCN_SAVEPOINTREACHED 2002
-#define SCN_SAVEPOINTLEFT 2003
-#define SCN_MODIFYATTEMPTRO 2004
-#define SCN_KEY 2005
-#define SCN_DOUBLECLICK 2006
-#define SCN_UPDATEUI 2007
-#define SCN_MODIFIED 2008
-#define SCN_MACRORECORD 2009
-#define SCN_MARGINCLICK 2010
-#define SCN_NEEDSHOWN 2011
-#define SCN_PAINTED 2013
-#define SCN_USERLISTSELECTION 2014
-#define SCN_URIDROPPED 2015
-#define SCN_DWELLSTART 2016
-#define SCN_DWELLEND 2017
-#define SCN_ZOOM 2018
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
-
-// These structures are defined to be exactly the same shape as the Win32
-// CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
-// So older code that treats Scintilla as a RichEdit will work.
-
-typedef struct _CharacterRange {
-	long cpMin;
-	long cpMax;
-}CharacterRange;
-
-typedef struct _TextRange {
-	CharacterRange chrg;
-	char *lpstrText;
-}TextRange;
-
-typedef struct _TextToFind {
-	CharacterRange chrg;
-	char *lpstrText;
-	CharacterRange chrgText;
-}TextToFind;
-
-#ifdef PLATFORM_H
-
-// This structure is used in printing and requires some of the graphics types
-// from Platform.h.  Not needed by most client code.
-
-typedef struct _RangeToFormat {
-	SurfaceID hdc;
-	SurfaceID hdcTarget;
-	PRectangle rc;
-	PRectangle rcPage;
-	CharacterRange chrg;
-}RangeToFormat;
-
-#endif
-
-typedef struct _NotifyHeader {
-	// hwndFrom is really an environment specifc window handle or pointer
-	// but most clients of Scintilla.h do not have this type visible.
-	//WindowID hwndFrom;
-	void *hwndFrom;
-	unsigned int idFrom;
-	unsigned int code;
-}NotifyHeader;
-
-typedef struct _SCNotification {
-	struct _NotifyHeader nmhdr;
-	int position;	// SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
-	int ch;		// SCN_CHARADDED, SCN_KEY
-	int modifiers;	// SCN_KEY
-	int modificationType;	// SCN_MODIFIED
-	const char *text;	// SCN_MODIFIED
-	int length;		// SCN_MODIFIED
-	int linesAdded;	// SCN_MODIFIED
-	int message;	// SCN_MACRORECORD
-	uptr_t wParam;	// SCN_MACRORECORD
-	sptr_t lParam;	// SCN_MACRORECORD
-	int line;		// SCN_MODIFIED
-	int foldLevelNow;	// SCN_MODIFIED
-	int foldLevelPrev;	// SCN_MODIFIED
-	int margin;		// SCN_MARGINCLICK
-	int listType;	// SCN_USERLISTSELECTION
-	int x;			// SCN_DWELLSTART, SCN_DWELLEND
-	int y;		// SCN_DWELLSTART, SCN_DWELLEND
-}SCNotification;
-
-// Deprecation section listing all API features that are deprecated and will
-// will be removed completely in a future version.
-// To enable these features define INCLUDE_DEPRECATED_FEATURES
-
-#ifdef INCLUDE_DEPRECATED_FEATURES
-
-#define SCN_POSCHANGED 2012
-#define SCN_CHECKBRACE 2007
-
-#endif
-
-#endif
diff --git a/wxc/src/ewxw/eljaccelerator.cpp b/wxc/src/ewxw/eljaccelerator.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljaccelerator.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxAcceleratorEntry_Create)(int flags, int keyCode, int cmd)
-{
-	return (void*) new wxAcceleratorEntry(flags, keyCode, cmd);
-}
-
-EWXWEXPORT(void, wxAcceleratorEntry_Delete)(void* _obj)
-{
-	delete (wxAcceleratorEntry*)_obj;
-}
-
-EWXWEXPORT(void, wxAcceleratorEntry_Set)(void* _obj, int flags, int keyCode, int cmd)
-{
-	((wxAcceleratorEntry*)_obj)->Set(flags, keyCode, cmd);
-}
-	
-EWXWEXPORT(int, wxAcceleratorEntry_GetFlags)(void* _obj)
-{
-	return ((wxAcceleratorEntry*)_obj)->GetFlags();
-}
-	
-EWXWEXPORT(int, wxAcceleratorEntry_GetKeyCode)(void* _obj)
-{
-	return ((wxAcceleratorEntry*)_obj)->GetKeyCode();
-}
-	
-EWXWEXPORT(int, wxAcceleratorEntry_GetCommand)(void* _obj)
-{
-	return ((wxAcceleratorEntry*)_obj)->GetCommand();
-}
-	
-EWXWEXPORT(void*, wxAcceleratorTable_Create)(int n, void* entries)
-{
-	wxAcceleratorEntry* list = new wxAcceleratorEntry[n];
-	
-	for (int i = 0; i< n; i++)
-		list[i] = *(((wxAcceleratorEntry**)entries)[i]);
-	
-	wxAcceleratorTable* result = new wxAcceleratorTable(n, list);
-	
-	delete [] list;
-	
-	return (void*) result;
-}
-
-EWXWEXPORT(void, wxAcceleratorTable_Delete)(void* _obj)
-{
-	delete (wxAcceleratorEntry*)_obj;
-}
-
-}
diff --git a/wxc/src/ewxw/eljartprov.cpp b/wxc/src/ewxw/eljartprov.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljartprov.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-#include "wx/artprov.h"
-
-extern "C"
-{
-typedef void* _cdecl (*TCreateBmp)(void* _obj, void* id, void* clt, int w, int h);
-}
-
-
-class ELJArtProv: public wxArtProvider
-{
-	private:
-		void* EiffelObject;
-		TCreateBmp cb;
-	protected:
-    	virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)
-		{
-			if (EiffelObject)
-			{
-				void* res = cb (EiffelObject, (void*)id.c_str(), (void*)client.c_str(), size.GetWidth(), size.GetHeight());
-				
-				if (res)
-					return (*((wxBitmap*)res));
-				else
-					return wxNullBitmap;
-			}
-			return wxNullBitmap;
-		}
-	public:
-		ELJArtProv (void* obj, void* clb){EiffelObject = obj; cb = (TCreateBmp)clb;};
-		void Release(){EiffelObject = NULL; cb = NULL;};
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*,ELJArtProv_Create)(void* _obj, void* _clb)
-{
-	return (void*)new ELJArtProv(_obj, _clb);
-}
-	
-EWXWEXPORT(void,ELJArtProv_Release)(void* _obj)
-{
-	((ELJArtProv*)_obj)->Release();
-	delete (ELJArtProv*)_obj;
-}
-	
-EWXWEXPORT(void,PushProvider)(void* provider)
-{
-	wxArtProvider::PushProvider((wxArtProvider*)provider);
-}
-
-EWXWEXPORT(int,PopProvider)()
-{
-	return (int)wxArtProvider::PopProvider();
-}
-
-EWXWEXPORT(int,RemoveProvider)(void* provider)
-{
-	return (int)wxArtProvider::RemoveProvider((wxArtProvider*)provider);
-}
-
-}
-#endif
diff --git a/wxc/src/ewxw/eljbitmap.cpp b/wxc/src/ewxw/eljbitmap.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljbitmap.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxBitmap_Create)(void* _data, int _type, int _width, int _height, int _depth)
-{
-#ifdef __WIN32__
-	return (void*) new wxBitmap(_data, _type, _width, _height, _depth);
-#else
-	return (void*) new wxBitmap((const char*)_data, _width, _height, _depth);
-#endif
-}
-
-EWXWEXPORT(void*, wxBitmap_CreateFromXPM)(void* _data)
-{
-	return (void*) new wxBitmap((const char**)_data);
-}
-
-EWXWEXPORT(void*, wxBitmap_CreateEmpty)(int _width, int _height, int _depth)
-{
-	return (void*) new wxBitmap(_width, _height, _depth);
-}
-
-EWXWEXPORT(void*, wxBitmap_CreateLoad)(void* name, int type)
-{
-#if wxVERSION_NUMBER >= 2400
-	return (void*) new wxBitmap((wxChar*)name, (wxBitmapType)type);
-#else
-	return (void*) new wxBitmap((wxChar*)name, (long)type);
-#endif
-}
-
-EWXWEXPORT(void*, wxBitmap_CreateDefault)()
-{
-	return (void*) new wxBitmap();
-}
-
-EWXWEXPORT(void, wxBitmap_Delete)(void* _obj)
-{
-	delete (wxBitmap*)_obj;
-}
-
-EWXWEXPORT(void, wxBitmap_GetSubBitmap)(void* _obj, int x, int y, int w, int h, void* bitmap)
-{
-	(*(wxBitmap*)bitmap) = ((wxBitmap*)_obj)->GetSubBitmap(wxRect(x, y, w, h));
-}
-	
-EWXWEXPORT(int, wxBitmap_LoadFile)(void* _obj, void* name, int type)
-{
-#if wxVERSION_NUMBER >= 2400
-	return (int)((wxBitmap*)_obj)->LoadFile((wxChar*)name, (wxBitmapType)type);
-#else
-	return (int)((wxBitmap*)_obj)->LoadFile((wxChar*)name, (long)type);
-#endif
-}
-	
-EWXWEXPORT(int, wxBitmap_SaveFile)(void* _obj, void* name, int type, void* cmap)
-{
-#if wxVERSION_NUMBER >= 2400
-	return (int)((wxBitmap*)_obj)->SaveFile((wxChar*) name, (wxBitmapType)type, (wxPalette*) cmap);
-#else
-	return (int)((wxBitmap*)_obj)->SaveFile((wxChar*) name, type, (wxPalette*) cmap);
-#endif
-}
-	
-EWXWEXPORT(void*, wxBitmap_GetMask)(void* _obj)
-{
-	return (void*)((wxBitmap*)_obj)->GetMask();
-}
-	
-EWXWEXPORT(void, wxBitmap_SetMask)(void* _obj, void* mask)
-{
-	((wxBitmap*)_obj)->SetMask((wxMask*) mask);
-}
-	
-/**/
-EWXWEXPORT(void, wxBitmap_AddHandler)(void* handler)
-{
-#ifdef __WIN32__
-	wxBitmap::AddHandler((wxGDIImageHandler*) handler);
-#endif
-}
-	
-EWXWEXPORT(void, wxBitmap_InsertHandler)(void* handler)
-{
-#ifdef __WIN32__
-	wxBitmap::InsertHandler((wxGDIImageHandler*) handler);
-#endif
-}
-	
-EWXWEXPORT(int, wxBitmap_RemoveHandler)(void* name)
-{
-#ifdef __WIN32__
-	return (int) wxBitmap::RemoveHandler((wxChar*) name);
-#else
-	return 0;
-#endif
-}
-	
-EWXWEXPORT(void*, wxBitmap_FindHandlerByName)(void* name)
-{
-#ifdef __WIN32__
-	return (void*)wxBitmap::FindHandler((wxChar*) name);
-#else
-	return NULL;
-#endif
-}
-	
-EWXWEXPORT(void*, wxBitmap_FindHandlerByExtension)(void* extension, int type)
-{
-#ifdef __WIN32__
-	return (void*)wxBitmap::FindHandler((wxChar*)extension, (long)type);
-#else
-	return NULL;
-#endif
-}
-	
-EWXWEXPORT(void*, wxBitmap_FindHandlerByType)(int type)
-{
-#ifdef __WIN32__
-	return (void*)wxBitmap::FindHandler((long)type);
-#else
-	return NULL;
-#endif
-}
-	
-EWXWEXPORT(void, wxBitmap_InitStandardHandlers)()
-{
-#ifdef __WIN32__
-	wxBitmap::InitStandardHandlers();
-#endif
-}
-	
-EWXWEXPORT(void, wxBitmap_CleanUpHandlers)()
-{
-#ifdef __WIN32__
-	wxBitmap::CleanUpHandlers();
-#endif
-}
-	
-/**/
-EWXWEXPORT(int, wxBitmap_Ok)(void* _obj)
-{
-	return (int)((wxBitmap*)_obj)->Ok();
-}
-	
-EWXWEXPORT(int, wxBitmap_GetWidth)(void* _obj)
-{
-	return ((wxBitmap*)_obj)->GetWidth();
-}
-	
-EWXWEXPORT(int, wxBitmap_GetHeight)(void* _obj)
-{
-	return ((wxBitmap*)_obj)->GetHeight();
-}
-	
-EWXWEXPORT(int, wxBitmap_GetDepth)(void* _obj)
-{
-	return ((wxBitmap*)_obj)->GetDepth();
-}
-	
-EWXWEXPORT(void, wxBitmap_SetWidth)(void* _obj, int w)
-{
-	((wxBitmap*)_obj)->SetWidth(w);
-}
-	
-EWXWEXPORT(void, wxBitmap_SetHeight)(void* _obj, int h)
-{
-	((wxBitmap*)_obj)->SetHeight(h);
-}
-	
-EWXWEXPORT(void, wxBitmap_SetDepth)(void* _obj, int d)
-{
-	((wxBitmap*)_obj)->SetDepth(d);
-}
-	
-EWXWEXPORT(void*, wxStaticBitmap_Create) (void* _prt, int _id, void* bitmap, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxStaticBitmap ((wxWindow*)_prt, _id, *((wxBitmap*)bitmap), wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void, wxStaticBitmap_SetIcon)(void* _obj, void* icon)
-{
-	((wxStaticBitmap*)_obj)->SetIcon(*((wxIcon*)icon));
-}
-	
-EWXWEXPORT(void, wxStaticBitmap_SetBitmap)(void* _obj, void* bitmap)
-{
-	((wxStaticBitmap*)_obj)->SetBitmap(*((wxBitmap*)bitmap));
-}
-	
-EWXWEXPORT(void, wxStaticBitmap_GetIcon)(void* _obj, void* _ref)
-{
-	*((wxIcon*)_ref) = ((wxStaticBitmap*)_obj)->GetIcon();
-}
-	
-EWXWEXPORT(void, wxStaticBitmap_GetBitmap)(void* _obj, void* _ref)
-{
-	*((wxBitmap*)_ref) = ((wxStaticBitmap*)_obj)->GetBitmap();
-}
-	
-EWXWEXPORT(void, wxStaticBitmap_Delete)(void* _obj)
-{
-	delete (wxStaticBitmap*)_obj;
-}
-
-}
diff --git a/wxc/src/ewxw/eljbrush.cpp b/wxc/src/ewxw/eljbrush.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljbrush.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxBrush_CreateDefault) ()
-{
-	return (void*) new wxBrush();
-}
-
-EWXWEXPORT(void*, wxBrush_CreateFromBitmap) (void* bitmap)
-{
-	return (void*) new wxBrush(*((wxBitmap*)bitmap));
-}
-
-EWXWEXPORT(void*, wxBrush_CreateFromColour) (void* col, int style)
-{
-	return (void*) new wxBrush(*((wxColour*)col), style);
-}
-
-EWXWEXPORT(void*, wxBrush_CreateFromStock) (int id)
-{
-	switch (id)
-	{
-		case 0:
-			return (void*)wxBLUE_BRUSH;
-		case 1:
-			return (void*)wxGREEN_BRUSH;
-		case 2:
-			return (void*)wxWHITE_BRUSH;
-		case 3:
-			return (void*)wxBLACK_BRUSH;
-		case 4:
-			return (void*)wxGREY_BRUSH;
-		case 5:
-			return (void*)wxMEDIUM_GREY_BRUSH;
-		case 6:
-			return (void*)wxLIGHT_GREY_BRUSH;
-		case 7:
-			return (void*)wxTRANSPARENT_BRUSH;
-		case 8:
-			return (void*)wxCYAN_BRUSH;
-		case 9:
-			return (void*)wxRED_BRUSH;
-	}
-	
-	return NULL;
-}
-
-EWXWEXPORT(void, wxBrush_Delete) (void* _obj)
-{
-	delete (wxBrush*)_obj;
-}
-
-EWXWEXPORT(void, wxBrush_SetColour)(void* _obj, void* col)
-{
-	((wxBrush*)_obj)->SetColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(void, wxBrush_SetColourSingle)(void* _obj, char r, char g, char b)
-{
-	((wxBrush*)_obj)->SetColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
-}
-	
-EWXWEXPORT(void, wxBrush_SetStyle)(void* _obj, int style)
-{
-	((wxBrush*)_obj)->SetStyle(style);
-}
-	
-EWXWEXPORT(void, wxBrush_SetStipple)(void* _obj, void* stipple)
-{
-	((wxBrush*)_obj)->SetStipple(*((wxBitmap*)stipple));
-}
-	
-EWXWEXPORT(void, wxBrush_Assign)(void* _obj, void* brush)
-{
-	*((wxBrush*)_obj) = *((wxBrush*)brush);
-}
-	
-EWXWEXPORT(int, wxBrush_IsEqual)(void* _obj, void* brush)
-{
-	return (int)(*((wxBrush*)_obj) == *((wxBrush*)brush));
-}
-	
-EWXWEXPORT(void, wxBrush_GetColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxBrush*)_obj)->GetColour();
-}
-	
-EWXWEXPORT(int, wxBrush_GetStyle)(void* _obj)
-{
-	return ((wxBrush*)_obj)->GetStyle();
-}
-	
-EWXWEXPORT(void, wxBrush_GetStipple)(void* _obj, void* _ref)
-{
-	*((wxBitmap*)_ref) = (*((wxBrush*)_obj)->GetStipple());
-}
-	
-EWXWEXPORT(int, wxBrush_Ok)(void* _obj)
-{
-	return (int)((wxBrush*)_obj)->Ok();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljbusyinfo.cpp b/wxc/src/ewxw/eljbusyinfo.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljbusyinfo.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "wrapper.h"
-#include "wx/busyinfo.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxBusyInfo_Create) (void* _txt)
-{
-	return (void*) new wxBusyInfo ((wxChar*)_txt);
-}
-
-EWXWEXPORT(void, wxBusyInfo_Delete) (void* _obj)
-{
-	delete (wxBusyInfo*)_obj;
-}
-
-EWXWEXPORT(void*, wxBusyCursor_Create) ()
-{
-	return (void*) new wxBusyCursor ();
-}
-
-EWXWEXPORT(void*, wxBusyCursor_CreateWithCursor) (void* _cur)
-{
-	return (void*) new wxBusyCursor ((wxCursor*)_cur);
-}
-
-EWXWEXPORT(void, wxBusyCursor_Delete) (void* _obj)
-{
-	delete (wxBusyCursor*)_obj;
-}
-
-}
diff --git a/wxc/src/ewxw/eljbutton.cpp b/wxc/src/ewxw/eljbutton.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljbutton.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxButton_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxButton ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
-}
-
-EWXWEXPORT(int, wxButton_SetBackgroundColour)(void* _obj, void* colour)
-{
-	return (int)((wxButton*)_obj)->SetBackgroundColour(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxButton_SetDefault)(void* _obj)
-{
-	((wxButton*)_obj)->SetDefault();
-}
-
-EWXWEXPORT(void*, wxBitmapButton_Create) (void* _prt, int _id, void* _bmp, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxBitmapButton ((wxWindow*)_prt, _id, *((wxBitmap*)_bmp), wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
-}
-
-EWXWEXPORT(void, wxBitmapButton_GetBitmapLabel)(void* _obj, void* _ref)
-{
-	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapLabel();
-}
-	
-EWXWEXPORT(void, wxBitmapButton_GetBitmapSelected)(void* _obj, void* _ref)
-{
-	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapSelected();
-}
-	
-EWXWEXPORT(void, wxBitmapButton_GetBitmapFocus)(void* _obj, void* _ref)
-{
-	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapFocus();
-}
-	
-EWXWEXPORT(void, wxBitmapButton_GetBitmapDisabled)(void* _obj, void* _ref)
-{
-	*((wxBitmap*)_ref) = ((wxBitmapButton*)_obj)->GetBitmapDisabled();
-}
-	
-EWXWEXPORT(void, wxBitmapButton_SetBitmapSelected)(void* _obj, void* sel)
-{
-	((wxBitmapButton*)_obj)->SetBitmapSelected(*((wxBitmap*)sel));
-}
-	
-EWXWEXPORT(void, wxBitmapButton_SetBitmapFocus)(void* _obj, void* focus)
-{
-	((wxBitmapButton*)_obj)->SetBitmapFocus(*((wxBitmap*)focus));
-}
-	
-EWXWEXPORT(void, wxBitmapButton_SetBitmapDisabled)(void* _obj, void* disabled)
-{
-	((wxBitmapButton*)_obj)->SetBitmapDisabled(*((wxBitmap*)disabled));
-}
-	
-EWXWEXPORT(void, wxBitmapButton_SetBitmapLabel)(void* _obj, void* bitmap)
-{
-	((wxBitmapButton*)_obj)->SetBitmapLabel(*((wxBitmap*)bitmap));
-}
-	
-EWXWEXPORT(void, wxBitmapButton_SetMargins)(void* _obj, int x, int y)
-{
-	((wxBitmapButton*)_obj)->SetMargins(x, y);
-}
-	
-EWXWEXPORT(int, wxBitmapButton_GetMarginX)(void* _obj)
-{
-	return ((wxBitmapButton*)_obj)->GetMarginX();
-}
-	
-EWXWEXPORT(int, wxBitmapButton_GetMarginY)(void* _obj)
-{
-	return ((wxBitmapButton*)_obj)->GetMarginY();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljcalendarctrl.cpp b/wxc/src/ewxw/eljcalendarctrl.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcalendarctrl.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxCalendarCtrl_Create) (void* _prt, int _id, void* _dat, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxCalendarCtrl ((wxWindow*)_prt, _id, *((wxDateTime*)_dat), wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void, wxCalendarCtrl_SetDate)(void* _obj, void* date)
-{
-	((wxCalendarCtrl*)_obj)->SetDate(*((wxDateTime*)date));
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_GetDate)(void* _obj, void* date)
-{
-	*((wxDateTime*)date) = ((wxCalendarCtrl*)_obj)->GetDate();
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_EnableYearChange)(void* _obj, int enable)
-{
-	((wxCalendarCtrl*)_obj)->EnableYearChange(enable != 0);
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_EnableMonthChange)(void* _obj, int enable)
-{
-	((wxCalendarCtrl*)_obj)->EnableMonthChange(enable != 0);
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_EnableHolidayDisplay)(void* _obj, int display)
-{
-	((wxCalendarCtrl*)_obj)->EnableHolidayDisplay(display != 0);
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_SetHeaderColours)(void* _obj, void* colFg, void* colBg)
-{
-	((wxCalendarCtrl*)_obj)->SetHeaderColours(*((wxColour*)colFg), *((wxColour*)colBg));
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_GetHeaderColourFg)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHeaderColourFg();
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_GetHeaderColourBg)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHeaderColourBg();
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_SetHighlightColours)(void* _obj, void* colFg, void* colBg)
-{
-	((wxCalendarCtrl*)_obj)->SetHighlightColours(*((wxColour*)colFg), *((wxColour*)colBg));
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_GetHighlightColourFg)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHighlightColourFg();
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_GetHighlightColourBg)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHighlightColourBg();
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_SetHolidayColours)(void* _obj, void* colFg, void* colBg)
-{
-	((wxCalendarCtrl*)_obj)->SetHolidayColours(*((wxColour*)colFg), *((wxColour*)colBg));
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_GetHolidayColourFg)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHolidayColourFg();
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_GetHolidayColourBg)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxCalendarCtrl*)_obj)->GetHolidayColourBg();
-}
-	
-EWXWEXPORT(void*, wxCalendarCtrl_GetAttr)(void* _obj, int day)
-{
-	return (void*)((wxCalendarCtrl*)_obj)->GetAttr((size_t)day);
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_SetAttr)(void* _obj, int day, void* attr)
-{
-	((wxCalendarCtrl*)_obj)->SetAttr((size_t)day, (wxCalendarDateAttr*)attr);
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_SetHoliday)(void* _obj, int day)
-{
-	((wxCalendarCtrl*)_obj)->SetHoliday((size_t)day);
-}
-	
-EWXWEXPORT(void, wxCalendarCtrl_ResetAttr)(void* _obj, int day)
-{
-	((wxCalendarCtrl*)_obj)->ResetAttr((size_t)day);
-}
-	
-EWXWEXPORT(int, wxCalendarCtrl_HitTest)(void* _obj, int x, int y, void* date, void* wd)
-{
-	return (int)((wxCalendarCtrl*)_obj)->HitTest(wxPoint(x, y), (wxDateTime*)date, (wxDateTime::WeekDay*)wd);
-}
-	
-
-EWXWEXPORT(void*, wxCalendarDateAttr_Create)(void* _ctxt, void* _cbck, void* _cbrd, void* _fnt, int _brd)
-{
-	return (void*) new wxCalendarDateAttr(*((wxColour*)_ctxt), *((wxColour*)_cbck), *((wxColour*)_cbrd), *((wxFont*)_fnt), (wxCalendarDateBorder)_brd);
-}
-
-EWXWEXPORT(void*, wxCalendarDateAttr_CreateDefault)()
-{
-	return (void*) new wxCalendarDateAttr();
-}
-
-EWXWEXPORT(void, wxCalendarDateAttr_Delete)(void* _obj)
-{
-	delete (wxCalendarDateAttr*)_obj;
-}
-
-EWXWEXPORT(void, wxCalendarDateAttr_SetTextColour)(void* _obj, void* col)
-{
-	((wxCalendarDateAttr*)_obj)->SetTextColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_SetBackgroundColour)(void* _obj, void* col)
-{
-	((wxCalendarDateAttr*)_obj)->SetBackgroundColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_SetBorderColour)(void* _obj, void* col)
-{
-	((wxCalendarDateAttr*)_obj)->SetBorderColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_SetFont)(void* _obj, void* font)
-{
-	((wxCalendarDateAttr*)_obj)->SetFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_SetBorder)(void* _obj, int border)
-{
-	((wxCalendarDateAttr*)_obj)->SetBorder((wxCalendarDateBorder)border);
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_SetHoliday)(void* _obj, int holiday)
-{
-	((wxCalendarDateAttr*)_obj)->SetHoliday(holiday != 0);
-}
-	
-EWXWEXPORT(int, wxCalendarDateAttr_HasTextColour)(void* _obj)
-{
-	return (int)((wxCalendarDateAttr*)_obj)->HasTextColour();
-}
-	
-EWXWEXPORT(int, wxCalendarDateAttr_HasBackgroundColour)(void* _obj)
-{
-	return (int)((wxCalendarDateAttr*)_obj)->HasBackgroundColour();
-}
-	
-EWXWEXPORT(int, wxCalendarDateAttr_HasBorderColour)(void* _obj)
-{
-	return (int)((wxCalendarDateAttr*)_obj)->HasBorderColour();
-}
-	
-EWXWEXPORT(int, wxCalendarDateAttr_HasFont)(void* _obj)
-{
-	return (int)((wxCalendarDateAttr*)_obj)->HasFont();
-}
-	
-EWXWEXPORT(int, wxCalendarDateAttr_HasBorder)(void* _obj)
-{
-	return (int)((wxCalendarDateAttr*)_obj)->HasBorder();
-}
-	
-EWXWEXPORT(int, wxCalendarDateAttr_IsHoliday)(void* _obj)
-{
-	return (int)((wxCalendarDateAttr*)_obj)->IsHoliday();
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_GetTextColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxCalendarDateAttr*)_obj)->GetTextColour();
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_GetBackgroundColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxCalendarDateAttr*)_obj)->GetBackgroundColour();
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_GetBorderColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxCalendarDateAttr*)_obj)->GetBorderColour();
-}
-	
-EWXWEXPORT(void, wxCalendarDateAttr_GetFont)(void* _obj, void* _ref)
-{
-	*((wxFont*)_ref) = ((wxCalendarDateAttr*)_obj)->GetFont();
-}
-	
-EWXWEXPORT(int, wxCalendarDateAttr_GetBorder)(void* _obj)
-{
-	return (int)((wxCalendarDateAttr*)_obj)->GetBorder();
-}
-
-}
diff --git a/wxc/src/ewxw/eljcaret.cpp b/wxc/src/ewxw/eljcaret.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcaret.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "wrapper.h"
-#include "wx/caret.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxCaret_Create)(void* _wnd, int _wth, int _hgt)
-{
-	return new wxCaret((wxWindow*)_wnd, _wth, _hgt);
-}
-
-EWXWEXPORT(int,wxCaret_IsOk)(void* _obj)
-{
-	return (int)((wxCaret*)_obj)->IsOk();
-}
-	
-EWXWEXPORT(int,wxCaret_IsVisible)(void* _obj)
-{
-	return (int)((wxCaret*)_obj)->IsVisible();
-}
-	
-EWXWEXPORT(void,wxCaret_GetPosition)(void* _obj, void* x, void* y)
-{
-	((wxCaret*)_obj)->GetPosition((int*)x, (int*)y);
-}
-	
-EWXWEXPORT(void,wxCaret_GetSize)(void* _obj, void* width, void* height)
-{
-	((wxCaret*)_obj)->GetSize((int*)width, (int*)height);
-}
-	
-EWXWEXPORT(void*,wxCaret_GetWindow)(void* _obj)
-{
-	return (void*)((wxCaret*)_obj)->GetWindow();
-}
-	
-EWXWEXPORT(void,wxCaret_SetSize)(void* _obj, int width, int height)
-{
-	((wxCaret*)_obj)->SetSize(width, height);
-}
-	
-EWXWEXPORT(void,wxCaret_Move)(void* _obj, int x, int y)
-{
-	((wxCaret*)_obj)->Move(x, y);
-}
-	
-EWXWEXPORT(void,wxCaret_Show)(void* _obj)
-{
-	((wxCaret*)_obj)->Show();
-}
-	
-EWXWEXPORT(void,wxCaret_Hide)(void* _obj)
-{
-	((wxCaret*)_obj)->Hide();
-}
-	
-EWXWEXPORT(int,wxCaret_GetBlinkTime)()
-{
-	return wxCaret::GetBlinkTime();
-}
-	
-EWXWEXPORT(void,wxCaret_SetBlinkTime)(int milliseconds)
-{
-	wxCaret::SetBlinkTime(milliseconds);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljcheckbox.cpp b/wxc/src/ewxw/eljcheckbox.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcheckbox.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxCheckBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxCheckBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
-}
-
-EWXWEXPORT(void, wxCheckBox_SetValue)(void* _obj, int value)
-{
-	((wxCheckBox*)_obj)->SetValue(value != 0);
-}
-	
-EWXWEXPORT(int, wxCheckBox_GetValue)(void* _obj)
-{
-	return (int)((wxCheckBox*)_obj)->GetValue();
-}
-
-} 
diff --git a/wxc/src/ewxw/eljchecklistbox.cpp b/wxc/src/ewxw/eljchecklistbox.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljchecklistbox.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxCheckListBox_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
-{
-	wxCheckListBox* result = new wxCheckListBox ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), 0, NULL, _stl, wxDefaultValidator);
-
-	for (int i = 0; i < _n; i++)
-		result->Append(((wxChar**)_str)[i]);
-
-	return (void*) result;
-}
-
-EWXWEXPORT(void, wxCheckListBox_Check)(void* _obj, int item, int check)
-{
-	((wxCheckListBox*)_obj)->Check(item, check != 0);
-}
-	
-EWXWEXPORT(int, wxCheckListBox_IsChecked)(void* _obj, int item)
-{
-	return (int)((wxCheckListBox*)_obj)->IsChecked(item);
-}
-
-}
diff --git a/wxc/src/ewxw/eljchoice.cpp b/wxc/src/ewxw/eljchoice.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljchoice.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxChoice_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
-{
-	wxString* list = new wxString[_n];
-
-	for (int i = 0; i < _n; i++)
-		list[i] = ((wxChar**)_str)[i];
-
-	wxChoice* result = new wxChoice ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _n, list, _stl, wxDefaultValidator);
-
-	delete [] list;
-
-	return result;
-}
-
-EWXWEXPORT(void, wxChoice_Append)(void* _obj, wxChar* item)
-{
-	((wxChoice*)_obj)->Append(item);
-}
-	
-EWXWEXPORT(void, wxChoice_Delete)(void* _obj, int n)
-{
-	((wxChoice*)_obj)->Delete(n);
-}
-	
-EWXWEXPORT(void, wxChoice_Clear)(void* _obj)
-{
-	((wxChoice*)_obj)->Clear();
-}
-	
-EWXWEXPORT(int, wxChoice_GetCount)(void* _obj)
-{
-	return ((wxChoice*)_obj)->GetCount();
-}
-	
-EWXWEXPORT(int, wxChoice_GetSelection)(void* _obj)
-{
-	return ((wxChoice*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(void, wxChoice_SetSelection)(void* _obj, int n)
-{
-	((wxChoice*)_obj)->SetSelection(n);
-}
-	
-EWXWEXPORT(int, wxChoice_FindString)(void* _obj, wxChar* s)
-{
-	return ((wxChoice*)_obj)->FindString(s);
-}
-	
-EWXWEXPORT(int, wxChoice_GetString)(void* _obj, int n, void* _buf)
-{
-	wxString result = ((wxChoice*)_obj)->GetString(n);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxChoice_SetString)(void* _obj, int n, wxChar* s)
-{
-	((wxChoice*)_obj)->SetString(n, s);
-}
-	
-} 
diff --git a/wxc/src/ewxw/eljclipboard.cpp b/wxc/src/ewxw/eljclipboard.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljclipboard.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxClipboard_Create)()
-{
-	return wxTheClipboard;
-}
-
-EWXWEXPORT(void, wxClipboard_Delete)(void* _obj)
-{
-	// delete (wxClipboard*)_obj;
-}
-
-EWXWEXPORT(int, wxClipboard_Open)(void* _obj)
-{
-	return (int)((wxClipboard*)_obj)->Open();
-}
-
-EWXWEXPORT(void, wxClipboard_Close)(void* _obj)
-{
-	((wxClipboard*)_obj)->Close();
-}
-
-EWXWEXPORT(int, wxClipboard_IsOpened)(void* _obj)
-{
-	return (int)((wxClipboard*)_obj)->IsOpened();
-}
-
-EWXWEXPORT(int, wxClipboard_SetData)(void* _obj, wxDataObject* data)
-{
-	return (int)((wxClipboard*)_obj)->SetData(data);
-}
-
-EWXWEXPORT(int, wxClipboard_AddData)(void* _obj, wxDataObject* data)
-{
-	return (int)((wxClipboard*)_obj)->AddData(data);
-}
-
-EWXWEXPORT(int, wxClipboard_IsSupported)(void* _obj, wxDataFormat* format)
-{
-	return (int)((wxClipboard*)_obj)->IsSupported(*format);
-}
-
-EWXWEXPORT(int, wxClipboard_GetData)(void* _obj, wxDataObject* data)
-{
-	return (int)((wxClipboard*)_obj)->GetData(*data);
-}
-
-EWXWEXPORT(void, wxClipboard_Clear)(void* _obj)
-{
-	((wxClipboard*)_obj)->Clear();
-}
-
-EWXWEXPORT(int, wxClipboard_Flush)(void* _obj)
-{
-	return (int)((wxClipboard*)_obj)->Flush();
-}
-
-EWXWEXPORT(void, wxClipboard_UsePrimarySelection)(void* _obj, int primary)
-{
-	((wxClipboard*)_obj)->UsePrimarySelection (primary != 0);
-}
-
-}
diff --git a/wxc/src/ewxw/eljcoldata.cpp b/wxc/src/ewxw/eljcoldata.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcoldata.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxColourData_Create) ()
-{
-	return (void*) new wxColourData();
-}
-
-EWXWEXPORT(void, wxColourData_Delete) (void* _obj)
-{
-	delete (wxColourData*)_obj;
-}
-
-EWXWEXPORT(void, wxColourData_SetChooseFull)(void* _obj, int flag)
-{
-	((wxColourData*)_obj)->SetChooseFull(flag != 0);
-}
-	
-EWXWEXPORT(int, wxColourData_GetChooseFull)(void* _obj)
-{
-	return (int)((wxColourData*)_obj)->GetChooseFull();
-}
-	
-EWXWEXPORT(void, wxColourData_SetColour)(void* _obj, void* colour)
-{
-	((wxColourData*)_obj)->SetColour(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxColourData_GetColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxColourData*)_obj)->GetColour();
-}
-	
-EWXWEXPORT(void, wxColourData_SetCustomColour)(void* _obj, int i, void* colour)
-{
-	((wxColourData*)_obj)->SetCustomColour(i, *((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxColourData_GetCustomColour)(void* _obj, int i, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxColourData*)_obj)->GetCustomColour(i);
-}
-	
-} 
diff --git a/wxc/src/ewxw/eljcolour.cpp b/wxc/src/ewxw/eljcolour.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcolour.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxColour_CreateEmpty) ()
-{
-	return (void*) new wxColour();
-}
-
-EWXWEXPORT(void*, wxColour_CreateRGB) (char _red, char _green, char _blue)
-{
-	return (void*) new wxColour(_red, _green, _blue);
-}
-
-EWXWEXPORT(void*, wxColour_CreateByName) (void* _name)
-{
-	return (void*) new wxColour((wxChar*)_name);
-}
-
-EWXWEXPORT(void*, wxColour_CreateFromStock) (int _id)
-{
-	switch (_id)
-	{
-		case 0:
-			return (void*)wxBLACK;
-		case 1:
-			return (void*)wxWHITE;
-		case 2:
-			return (void*)wxRED;
-		case 3:
-			return (void*)wxBLUE;
-		case 4:
-			return (void*)wxGREEN;
-		case 5:
-			return (void*)wxCYAN;
-		case 6:
-			return (void*)wxLIGHT_GREY;
-	}
-
-	return NULL;
-}
-
-EWXWEXPORT(void, wxColour_Delete)(void* _obj)
-{
-	delete (wxColour*)_obj;
-}
-
-EWXWEXPORT(void, wxColour_Set)(void* _obj, char _red, char _green, char _blue)
-{
-	((wxColour*)_obj)->Set(_red, _green, _blue);
-}
-	
-EWXWEXPORT(void, wxColour_Assign)(void* _obj, void* other)
-{
-	*((wxColour*)_obj) = *((wxColour*)other);
-}
-	
-EWXWEXPORT(int, wxColour_Ok)(void* _obj)
-{
-	return (int)((wxColour*)_obj)->Ok();
-}
-	
-EWXWEXPORT(char, wxColour_Red)(void* _obj)
-{
-	return ((wxColour*)_obj)->Red();
-}
-	
-EWXWEXPORT(char, wxColour_Green)(void* _obj)
-{
-	return ((wxColour*)_obj)->Green();
-}
-	
-EWXWEXPORT(char, wxColour_Blue)(void* _obj)
-{
-	return ((wxColour*)_obj)->Blue();
-}
-
-// FIXME: the return type on this is platform dependent
-// and thus evil.  If you really want a GetPixel method,
-// please hack this code and throw in the relevant 
-// ifdefs, cuz I don't want to deal with it.
-//   Windows - WXCOLORREF
-//   GTK     - int
-//   X11     - long
-//   Mac     - (WXCOLORREF&)
-// EWXWEXPORT(WXCOLORREF, wxColour_GetPixel)(void* _obj)
-// {
-// 	return ((wxColour*)_obj)->GetPixel();
-// }
-
-EWXWEXPORT(void, wxColour_Copy)(void* _obj, void* _other)
-{
-	(*((wxColour*)_obj)) = (*((wxColour*)_other));
-}
-
-EWXWEXPORT(void, wxColour_SetByName)(void* _obj, void* _name)
-{
-	(*((wxColour*)_obj)) = (wxChar*)_name;
-}
-
-EWXWEXPORT(int, wxColour_ValidName)(wxChar* _name)
-{
-#if (wxVERSION_NUMBER < 2600)
-  return (wxTheColourDatabase->FindColour (wxString(_name))) != NULL;
-#else
-  wxColour col = (wxTheColourDatabase->Find (wxString(_name)));
-#if (wxVERSION_NUMBER < 2800)
-  return col.Ok();
-#else
-  return col.IsOk();
-#endif
-#endif
-}
-
-}
diff --git a/wxc/src/ewxw/eljcolourdlg.cpp b/wxc/src/ewxw/eljcolourdlg.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcolourdlg.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxColourDialog_Create) (void* _prt, void* col)
-{
-	return (void*) new wxColourDialog ((wxWindow*)_prt, (wxColourData*) col);
-}
-
-EWXWEXPORT(void, wxColourDialog_GetColourData)(void* _obj, void* col)
-{
-	*((wxColourData*)col) = ((wxColourDialog*)_obj)->GetColourData();
-}
-
-}
diff --git a/wxc/src/ewxw/eljcombobox.cpp b/wxc/src/ewxw/eljcombobox.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcombobox.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxComboBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
-{
-	wxString* list = new wxString[_n];
-
-	for (int i = 0; i < _n; i++)
-		list[i] = ((wxChar**)_str)[i];
-
-	wxComboBox* result = new wxComboBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _n, list, _stl, wxDefaultValidator);
-
-	delete [] list;
-#if wxVERSION_NUMBER < 2400
-	if ((result->Number()) && (result->GetSelection() == -1)) result->SetSelection(0);
-#else
-	if ((result->GetCount()) && (result->GetSelection() == -1)) result->SetSelection(0);
-#endif
-	
-	return (void*) result;
-}
-
-EWXWEXPORT(void, wxComboBox_Copy)(void* _obj)
-{
-	((wxComboBox*)_obj)->Copy();
-}
-	
-EWXWEXPORT(void, wxComboBox_Cut)(void* _obj)
-{
-	((wxComboBox*)_obj)->Cut();
-}
-	
-EWXWEXPORT(void, wxComboBox_Paste)(void* _obj)
-{
-	((wxComboBox*)_obj)->Paste();
-}
-	
-EWXWEXPORT(void, wxComboBox_SetInsertionPoint)(void* _obj, int pos)
-{
-	((wxComboBox*)_obj)->SetInsertionPoint(pos);
-}
-	
-EWXWEXPORT(void, wxComboBox_SetInsertionPointEnd)(void* _obj)
-{
-	((wxComboBox*)_obj)->SetInsertionPointEnd();
-}
-	
-EWXWEXPORT(int, wxComboBox_GetInsertionPoint)(void* _obj)
-{
-	return ((wxComboBox*)_obj)->GetInsertionPoint();
-}
-	
-EWXWEXPORT(int, wxComboBox_GetLastPosition)(void* _obj)
-{
-	return ((wxComboBox*)_obj)->GetLastPosition();
-}
-	
-EWXWEXPORT(void, wxComboBox_Replace)(void* _obj, int from, int to, wxChar* value)
-{
-	((wxComboBox*)_obj)->Replace(from, to, value);
-}
-	
-EWXWEXPORT(void, wxComboBox_Remove)(void* _obj, int from, int to)
-{
-	((wxComboBox*)_obj)->Remove(from, to);
-#if wxVERSION_NUMBER < 2400
-	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#else
-	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#endif
-}
-	
-EWXWEXPORT(void, wxComboBox_SetTextSelection)(void* _obj, int from, int to)
-{
-	((wxComboBox*)_obj)->SetSelection(from, to);
-}
-	
-EWXWEXPORT(void, wxComboBox_SetEditable)(void* _obj, int editable)
-{
-	((wxComboBox*)_obj)->SetEditable(editable != 0);
-}
-	
-EWXWEXPORT(int, wxComboBox_GetStringSelection)(void* _obj, void* _buf)
-{
-        wxString result = ((wxComboBox*)_obj)->GetStringSelection();
-        return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxComboBox_GetValue)(void* _obj, void* _buf)
-{
-        wxString result = ((wxComboBox*)_obj)->GetValue();
-        return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxComboBox_Append)(void* _obj, wxChar* item)
-{
-	((wxComboBox*)_obj)->Append(item);
-#if wxVERSION_NUMBER < 2400
-	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#else
-	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#endif
-}
-	
-EWXWEXPORT(void, wxComboBox_AppendData)(void* _obj, wxChar* item, void* d)
-{
-#if defined(__WXMAC__)
-    ((wxComboBox*)_obj)->Append(item);
-#else
-    ((wxComboBox*)_obj)->Append(item, d);
-#endif
-
-#if wxVERSION_NUMBER < 2400
-	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#else
-	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#endif
-}
-	
-EWXWEXPORT(void, wxComboBox_Delete)(void* _obj, int n)
-{
-	((wxComboBox*)_obj)->Delete(n);
-#if wxVERSION_NUMBER < 2400
-	if ((((wxComboBox*)_obj)->Number()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#else
-	if ((((wxComboBox*)_obj)->GetCount()) && (((wxComboBox*)_obj)->GetSelection() == -1)) ((wxComboBox*)_obj)->SetSelection(0);
-#endif
-}
-	
-EWXWEXPORT(void, wxComboBox_Clear)(void* _obj)
-{
-	((wxComboBox*)_obj)->Clear();
-}
-	
-EWXWEXPORT(int, wxComboBox_GetCount)(void* _obj)
-{
-#if wxVERSION_NUMBER < 2400
-	return ((wxComboBox*)_obj)->Number();
-#else
-	return ((wxComboBox*)_obj)->GetCount();
-#endif
-}
-	
-EWXWEXPORT(int, wxComboBox_GetSelection)(void* _obj)
-{
-	return ((wxComboBox*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(void, wxComboBox_SetSelection)(void* _obj, int n)
-{
-	((wxComboBox*)_obj)->SetSelection(n);
-}
-	
-EWXWEXPORT(int, wxComboBox_FindString)(void* _obj, wxChar* s)
-{
-	return ((wxComboBox*)_obj)->FindString(s);
-}
-	
-EWXWEXPORT(int, wxComboBox_GetString)(void* _obj, int n, void* _buf)
-{
-        wxString result = ((wxComboBox*)_obj)->GetString(n);
-        return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxComboBox_SetString)(void* _obj, int n, char* s)
-{
-}
-	
-EWXWEXPORT(void, wxComboBox_SetClientData)(void* _obj, int n, void* clientData)
-{
-	((wxComboBox*)_obj)->SetClientData( n, clientData );
-}
-	
-EWXWEXPORT(void*, wxComboBox_GetClientData)(void* _obj, int n)
-{
-	return ((wxComboBox*)_obj)->GetClientData(n);
-}
-
-}
diff --git a/wxc/src/ewxw/eljcommand.cpp b/wxc/src/ewxw/eljcommand.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcommand.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-#include "wrapper.h"
-#include "wx/docview.h"
-
-extern "C"
-{
-
-typedef int _cdecl (*TGetResp) (void* _obj, int _und);
-
-}
-
-class ELJCommand : public wxCommand
-{
-	private:
-		TGetResp func;
-		void*    EiffelObject;
-	
-	public:
-		ELJCommand (bool _und, const wxString& _nme, void* _obj, void* _clb) : wxCommand(_und, _nme)
-		{
-			func = (TGetResp)_clb;
-			EiffelObject = _obj;
-		}
-		
-		bool Do()
-		{return func (EiffelObject, 0) != 0;}
-
-		bool Undo()
-		{return func (EiffelObject, 1) != 0;}
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*,ELJCommand_Create)(int _und, void* _nme, void* _obj, void* _clb)
-{
-	return (void*)new ELJCommand(_und != 0, (const char*)_nme, _obj, _clb);
-}
-
-EWXWEXPORT(void,ELJCommand_Delete)(void* _obj)
-{
-	delete (ELJCommand*)_obj;
-}
-
-EWXWEXPORT(int,ELJCommand_GetName)(void* _obj, void* _buf)
-{
-	return copyStrToBuf(_buf, ((ELJCommand*)_obj)->GetName());
-}
-
-EWXWEXPORT(int,ELJCommand_CanUndo)(void* _obj)
-{
-	return (int)((ELJCommand*)_obj)->CanUndo();
-}
-	
-
-EWXWEXPORT(void*,wxCommandProcessor_wxCommandProcessor)(int maxCommands)
-{
-	return (void*)new wxCommandProcessor(maxCommands);
-}
-	
-EWXWEXPORT(void,wxCommandProcessor_Delete)(void* _obj)
-{
-	delete (wxCommandProcessor*)_obj;
-}
-
-EWXWEXPORT(int,wxCommandProcessor_Submit)(void* _obj, void* command, int storeIt)
-{
-	return (int)((wxCommandProcessor*)_obj)->Submit((wxCommand*)command, storeIt != 0);
-}
-	
-EWXWEXPORT(int,wxCommandProcessor_Undo)(void* _obj)
-{
-	return (int)((wxCommandProcessor*)_obj)->Undo();
-}
-	
-EWXWEXPORT(int,wxCommandProcessor_Redo)(void* _obj)
-{
-	return (int)((wxCommandProcessor*)_obj)->Redo();
-}
-	
-EWXWEXPORT(int,wxCommandProcessor_CanUndo)(void* _obj)
-{
-	return (int)((wxCommandProcessor*)_obj)->CanUndo();
-}
-	
-EWXWEXPORT(int,wxCommandProcessor_CanRedo)(void* _obj)
-{
-	return (int)((wxCommandProcessor*)_obj)->CanRedo();
-}
-	
-EWXWEXPORT(void,wxCommandProcessor_SetEditMenu)(void* _obj, void* menu)
-{
-	((wxCommandProcessor*)_obj)->SetEditMenu((wxMenu*)menu);
-}
-	
-EWXWEXPORT(void*,wxCommandProcessor_GetEditMenu)(void* _obj)
-{
-	return (void*)((wxCommandProcessor*)_obj)->GetEditMenu();
-}
-	
-EWXWEXPORT(void,wxCommandProcessor_SetMenuStrings)(void* _obj)
-{
-	((wxCommandProcessor*)_obj)->SetMenuStrings();
-}
-	
-EWXWEXPORT(void,wxCommandProcessor_Initialize)(void* _obj)
-{
-	((wxCommandProcessor*)_obj)->Initialize();
-}
-	
-EWXWEXPORT(int,wxCommandProcessor_GetCommands)(void* _obj, void* _ref)
-{
-	wxList lst = ((wxCommandProcessor*)_obj)->GetCommands();
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < lst.GetCount(); i++)
-			((void**)_ref)[i] = (void*)lst.Item(i);
-	}
-	
-	return lst.GetCount();
-}
-	
-EWXWEXPORT(int,wxCommandProcessor_GetMaxCommands)(void* _obj)
-{
-	return ((wxCommandProcessor*)_obj)->GetMaxCommands();
-}
-	
-EWXWEXPORT(void,wxCommandProcessor_ClearCommands)(void* _obj)
-{
-	((wxCommandProcessor*)_obj)->ClearCommands();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljconfigbase.cpp b/wxc/src/ewxw/eljconfigbase.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljconfigbase.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxConfigBase_Create)()
-{
-	return (void*) wxConfigBase::Create();
-}
-	
-EWXWEXPORT(void, wxConfigBase_Delete)(void* _obj)
-{
-	delete (wxConfigBase*)_obj;
-}
-
-EWXWEXPORT(void, wxConfigBase_SetPath)(void* _obj, void* strPath)
-{
-	((wxConfigBase*)_obj)->SetPath((wxChar*) strPath);
-}
-	
-EWXWEXPORT(int, wxConfigBase_GetPath)(void* _obj, void* _buf)
-{
-	wxString result = ((wxConfigBase*)_obj)->GetPath();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(wxString*, wxConfigBase_GetFirstGroup)(wxConfigBase* _obj, long* lIndex)
-{
-	wxString* tmp;
-        tmp = new wxString(wxT(""));
-        if (_obj->GetFirstGroup(*tmp, *lIndex)) {
-          *lIndex = -1;
-        }         
-	return tmp;
-}
-	
-EWXWEXPORT(wxString*, wxConfigBase_GetNextGroup) (wxConfigBase* _obj, long* lIndex )
-{
-	wxString* tmp;
-        tmp = new wxString(wxT(""));
-        if (_obj->GetNextGroup(*tmp, *lIndex)) {
-          *lIndex = -1;
-        }         
-	return tmp;
-}
-
-	
-EWXWEXPORT(wxString*, wxConfigBase_GetFirstEntry)(wxConfigBase* _obj, long* lIndex)
-{
-	wxString* tmp;
-        tmp = new wxString(wxT(""));
-        if (_obj->GetFirstEntry(*tmp, *lIndex)) {
-          *lIndex = -1;
-        }         
-	return tmp;
-}
-	
-EWXWEXPORT(wxString*, wxConfigBase_GetNextEntry) (wxConfigBase* _obj, long* lIndex)
-{
-	wxString* tmp;
-        tmp = new wxString(wxT(""));
-        if (_obj->GetNextEntry(*tmp, *lIndex)) {
-          *lIndex = -1;
-        }         
-	return tmp;
-}
-	
-EWXWEXPORT(int, wxConfigBase_GetNumberOfEntries)(void* _obj, int bRecursive)
-{
-	return (int)((wxConfigBase*)_obj)->GetNumberOfEntries(bRecursive != 0);
-}
-	
-EWXWEXPORT(int, wxConfigBase_GetNumberOfGroups)(void* _obj, int bRecursive)
-{
-	return (int)((wxConfigBase*)_obj)->GetNumberOfGroups(bRecursive != 0);
-}
-	
-EWXWEXPORT(int, wxConfigBase_HasGroup)(void* _obj, void* strName)
-{
-	return (int)((wxConfigBase*)_obj)->HasGroup((wxChar*)strName);
-}
-	
-EWXWEXPORT(int, wxConfigBase_HasEntry)(void* _obj, void* strName)
-{
-	return (int)((wxConfigBase*)_obj)->HasEntry((wxChar*)strName);
-}
-	
-EWXWEXPORT(int, wxConfigBase_Exists)(void* _obj, void* strName)
-{
-	return (int)((wxConfigBase*)_obj)->Exists((wxChar*)strName);
-}
-	
-EWXWEXPORT(int, wxConfigBase_GetEntryType)(void* _obj, void* name)
-{
-	return (int)((wxConfigBase*)_obj)->GetEntryType((wxChar*)name);
-}
-	
-EWXWEXPORT(wxString*, wxConfigBase_ReadString)(wxConfigBase* _obj, void* key, void* defVal)
-{
-	wxString tmp;
-        tmp = ((wxConfigBase*)_obj)->Read((wxChar*)key, (wxChar*)defVal);
-	return new wxString(tmp);
-}
-	
-EWXWEXPORT(int, wxConfigBase_ReadInteger)(void* _obj, void* key, int defVal)
-{
-	return ((wxConfigBase*)_obj)->Read((wxChar*)key, defVal);
-}
-	
-EWXWEXPORT(double, wxConfigBase_ReadDouble)(void* _obj, void* key, double defVal)
-{
-    double val;
-	if (((wxConfigBase*)_obj)->Read((wxChar*) key, &val, defVal))
- 		return val;
- 	return 0.0;
-}
-	
-EWXWEXPORT(int, wxConfigBase_ReadBool)(void* _obj, void* key, int defVal)
-{
-	bool val;
-	if (((wxConfigBase*)_obj)->Read((wxChar*) key, &val, defVal != 0))
-		return (int)val;
-	return 0;
-}
-	
-EWXWEXPORT(int, wxConfigBase_WriteString)(void* _obj, void* key, void* value)
-{
-	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, (wxChar*)value);
-}
-	
-EWXWEXPORT(int, wxConfigBase_WriteInteger)(void* _obj, void* key, int value)
-{
-	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, (long)value);
-}
-	
-EWXWEXPORT(int, wxConfigBase_WriteDouble)(void* _obj, void* key, double value)
-{
-	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, value);
-}
-	
-EWXWEXPORT(int, wxConfigBase_WriteBool)(void* _obj, void* key, int value)
-{
-	return (int)((wxConfigBase*)_obj)->Write((wxChar*)key, value != 0);
-}
-	
-EWXWEXPORT(int, wxConfigBase_Flush)(void* _obj, int bCurrentOnly)
-{
-	return (int)((wxConfigBase*)_obj)->Flush(bCurrentOnly != 0);
-}
-	
-EWXWEXPORT(int, wxConfigBase_RenameEntry)(void* _obj, void* oldName, void* newName)
-{
-	return (int)((wxConfigBase*)_obj)->RenameEntry((wxChar*)oldName, (wxChar*)newName);
-}
-	
-EWXWEXPORT(int, wxConfigBase_RenameGroup)(void* _obj, void* oldName, void* newName)
-{
-	return (int)((wxConfigBase*)_obj)->RenameGroup((wxChar*)oldName, (wxChar*)newName);
-}
-	
-EWXWEXPORT(int, wxConfigBase_DeleteEntry)(void* _obj, void* key, int bDeleteGroupIfEmpty)
-{
-	return (int)((wxConfigBase*)_obj)->DeleteEntry((wxChar*)key, bDeleteGroupIfEmpty != 0);
-}
-	
-EWXWEXPORT(int, wxConfigBase_DeleteGroup)(void* _obj, void* key)
-{
-	return (int)((wxConfigBase*)_obj)->DeleteGroup((wxChar*)key);
-}
-	
-EWXWEXPORT(int, wxConfigBase_DeleteAll)(void* _obj)
-{
-	return (int)((wxConfigBase*)_obj)->DeleteAll();
-}
-	
-EWXWEXPORT(int, wxConfigBase_IsExpandingEnvVars)(void* _obj)
-{
-	return (int)((wxConfigBase*)_obj)->IsExpandingEnvVars();
-}
-	
-EWXWEXPORT(void, wxConfigBase_SetExpandEnvVars)(void* _obj, int bDoIt)
-{
-	((wxConfigBase*)_obj)->SetExpandEnvVars(bDoIt != 0);
-}
-	
-EWXWEXPORT(void, wxConfigBase_SetRecordDefaults)(void* _obj, int bDoIt)
-{
-	((wxConfigBase*)_obj)->SetRecordDefaults(bDoIt != 0);
-}
-	
-EWXWEXPORT(int, wxConfigBase_IsRecordingDefaults)(void* _obj)
-{
-	return (int)((wxConfigBase*)_obj)->IsRecordingDefaults();
-}
-	
-EWXWEXPORT(int, wxConfigBase_ExpandEnvVars)(void* _obj, void* str, void* _buf)
-{
-	wxString result = ((wxConfigBase*)_obj)->ExpandEnvVars((wxChar*)str);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxConfigBase_GetAppName)(void* _obj, void* _buf)
-{
-	wxString result = ((wxConfigBase*)_obj)->GetAppName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxConfigBase_GetVendorName)(void* _obj, void* _buf)
-{
-	wxString result = ((wxConfigBase*)_obj)->GetVendorName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxConfigBase_SetAppName)(void* _obj, void* appName)
-{
-	((wxConfigBase*)_obj)->SetAppName((wxChar*)appName);
-}
-	
-EWXWEXPORT(void, wxConfigBase_SetVendorName)(void* _obj, void* vendorName)
-{
-	((wxConfigBase*)_obj)->SetVendorName((wxChar*)vendorName);
-}
-	
-EWXWEXPORT(void, wxConfigBase_SetStyle)(void* _obj, int style)
-{
-	((wxConfigBase*)_obj)->SetStyle((long)style);
-}
-	
-EWXWEXPORT(int, wxConfigBase_GetStyle)(void* _obj)
-{
-	return (int)((wxConfigBase*)_obj)->GetStyle();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljcontrol.cpp b/wxc/src/ewxw/eljcontrol.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcontrol.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void, wxControl_SetLabel)(void* _obj, wxChar* text)
-{
-	((wxControl*)_obj)->SetLabel(text);
-}
-	
-EWXWEXPORT(int, wxControl_GetLabel)(void* _obj, void* _buf)
-{
-	wxString result = ((wxControl*)_obj)->GetLabel();
-	return copyStrToBuf(_buf, result); 
-}
-
-EWXWEXPORT(void, wxControl_Command)(void* _obj, void* event)
-{
-	((wxControl*)_obj)->Command(*((wxCommandEvent*) event));
-}
-
-}
diff --git a/wxc/src/ewxw/eljctxhelp.cpp b/wxc/src/ewxw/eljctxhelp.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljctxhelp.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-#include "wx/cshelp.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxContextHelp_Create)(void* win, int beginHelp)
-{
-	return (void*)new wxContextHelp((wxWindow*)win, beginHelp != 0);
-}
-	
-EWXWEXPORT(void,wxContextHelp_Delete)(void* _obj)
-{
-	delete (wxContextHelp*)_obj;
-}
-	
-EWXWEXPORT(int,wxContextHelp_BeginContextHelp)(void* _obj, void* win)
-{
-	return (int)((wxContextHelp*)_obj)->BeginContextHelp((wxWindow*)win);
-}
-	
-EWXWEXPORT(int,wxContextHelp_EndContextHelp)(void* _obj)
-{
-	return (int)((wxContextHelp*)_obj)->EndContextHelp();
-}
-	
-
-EWXWEXPORT(void*,wxContextHelpButton_Create)(void* parent, int id, int x, int y, int w, int h, long style)
-{
-	return (void*)new wxContextHelpButton((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), style);
-}
-
-
-EWXWEXPORT(void*,wxHelpProvider_Get)()
-{
-	return (void*)wxHelpProvider::Get();
-}
-	
-EWXWEXPORT(void*,wxHelpProvider_Set)(void* helpProvider)
-{
-	return (void*)wxHelpProvider::Set((wxHelpProvider*)helpProvider);
-}
-	
-EWXWEXPORT(int,wxHelpProvider_GetHelp)(void* _obj, void* window, void* _ref)
-{
-        wxString result = ((wxHelpProvider*)_obj)->GetHelp((wxWindowBase*)window);
-        return copyStrToBuf( _ref, result );
-}
-	
-EWXWEXPORT(int,wxHelpProvider_ShowHelp)(void* _obj, void* window)
-{
-	return (int)((wxHelpProvider*)_obj)->ShowHelp((wxWindowBase*)window);
-}
-	
-EWXWEXPORT(void,wxHelpProvider_AddHelp)(void* _obj, void* window, void* text)
-{
-	((wxHelpProvider*)_obj)->AddHelp((wxWindowBase*)window, (wxChar*)text);
-}
-	
-EWXWEXPORT(void,wxHelpProvider_AddHelpById)(void* _obj, int id, void* text)
-{
-	((wxHelpProvider*)_obj)->AddHelp((wxWindowID)id, (wxChar*)text);
-}
-	
-EWXWEXPORT(void,wxHelpProvider_RemoveHelp)(void* _obj, void* window)
-{
-	((wxHelpProvider*)_obj)->RemoveHelp((wxWindowBase*)window);
-}
-	
-EWXWEXPORT(void,wxHelpProvider_Delete)(void* _obj)
-{
-	delete (wxHelpProvider*)_obj;
-}
-
-
-EWXWEXPORT(void*,wxSimpleHelpProvider_Create)()
-{
-	return (void*)new wxSimpleHelpProvider();
-}
-	
-
-EWXWEXPORT(void*,wxHelpControllerHelpProvider_Create)(void* ctr)
-{
-	return (void*)new wxHelpControllerHelpProvider((wxHelpControllerBase*)ctr);
-}
-	
-EWXWEXPORT(void,wxHelpControllerHelpProvider_SetHelpController)(void* _obj, void* hc)
-{
-	((wxHelpControllerHelpProvider*)_obj)->SetHelpController((wxHelpControllerBase*)hc);
-}
-	
-EWXWEXPORT(void*,wxHelpControllerHelpProvider_GetHelpController)(void* _obj)
-{
-	return (void*)((wxHelpControllerHelpProvider*)_obj)->GetHelpController();
-}
-	
-}
-#endif
diff --git a/wxc/src/ewxw/eljcursor.cpp b/wxc/src/ewxw/eljcursor.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljcursor.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, Cursor_CreateFromStock)(int _id)
-{
-	return (void*) new wxCursor(_id);
-}
-
-EWXWEXPORT(void*, Cursor_CreateFromImage)(wxImage* image)
-{
-	return (void*) new wxCursor(*image);
-}
-
-EWXWEXPORT(void*, Cursor_CreateLoad) (const wxString* name, long type, int width, int height)
-{
-#ifdef __WXGTK__
-// See http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/45999
-	return NULL;
-#else
-	return (void*) new wxCursor(*name, type, width, height);
-#endif
-}
-
-}
diff --git a/wxc/src/ewxw/eljdataformat.cpp b/wxc/src/ewxw/eljdataformat.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdataformat.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxDataFormat_CreateFromId) (void* name)
-{
-	return (void*) new wxDataFormat ((wxChar*)name);
-}
-
-EWXWEXPORT(void*, wxDataFormat_CreateFromType) (int typ)
-{
-	return (void*) new wxDataFormat ((wxDataFormat::NativeFormat)typ);
-}
-
-EWXWEXPORT(void, wxDataFormat_Delete) (void* _obj)
-{
-	delete (wxDataFormat*)_obj;
-}
-
-EWXWEXPORT(int, wxDataFormat_IsEqual) (void* _obj, void* other)
-{
-	return (int) (*(wxDataFormat*)_obj == *(wxDataFormat*)other);
-}
-
-EWXWEXPORT(int, wxDataFormat_GetId) (void* _obj, void* _buf)
-{
-        wxString result = ((wxDataFormat*)_obj)->GetId();
-        return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(int, wxDataFormat_GetType) (void* _obj)
-{
-	return (int)((wxDataFormat*)_obj)->GetType();
-}
-
-EWXWEXPORT(void, wxDataFormat_SetId) (void* _obj, void* id)
-{
-	((wxDataFormat*)_obj)->SetId((wxChar*) id);
-}
-
-EWXWEXPORT(void, wxDataFormat_SetType) (void* _obj, int typ)
-{
-#ifdef __WIN32__
-	((wxDataFormat*)_obj)->SetType((wxDataFormat::NativeFormat)typ);
-#else
-	((wxDataFormat*)_obj)->SetType((wxDataFormatId)typ);
-#endif
-}
-
-}
diff --git a/wxc/src/ewxw/eljdatetime.cpp b/wxc/src/ewxw/eljdatetime.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdatetime.cpp
+++ /dev/null
@@ -1,478 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxDateTime_Create)()
-{
-	return (void*) new wxDateTime();
-}
-
-EWXWEXPORT(void, wxDateTime_SetCountry)(int country)
-{
-	wxDateTime::SetCountry((wxDateTime::Country)country);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetCountry)()
-{
-	return (int)wxDateTime::GetCountry();
-}
-	
-EWXWEXPORT(int, wxDateTime_IsWestEuropeanCountry)(int country)
-{
-	return (int)wxDateTime::IsWestEuropeanCountry((wxDateTime::Country)country);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetCurrentYear)(int cal)
-{
-	return wxDateTime::GetCurrentYear((wxDateTime::Calendar)cal);
-}
-	
-EWXWEXPORT(int, wxDateTime_ConvertYearToBC)(int year)
-{
-	return wxDateTime::ConvertYearToBC(year);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetCurrentMonth)(int cal)
-{
-	return (int)wxDateTime::GetCurrentMonth((wxDateTime::Calendar)cal);
-}
-	
-EWXWEXPORT(int, wxDateTime_IsLeapYear)(int year, int cal)
-{
-	return (int)wxDateTime::IsLeapYear(year, (wxDateTime::Calendar)cal);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetCentury)(int year)
-{
-	return wxDateTime::GetCentury(year);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetNumberOfDays)(int year, int cal)
-{
-	return (int)wxDateTime::GetNumberOfDays(year, (wxDateTime::Calendar)cal);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetNumberOfDaysMonth)(int month, int year, int cal)
-{
-	return wxDateTime::GetNumberOfDays((wxDateTime::Month)month, year, (wxDateTime::Calendar)cal);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetMonthName)(int month, int flags, void* _buf)
-{
-	wxString result = wxDateTime::GetMonthName((wxDateTime::Month)month, (wxDateTime::NameFlags)flags);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetWeekDayName)(int weekday, int flags, void* _buf)
-{
-	wxString result = wxDateTime::GetWeekDayName((wxDateTime::WeekDay)weekday, (wxDateTime::NameFlags)flags);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetAmString)(void* _buf)
-{
-	wxString am;
-	wxString pm;
-	wxDateTime::GetAmPmStrings(&am, &pm);
-	return copyStrToBuf(_buf, am);
-}
-	
-EWXWEXPORT(int, wxDateTime_GetPmString)(void* _buf)
-{
-	wxString am;
-	wxString pm;
-	wxDateTime::GetAmPmStrings(&am, &pm);
-	return copyStrToBuf(_buf, pm);
-}
-	
-EWXWEXPORT(int, wxDateTime_IsDSTApplicable)(int year, int country)
-{
-	return (int)wxDateTime::IsDSTApplicable(year, (wxDateTime::Country)country);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetBeginDST)(int year, int country, void* dt)
-{
-	*((wxDateTime*)dt) = wxDateTime::GetBeginDST(year, (wxDateTime::Country)country);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetEndDST)(int year, int country, void* dt)
-{
-	*((wxDateTime*)dt) = wxDateTime::GetEndDST(year, (wxDateTime::Country)country);
-}
-	
-EWXWEXPORT(void, wxDateTime_Now)(void* dt)
-{
-	*((wxDateTime*)dt) = wxDateTime::Now();
-}
-	
-EWXWEXPORT(void, wxDateTime_UNow)(void* dt)
-{
-	*((wxDateTime*)dt) = wxDateTime::UNow();
-}
-	
-EWXWEXPORT(void, wxDateTime_Today)(void* dt)
-{
-	*((wxDateTime*)dt) = wxDateTime::Today();
-}
-	
-EWXWEXPORT(void, wxDateTime_SetToCurrent)(void* _obj)
-{
-	((wxDateTime*)_obj)->SetToCurrent();
-}
-	
-EWXWEXPORT(void, wxDateTime_SetTime)(void* _obj, int hour, int minute, int second, int millisec)
-{
-	((wxDateTime*)_obj)->Set((wxDateTime::wxDateTime_t)hour, (wxDateTime::wxDateTime_t)minute, (wxDateTime::wxDateTime_t)second, (wxDateTime::wxDateTime_t)millisec);
-}
-	
-EWXWEXPORT(void, wxDateTime_Set)(void* _obj, int day, int month, int year, int hour,  int minute, int second, int millisec)
-{
-	((wxDateTime*)_obj)->Set((wxDateTime::wxDateTime_t)day, (wxDateTime::Month)month, year, (wxDateTime::wxDateTime_t)hour,  (wxDateTime::wxDateTime_t)minute, (wxDateTime::wxDateTime_t)second, (wxDateTime::wxDateTime_t)millisec);
-}
-	
-EWXWEXPORT(void, wxDateTime_ResetTime)(void* _obj)
-{
-	((wxDateTime*)_obj)->ResetTime();
-}
-	
-EWXWEXPORT(void, wxDateTime_SetYear)(void* _obj, int year)
-{
-	((wxDateTime*)_obj)->SetYear(year);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetMonth)(void* _obj, int month)
-{
-	((wxDateTime*)_obj)->SetMonth((wxDateTime::Month)month);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetDay)(void* _obj, int day)
-{
-	((wxDateTime*)_obj)->SetDay((wxDateTime::wxDateTime_t)day);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetHour)(void* _obj, int hour)
-{
-	((wxDateTime*)_obj)->SetHour((wxDateTime::wxDateTime_t)hour);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetMinute)(void* _obj, int minute)
-{
-	((wxDateTime*)_obj)->SetMinute((wxDateTime::wxDateTime_t)minute);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetSecond)(void* _obj, int second)
-{
-	((wxDateTime*)_obj)->SetSecond((wxDateTime::wxDateTime_t)second);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetMillisecond)(void* _obj, int millisecond)
-{
-	((wxDateTime*)_obj)->SetMillisecond((wxDateTime::wxDateTime_t)millisecond);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetToWeekDayInSameWeek)(void* _obj, int weekday)
-{
-	((wxDateTime*)_obj)->SetToWeekDayInSameWeek((wxDateTime::WeekDay)weekday);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetWeekDayInSameWeek)(void* _obj, int weekday, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetWeekDayInSameWeek((wxDateTime::WeekDay)weekday);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetToNextWeekDay)(void* _obj, int weekday)
-{
-	((wxDateTime*)_obj)->SetToNextWeekDay((wxDateTime::WeekDay)weekday);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetNextWeekDay)(void* _obj, int weekday, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetNextWeekDay((wxDateTime::WeekDay)weekday);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetToPrevWeekDay)(void* _obj, int weekday)
-{
-	((wxDateTime*)_obj)->SetToPrevWeekDay((wxDateTime::WeekDay)weekday);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetPrevWeekDay)(void* _obj, int weekday, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetPrevWeekDay((wxDateTime::WeekDay)weekday);
-}
-	
-EWXWEXPORT(int, wxDateTime_SetToWeekDay)(void* _obj, int weekday, int n, int month, int year)
-{
-	return (int)((wxDateTime*)_obj)->SetToWeekDay((wxDateTime::WeekDay)weekday, n, (wxDateTime::Month)month, year);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetWeekDay)(void* _obj, int weekday, int n, int month, int year, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetWeekDay((wxDateTime::WeekDay)weekday, n, (wxDateTime::Month)month, year);
-}
-	
-EWXWEXPORT(int, wxDateTime_SetToLastWeekDay)(void* _obj, int weekday, int month, int year)
-{
-	return (int)((wxDateTime*)_obj)->SetToLastWeekDay((wxDateTime::WeekDay)weekday, (wxDateTime::Month)month, year);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetLastWeekDay)(void* _obj, int weekday, int month, int year, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetLastWeekDay((wxDateTime::WeekDay)weekday, (wxDateTime::Month)month, year);
-}
-	
-EWXWEXPORT(void, wxDateTime_SetToLastMonthDay)(void* _obj, int month, int year)
-{
-	((wxDateTime*)_obj)->SetToLastMonthDay((wxDateTime::Month)month, year);
-}
-	
-EWXWEXPORT(void, wxDateTime_GetLastMonthDay)(void* _obj, int month, int year, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->GetLastMonthDay((wxDateTime::Month)month, year);
-}
-	
-EWXWEXPORT(void, wxDateTime_ToTimezone)(void* _obj, int tz, int noDST)
-{
-	((wxDateTime*)_obj)->ToTimezone(wxDateTime::TimeZone((wxDateTime::TZ)tz), noDST != 0);
-}
-	
-EWXWEXPORT(void, wxDateTime_MakeTimezone)(void* _obj, int tz, int noDST)
-{
-	((wxDateTime*)_obj)->MakeTimezone(wxDateTime::TimeZone((wxDateTime::TZ)tz), noDST != 0);
-}
-	
-EWXWEXPORT(void, wxDateTime_ToGMT)(void* _obj, int noDST)
-{
-	((wxDateTime*)_obj)->ToGMT(noDST != 0);
-}
-	
-EWXWEXPORT(void, wxDateTime_MakeGMT)(void* _obj, int noDST)
-{
-	((wxDateTime*)_obj)->MakeGMT(noDST != 0);
-}
-	
-EWXWEXPORT(int, wxDateTime_IsDST)(void* _obj, int country)
-{
-	return ((wxDateTime*)_obj)->IsDST((wxDateTime::Country)country);
-}
-	
-EWXWEXPORT(int, wxDateTime_IsValid)(void* _obj)
-{
-	return (int)((wxDateTime*)_obj)->IsValid();
-}
-	
-EWXWEXPORT(time_t, wxDateTime_GetTicks)(void* _obj)
-{
-	return ((wxDateTime*)_obj)->GetTicks();
-}
-	
-EWXWEXPORT(int, wxDateTime_GetYear)(void* _obj, int tz)
-{
-	return ((wxDateTime*)_obj)->GetYear(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetMonth)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetMonth(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetDay)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetDay(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetWeekDayTZ)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetWeekDay(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetHour)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetHour(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetMinute)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetMinute(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetSecond)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetSecond(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetMillisecond)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetMillisecond(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetDayOfYear)(void* _obj, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetDayOfYear(wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetWeekOfYear)(void* _obj, int flags, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetWeekOfYear((wxDateTime::WeekFlags)flags, wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_GetWeekOfMonth)(void* _obj, int flags, int tz)
-{
-	return (int)((wxDateTime*)_obj)->GetWeekOfMonth((wxDateTime::WeekFlags)flags, wxDateTime::TimeZone((wxDateTime::TZ)tz));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsWorkDay)(void* _obj, int country)
-{
-	return (int)((wxDateTime*)_obj)->IsWorkDay((wxDateTime::Country)country);
-}
-	
-/*
-EWXWEXPORT(int, wxDateTime_IsGregorianDate)(void* _obj, int country)
-{
-	return (int)((wxDateTime*)_obj)->IsGregorianDate((wxDateTime::GregorianAdoption)country);
-}
-*/
-	
-EWXWEXPORT(int, wxDateTime_IsEqualTo)(void* _obj, void* datetime)
-{
-	return (int)((wxDateTime*)_obj)->IsEqualTo(*((wxDateTime*)datetime));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsEarlierThan)(void* _obj, void* datetime)
-{
-	return (int)((wxDateTime*)_obj)->IsEarlierThan(*((wxDateTime*)datetime));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsLaterThan)(void* _obj, void* datetime)
-{
-	return (int)((wxDateTime*)_obj)->IsLaterThan(*((wxDateTime*)datetime));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsStrictlyBetween)(void* _obj, void* t1, void* t2)
-{
-	return (int)((wxDateTime*)_obj)->IsStrictlyBetween(*((wxDateTime*)t1), *((wxDateTime*)t2));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsBetween)(void* _obj, void* t1, void* t2)
-{
-	return (int)((wxDateTime*)_obj)->IsBetween(*((wxDateTime*)t1), *((wxDateTime*)t2));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsSameDate)(void* _obj, void* dt)
-{
-	return (int)((wxDateTime*)_obj)->IsSameDate(*((wxDateTime*)dt));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsSameTime)(void* _obj, void* dt)
-{
-	return (int)((wxDateTime*)_obj)->IsSameTime(*((wxDateTime*)dt));
-}
-	
-EWXWEXPORT(int, wxDateTime_IsEqualUpTo)(void* _obj, void* dt, void* ts)
-{
-	return (int)((wxDateTime*)_obj)->IsEqualUpTo(*((wxDateTime*)dt), *((wxTimeSpan*)ts));
-}
-	
-EWXWEXPORT(void, wxDateTime_AddTime)(void* _obj,  void* diff, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Add(*((wxTimeSpan*)diff));
-}
-	
-EWXWEXPORT(void, wxDateTime_SubtractTime)(void* _obj, void* diff, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Subtract(*((wxTimeSpan*)diff));
-}
-	
-EWXWEXPORT(void, wxDateTime_AddDate)(void* _obj, void* diff, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Add(*((wxDateSpan*)diff));
-}
-	
-EWXWEXPORT(void, wxDateTime_SubtractDate)(void* _obj, void* diff, void* _ref)
-{
-	*((wxDateTime*)_ref) = ((wxDateTime*)_obj)->Subtract(*((wxDateSpan*)diff));
-}
-	
-EWXWEXPORT(void*, wxDateTime_ParseRfc822Date)(void* _obj, void* date)
-{
-	return (void*)((wxDateTime*)_obj)->ParseRfc822Date((const wxChar*)date);
-}
-	
-EWXWEXPORT(void*, wxDateTime_ParseFormat)(void* _obj, void* date, void* format, void* dateDef)
-{
-	return (void*)((wxDateTime*)_obj)->ParseFormat((const wxChar*)date, (const wxChar*)format, *((wxDateTime*)dateDef));
-}
-	
-EWXWEXPORT(void*, wxDateTime_ParseDateTime)(void* _obj, void* datetime)
-{
-	return (void*)((wxDateTime*)_obj)->ParseDateTime((const wxChar*)datetime);
-}
-	
-EWXWEXPORT(void*, wxDateTime_ParseDate)(void* _obj, void* date)
-{
-	return (void*)((wxDateTime*)_obj)->ParseDate((const wxChar*)date);
-}
-	
-EWXWEXPORT(void*, wxDateTime_ParseTime)(void* _obj, void* time)
-{
-	return (void*)((wxDateTime*)_obj)->ParseTime((const wxChar*)time);
-}
-	
-EWXWEXPORT(int, wxDateTime_Format)(void* _obj, void* format, int tz, void* _buf)
-{
-	wxString result = ((wxDateTime*)_obj)->Format((const wxChar*)format, wxDateTime::TimeZone((wxDateTime::TZ)tz));
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDateTime_FormatDate)(void* _obj, void* _buf)
-{
-	wxString result = ((wxDateTime*)_obj)->FormatDate();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDateTime_FormatTime)(void* _obj, void* _buf)
-{
-	wxString result = ((wxDateTime*)_obj)->FormatTime();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDateTime_FormatISODate)(void* _obj, void* _buf)
-{
-	wxString result = ((wxDateTime*)_obj)->FormatISODate();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDateTime_FormatISOTime)(void* _obj, void* _buf)
-{
-	wxString result = ((wxDateTime*)_obj)->FormatISOTime();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void*, wxDateTime_wxDateTime)(long hi_long, unsigned long lo_long)
-{
-	return (void*) new wxDateTime(wxLongLong(hi_long, lo_long));
-}
-	
-EWXWEXPORT(void, wxDateTime_GetValue)(void* _obj, long* hi_long, unsigned long* lo_long)
-{
-	wxLongLong val = ((wxDateTime*)_obj)->GetValue();
-	*hi_long = val.GetHi();
-	*lo_long = val.GetLo();
-}
-	
-EWXWEXPORT(int, wxDateTime_GetTimeNow)()
-{
-	return (int)wxDateTime::GetTimeNow();
-}
-	
-EWXWEXPORT(void, wxDateTime_AddTimeValues)(void* _obj,  int _hrs, int _min, int _sec, int _mls)
-{
-	((wxDateTime*)_obj)->Add(wxTimeSpan((long)_hrs, (long)_min, (long)_sec, (long)_mls));
-}
-	
-EWXWEXPORT(void, wxDateTime_AddDateValues)(void* _obj,  int _yrs, int _mnt, int _wek, int _day)
-{
-	((wxDateTime*)_obj)->Add(wxDateSpan((long)_yrs, (long)_mnt, (long)_wek, (long)_day));
-}
-	
-}
diff --git a/wxc/src/ewxw/eljdc.cpp b/wxc/src/ewxw/eljdc.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdc.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-#include "wrapper.h"
-#include "wx/metafile.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void, wxDC_Delete) (void* _obj)
-{
-	delete (wxDC*) _obj;
-}
-
-EWXWEXPORT(void, wxDC_BeginDrawing)(void* _obj)
-{
-	((wxDC*)_obj)->BeginDrawing();
-}
-	
-EWXWEXPORT(void, wxDC_EndDrawing)(void* _obj)
-{
-	((wxDC*)_obj)->EndDrawing();
-}
-	
-EWXWEXPORT(void, wxDC_FloodFill)(void* _obj, int x, int y, void* col, int style)
-{
-	((wxDC*)_obj)->FloodFill((wxCoord)x, (wxCoord)y, *((wxColour*)col), style);
-}
-	
-EWXWEXPORT(int, wxDC_GetPixel)(void* _obj, int x, int y, void* col)
-{
-	return ((wxDC*)_obj)->GetPixel((wxCoord)x, (wxCoord)y, (wxColour*)col);
-}
-	
-EWXWEXPORT(void, wxDC_DrawLine)(void* _obj, int x1, int y1, int x2, int y2)
-{
-	((wxDC*)_obj)->DrawLine((wxCoord)x1, (wxCoord)y1, (wxCoord)x2, (wxCoord)y2);
-}
-	
-EWXWEXPORT(void, wxDC_CrossHair)(void* _obj, int x, int y)
-{
-	((wxDC*)_obj)->CrossHair((wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(void, wxDC_DrawArc)(void* _obj, int x1, int y1, int x2, int y2, int xc, int yc)
-{
-	((wxDC*)_obj)->DrawArc((wxCoord)x1, (wxCoord)y1, (wxCoord)x2, (wxCoord)y2, (wxCoord)xc, (wxCoord)yc);
-}
-	
-EWXWEXPORT(void, wxDC_DrawCheckMark)(void* _obj, int x, int y, int width, int height)
-{
-	((wxDC*)_obj)->DrawCheckMark((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(void, wxDC_DrawEllipticArc)(void* _obj, int x, int y, int w, int h, double sa, double ea)
-{
-	((wxDC*)_obj)->DrawEllipticArc((wxCoord)x, (wxCoord)y, (wxCoord)w, (wxCoord)h, sa, ea);
-}
-	
-EWXWEXPORT(void, wxDC_DrawPoint)(void* _obj, int x, int y)
-{
-	((wxDC*)_obj)->DrawPoint((wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(void, wxDC_DrawLines)(void* _obj, int n, void* x, void* y, int xoffset, int yoffset)
-{
-	wxPoint* lst = (wxPoint*)malloc (n * sizeof(wxPoint));
-	
-	for (int i = 0; i < n; i++)
-		lst[i] = wxPoint((int)((intptr_t*)x)[i], (int)((intptr_t*)y)[i]);
-	
-	((wxDC*)_obj)->DrawLines(n, lst, (wxCoord)xoffset, (wxCoord)yoffset);
-	
-	free (lst);
-}
-	
-EWXWEXPORT(void, wxDC_DrawPolygon)(void* _obj, int n, void* x, void* y, int xoffset, int yoffset, int fillStyle)
-{
-	wxPoint* lst = (wxPoint*)malloc (n * sizeof(wxPoint));
-	
-	for (int i = 0; i < n; i++)
-		lst[i] = wxPoint(((intptr_t*)x)[i], ((intptr_t*)y)[i]);
-	
-	((wxDC*)_obj)->DrawPolygon(n, lst, (wxCoord)xoffset, (wxCoord)yoffset, fillStyle);
-	
-	free (lst);
-}
-	
-EWXWEXPORT(void, wxDC_DrawRectangle)(void* _obj, int x, int y, int width, int height)
-{
-	((wxDC*)_obj)->DrawRectangle((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(void, wxDC_DrawRoundedRectangle)(void* _obj, int x, int y, int width, int height, double radius)
-{
-	((wxDC*)_obj)->DrawRoundedRectangle((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height, radius);
-}
-	
-EWXWEXPORT(void, wxDC_DrawCircle)(void* _obj, int x, int y, int radius)
-{
-	((wxDC*)_obj)->DrawCircle((wxCoord)x, (wxCoord)y, (wxCoord)radius);
-}
-	
-EWXWEXPORT(void, wxDC_DrawEllipse)(void* _obj, int x, int y, int width, int height)
-{
-	((wxDC*)_obj)->DrawEllipse((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(void, wxDC_DrawIcon)(void* _obj, void* icon, int x, int y)
-{
-	((wxDC*)_obj)->DrawIcon(*((wxIcon*)icon), (wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(void, wxDC_DrawBitmap)(void* _obj, void* bmp, int x, int y, int useMask)
-{
-	((wxDC*)_obj)->DrawBitmap(*((wxBitmap*)bmp), (wxCoord)x, (wxCoord)y, useMask != 0);
-}
-	
-EWXWEXPORT(void, wxDC_DrawText)(void* _obj, void* text, int x, int y)
-{
-	((wxDC*)_obj)->DrawText((wxChar*)text, (wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(void, wxDC_DrawRotatedText)(void* _obj, void* text, int x, int y, double angle)
-{
-	((wxDC*)_obj)->DrawRotatedText((wxChar*)text, (wxCoord)x, (wxCoord)y, angle);
-}
-	
-EWXWEXPORT(int, wxDC_Blit)(void* _obj, int xdest, int ydest, int width, int height, void* source, int xsrc, int ysrc, int rop, int useMask)
-{
-	return (int)((wxDC*)_obj)->Blit((wxCoord)xdest, (wxCoord)ydest, (wxCoord)width, (wxCoord)height, (wxDC*)source, (wxCoord)xsrc, (wxCoord)ysrc, rop, useMask != 0);
-}
-	
-EWXWEXPORT(void, wxDC_Clear)(void* _obj)
-{
-	((wxDC*)_obj)->Clear();
-}
-	
-EWXWEXPORT(int, wxDC_StartDoc)(void* _obj, void* msg)
-{
-	return (int)((wxDC*)_obj)->StartDoc((wxChar*)msg);
-}
-	
-EWXWEXPORT(void, wxDC_EndDoc)(void* _obj)
-{
-	((wxDC*)_obj)->EndDoc();
-}
-	
-EWXWEXPORT(void, wxDC_StartPage)(void* _obj)
-{
-	((wxDC*)_obj)->StartPage();
-}
-	
-EWXWEXPORT(void, wxDC_EndPage)(void* _obj)
-{
-	((wxDC*)_obj)->EndPage();
-}
-	
-EWXWEXPORT(void, wxDC_SetFont)(void* _obj, void* font)
-{
-	((wxDC*)_obj)->SetFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(void, wxDC_SetPen)(void* _obj, void* pen)
-{
-	((wxDC*)_obj)->SetPen(*((wxPen*)pen));
-}
-	
-EWXWEXPORT(void, wxDC_SetBrush)(void* _obj, void* brush)
-{
-	((wxDC*)_obj)->SetBrush(*((wxBrush*)brush));
-}
-	
-EWXWEXPORT(void, wxDC_SetBackground)(void* _obj, void* brush)
-{
-	((wxDC*)_obj)->SetBackground(*((wxBrush*)brush));
-}
-	
-EWXWEXPORT(void, wxDC_SetBackgroundMode)(void* _obj, int mode)
-{
-	((wxDC*)_obj)->SetBackgroundMode(mode);
-}
-	
-EWXWEXPORT(void, wxDC_SetPalette)(void* _obj, void* palette)
-{
-	((wxDC*)_obj)->SetPalette(*((wxPalette*)palette));
-}
-	
-EWXWEXPORT(void, wxDC_SetClippingRegion)(void* _obj, int x, int y, int width, int height)
-{
-	((wxDC*)_obj)->SetClippingRegion((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(void, wxDC_SetClippingRegionFromRegion)(void* _obj, void* region)
-{
-	((wxDC*)_obj)->SetClippingRegion(*((wxRegion*)region));
-}
-	
-EWXWEXPORT(void, wxDC_DestroyClippingRegion)(void* _obj)
-{
-	((wxDC*)_obj)->DestroyClippingRegion();
-}
-	
-EWXWEXPORT(void, wxDC_GetClippingBox)(void* _obj, void* x, void* y, void* w, void* h)
-{
-	((wxDC*)_obj)->GetClippingBox((wxCoord*)x, (wxCoord*)y, (wxCoord*)w, (wxCoord*)h);
-}
-	
-EWXWEXPORT(int, wxDC_GetCharHeight)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->GetCharHeight();
-}
-	
-EWXWEXPORT(int, wxDC_GetCharWidth)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->GetCharWidth();
-}
-	
-EWXWEXPORT(void, wxDC_GetTextExtent)(void* _obj, void* string, void* x, void* y, void* descent, void* externalLeading, void* theFont)
-{
-	((wxDC*)_obj)->GetTextExtent((wxChar*)string, (wxCoord*)x, (wxCoord*)y, (wxCoord*)descent, (wxCoord*)externalLeading, (wxFont*)theFont);
-}
-	
-EWXWEXPORT(void, wxDC_GetSize)(void* _obj, void* width, void* height)
-{
-	((wxDC*)_obj)->GetSize((int*)width, (int*)height);
-}
-	
-EWXWEXPORT(void, wxDC_GetSizeMM)(void* _obj, void* width, void* height)
-{
-	((wxDC*)_obj)->GetSizeMM((int*)width, (int*)height);
-}
-	
-EWXWEXPORT(int, wxDC_DeviceToLogicalX)(void* _obj, int x)
-{
-	return (int)((wxDC*)_obj)->DeviceToLogicalX((wxCoord)x);
-}
-	
-EWXWEXPORT(int, wxDC_DeviceToLogicalY)(void* _obj, int y)
-{
-	return (int)((wxDC*)_obj)->DeviceToLogicalY((wxCoord)y);
-}
-	
-EWXWEXPORT(int, wxDC_DeviceToLogicalXRel)(void* _obj, int x)
-{
-	return (int)((wxDC*)_obj)->DeviceToLogicalXRel((wxCoord)x);
-}
-	
-EWXWEXPORT(int, wxDC_DeviceToLogicalYRel)(void* _obj, int y)
-{
-	return (int)((wxDC*)_obj)->DeviceToLogicalYRel((wxCoord)y);
-}
-	
-EWXWEXPORT(int, wxDC_LogicalToDeviceX)(void* _obj, int x)
-{
-	return (int)((wxDC*)_obj)->LogicalToDeviceX((wxCoord)x);
-}
-	
-EWXWEXPORT(int, wxDC_LogicalToDeviceY)(void* _obj, int y)
-{
-	return (int)((wxDC*)_obj)->LogicalToDeviceY((wxCoord)y);
-}
-	
-EWXWEXPORT(int, wxDC_LogicalToDeviceXRel)(void* _obj, int x)
-{
-	return (int)((wxDC*)_obj)->LogicalToDeviceXRel((wxCoord)x);
-}
-	
-EWXWEXPORT(int, wxDC_LogicalToDeviceYRel)(void* _obj, int y)
-{
-	return (int)((wxDC*)_obj)->LogicalToDeviceYRel((wxCoord)y);
-}
-	
-EWXWEXPORT(int, wxDC_CanDrawBitmap)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->CanDrawBitmap();
-}
-	
-EWXWEXPORT(int, wxDC_CanGetTextExtent)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->CanGetTextExtent();
-}
-	
-EWXWEXPORT(int, wxDC_GetDepth)(void* _obj)
-{
-	return ((wxDC*)_obj)->GetDepth();
-}
-	
-EWXWEXPORT(void, wxDC_GetPPI)(void* _obj, void* width, void* height)
-{
-	wxSize result = ((wxDC*)_obj)->GetPPI();
-	*((int*)width)  = result.x;
-	*((int*)height) = result.y;
-}
-	
-EWXWEXPORT(int, wxDC_Ok)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->Ok();
-}
-	
-EWXWEXPORT(int, wxDC_GetBackgroundMode)(void* _obj)
-{
-	return ((wxDC*)_obj)->GetBackgroundMode();
-}
-	
-EWXWEXPORT(void, wxDC_GetBackground)(void* _obj, void* _ref)
-{
-	*((wxBrush*)_ref) = ((wxDC*)_obj)->GetBackground();
-}
-	
-EWXWEXPORT(void, wxDC_GetBrush)(void* _obj, void* _ref)
-{
-	*((wxBrush*)_ref) = ((wxDC*)_obj)->GetBrush();
-}
-	
-EWXWEXPORT(void, wxDC_GetFont)(void* _obj, void* _ref)
-{
-	*((wxFont*)_ref) = ((wxDC*)_obj)->GetFont();
-}
-	
-EWXWEXPORT(void, wxDC_GetPen)(void* _obj, void* _ref)
-{
-	*((wxPen*)_ref) = ((wxDC*)_obj)->GetPen();
-}
-	
-EWXWEXPORT(void, wxDC_GetTextBackground)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxDC*)_obj)->GetTextBackground();
-}
-	
-EWXWEXPORT(void, wxDC_GetTextForeground)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxDC*)_obj)->GetTextForeground();
-}
-	
-EWXWEXPORT(void, wxDC_SetTextForeground)(void* _obj, void* colour)
-{
-	((wxDC*)_obj)->SetTextForeground(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxDC_SetTextBackground)(void* _obj, void* colour)
-{
-	((wxDC*)_obj)->SetTextBackground(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(int, wxDC_GetMapMode)(void* _obj)
-{
-	return ((wxDC*)_obj)->GetMapMode();
-}
-	
-EWXWEXPORT(void, wxDC_SetMapMode)(void* _obj, int mode)
-{
-	((wxDC*)_obj)->SetMapMode(mode);
-}
-	
-EWXWEXPORT(void, wxDC_GetUserScale)(void* _obj, void* x, void* y)
-{
-	((wxDC*)_obj)->GetUserScale((double*)x, (double*)y);
-}
-	
-EWXWEXPORT(void, wxDC_SetUserScale)(void* _obj, double x, double y)
-{
-	((wxDC*)_obj)->SetUserScale(x, y);
-}
-	
-EWXWEXPORT(void, wxDC_GetLogicalScale)(void* _obj, void* x, void* y)
-{
-	((wxDC*)_obj)->GetLogicalScale((double*)x, (double*)y);
-}
-	
-EWXWEXPORT(void, wxDC_SetLogicalScale)(void* _obj, double x, double y)
-{
-	((wxDC*)_obj)->SetLogicalScale(x, y);
-}
-	
-EWXWEXPORT(void, wxDC_GetLogicalOrigin)(void* _obj, void* x, void* y)
-{
-	((wxDC*)_obj)->GetLogicalOrigin((wxCoord*)x, (wxCoord*)y);
-}
-	
-EWXWEXPORT(void, wxDC_SetLogicalOrigin)(void* _obj, int x, int y)
-{
-	((wxDC*)_obj)->SetLogicalOrigin((wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(void, wxDC_GetDeviceOrigin)(void* _obj, void* x, void* y)
-{
-	((wxDC*)_obj)->GetDeviceOrigin((wxCoord*)x, (wxCoord*)y);
-}
-	
-EWXWEXPORT(void, wxDC_SetDeviceOrigin)(void* _obj, int x, int y)
-{
-	((wxDC*)_obj)->SetDeviceOrigin((wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(void, wxDC_SetAxisOrientation)(void* _obj, int xLeftRight, int yBottomUp)
-{
-	((wxDC*)_obj)->SetAxisOrientation(xLeftRight != 0, yBottomUp != 0);
-}
-	
-EWXWEXPORT(int, wxDC_GetLogicalFunction)(void* _obj)
-{
-	return ((wxDC*)_obj)->GetLogicalFunction();
-}
-	
-EWXWEXPORT(void, wxDC_SetLogicalFunction)(void* _obj, int function)
-{
-	((wxDC*)_obj)->SetLogicalFunction(function);
-}
-	
-EWXWEXPORT(void, wxDC_CalcBoundingBox)(void* _obj, int x, int y)
-{
-	((wxDC*)_obj)->CalcBoundingBox((wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(void, wxDC_ResetBoundingBox)(void* _obj)
-{
-	((wxDC*)_obj)->ResetBoundingBox();
-}
-	
-EWXWEXPORT(int, wxDC_MinX)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->MinX();
-}
-	
-EWXWEXPORT(int, wxDC_MaxX)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->MaxX();
-}
-	
-EWXWEXPORT(int, wxDC_MinY)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->MinY();
-}
-	
-EWXWEXPORT(int, wxDC_MaxY)(void* _obj)
-{
-	return (int)((wxDC*)_obj)->MaxY();
-}
-
-EWXWEXPORT(void*, wxWindowDC_Create) (void* win)
-{
-	return (void*) new wxWindowDC((wxWindow*)win);
-}
-
-EWXWEXPORT(void, wxWindowDC_Delete) (void* _obj)
-{
-	delete (wxWindowDC*)_obj;
-}
-
-EWXWEXPORT(void*, wxClientDC_Create) (void* win)
-{
-	return (void*) new wxClientDC((wxWindow*)win);
-}
-
-EWXWEXPORT(void, wxClientDC_Delete) (void* _obj)
-{
-	delete (wxClientDC*)_obj;
-}
-
-EWXWEXPORT(void*, wxPaintDC_Create) (void* win)
-{
-	return (void*) new wxPaintDC((wxWindow*)win);
-}
-
-EWXWEXPORT(void, wxPaintDC_Delete) (void* _obj)
-{
-	delete (wxPaintDC*)_obj;
-}
-
-EWXWEXPORT(void*, wxMemoryDC_Create) ()
-{
-	return (void*) new wxMemoryDC();
-}
-
-EWXWEXPORT(void*, wxMemoryDC_CreateCompatible) (void* dc)
-{
-	return (void*) new wxMemoryDC((wxDC*) dc);
-}
-
-EWXWEXPORT(void, wxMemoryDC_Delete) (void* _obj)
-{
-	delete (wxMemoryDC*)_obj;
-}
-
-EWXWEXPORT(void, wxMemoryDC_SelectObject)(void* _obj, void* bitmap)
-{
-	((wxMemoryDC*)_obj)->SelectObject(*((wxBitmap*)bitmap));
-}
-	
-EWXWEXPORT(void*, wxScreenDC_Create) ()
-{
-	return (void*) new wxScreenDC();
-}
-
-EWXWEXPORT(void, wxScreenDC_Delete) (void* _obj)
-{
-	delete (wxScreenDC*)_obj;
-}
-
-EWXWEXPORT(int, wxScreenDC_StartDrawingOnTopOfWin)(void* _obj, void* win)
-{
-	return (int)((wxScreenDC*)_obj)->StartDrawingOnTop((wxWindow*)win);
-}
-	
-EWXWEXPORT(int, wxScreenDC_StartDrawingOnTop)(void* _obj, int l, int t, int w, int h)
-{
-	wxRect rect(l, t, w, h);
-	return (int)((wxScreenDC*)_obj)->StartDrawingOnTop(&rect);
-}
-	
-EWXWEXPORT(int, wxScreenDC_EndDrawingOnTop)(void* _obj)
-{
-	return (int)((wxScreenDC*)_obj)->EndDrawingOnTop();
-}
-	
-EWXWEXPORT(void*,wxMetafileDC_Create)(void* _file)
-{
-#if defined(__WXGTK__) || defined(__WXMAC__) 
-	return NULL;
-#else
-	wxString file;
-	
-	if (_file) file = (wxChar*)_file;
-
-    return (void*)new wxMetafileDC(file);
-#endif
-}
-
-EWXWEXPORT(void*, wxMetafileDC_Close) (void* _obj)
-{
-#if defined(__WXGTK__)
-	return NULL;
-#else
-	return (void*)((wxMetafileDC*)_obj)->Close();
-#endif
-}
-
-EWXWEXPORT(void, wxMetafileDC_Delete) (void* _obj)
-{
-#if !defined(__WXGTK__)
-	delete (wxMetafileDC*)_obj;
-#endif
-}
-
-EWXWEXPORT(void*,wxMetafile_Create)(void* _file)
-{
-#if defined(__WXGTK__)
-	return NULL;
-#else
-	wxString file;
-	
-	if (_file) file = (wxChar*)_file;
-
-    return (void*)new wxMetafile(file);
-#endif
-}
-
-EWXWEXPORT(int,wxMetafile_SetClipboard)(void* _obj, int width, int height)
-{
-#if defined(__WXGTK__)
-	return 0;
-#else
-	return (int)((wxMetafile*)_obj)->SetClipboard(width, height);
-#endif
-}
-	
-EWXWEXPORT(int,wxMetafile_Play)(void* _obj, void* _dc)
-{
-#if defined(__WXGTK__)
-	return 0;
-#else
-	return (int)((wxMetafile*)_obj)->Play((wxDC*)_dc);
-#endif
-}
-	
-EWXWEXPORT(int,wxMetafile_Ok)(void* _obj)
-{
-#if defined(__WXGTK__)
-	return 0;
-#else
-	return (int)((wxMetafile*)_obj)->Ok();
-#endif
-}
-	
-EWXWEXPORT(void, wxMetafile_Delete) (void* _obj)
-{
-#if !defined(__WXGTK__)
-	delete (wxMetafile*)_obj;
-#endif
-}
-
-}
diff --git a/wxc/src/ewxw/eljdcsvg.cpp b/wxc/src/ewxw/eljdcsvg.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdcsvg.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "wrapper.h"
-#include "wx/svg/dcsvg.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxSVGFileDC_Create)(void* a_filename)
-{
-	return (void*) new wxSVGFileDC((char*)a_filename);
-}
-
-EWXWEXPORT(void*, wxSVGFileDC_CreateWithSize)(void* a_filename, int a_width, int a_height)
-{
-	return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height);
-}
-
-EWXWEXPORT(void*, wxSVGFileDC_CreateWithSizeAndResolution)(void* a_filename, int a_width, int a_height, float a_dpi)
-{
-	return (void*) new wxSVGFileDC((char*)a_filename, a_width, a_height, a_dpi);
-}
-
-EWXWEXPORT(void, wxSVGFileDC_Delete) (void* _obj)
-{
-	delete (wxSVGFileDC*)_obj;
-}
-
-EWXWEXPORT(void, wxSVGFileDC_ComputeScaleAndOrigin) (void* _obj)
-{
-	((wxSVGFileDC*)_obj)->ComputeScaleAndOrigin();
-}
-
-}
diff --git a/wxc/src/ewxw/eljdialog.cpp b/wxc/src/ewxw/eljdialog.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdialog.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxDialog_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxDialog ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(int, wxDialog_IsModal)(void* _obj)
-{
-	return (int)((wxDialog*)_obj)->IsModal();
-}
-	
-EWXWEXPORT(int, wxDialog_ShowModal)(void* _obj)
-{
-	return ((wxDialog*)_obj)->ShowModal();
-}
-	
-EWXWEXPORT(void, wxDialog_EndModal)(void* _obj, int retCode)
-{
-	((wxDialog*)_obj)->EndModal(retCode);
-}
-	
-EWXWEXPORT(void, wxDialog_SetReturnCode)(void* _obj, int returnCode)
-{
-	((wxDialog*)_obj)->SetReturnCode(returnCode);
-}
-	
-EWXWEXPORT(int, wxDialog_GetReturnCode)(void* _obj)
-{
-	return ((wxDialog*)_obj)->GetReturnCode();
-}
-	
-#if wxVERSION_NUMBER >= 2400
-EWXWEXPORT(void, wxDialog_SetIcons)(void* _obj, void* _icons)
-{
-	((wxDialog*)_obj)->SetIcons(*((wxIconBundle*)_icons));
-}
-#endif
-
-}
diff --git a/wxc/src/ewxw/eljdialup.cpp b/wxc/src/ewxw/eljdialup.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdialup.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "wrapper.h"
-#include "wx/dialup.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxDialUpManager_Create)()
-{
-	return (void*) wxDialUpManager::Create();
-}
-
-EWXWEXPORT(void,wxDialUpManager_Delete)(void* _obj)
-{
-	delete (wxDialUpManager*)_obj;
-}
-
-EWXWEXPORT(int,wxDialUpManager_IsOk)(void* _obj)
-{
-	return (int)((wxDialUpManager*)_obj)->IsOk();
-}
-	
-EWXWEXPORT(int,wxDialUpManager_GetISPNames)(void* _obj, void* _lst)
-{
-	wxArrayString arr;
-	((wxDialUpManager*)_obj)->GetISPNames(arr);
-
-	if (_lst)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((wxChar**)_lst)[i] = wxStrdup(arr.Item(i).c_str());
-	}
-
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(int,wxDialUpManager_Dial)(void* _obj, void* nameOfISP, void* username, void* password, int async)
-{
-	return (int)((wxDialUpManager*)_obj)->Dial((const wxChar*)nameOfISP, (const wxChar*)username, (const wxChar*)password, async != 0);
-}
-	
-EWXWEXPORT(int,wxDialUpManager_IsDialing)(void* _obj)
-{
-	return (int)((wxDialUpManager*)_obj)->IsDialing();
-}
-	
-EWXWEXPORT(int,wxDialUpManager_CancelDialing)(void* _obj)
-{
-	return (int)((wxDialUpManager*)_obj)->CancelDialing();
-}
-	
-EWXWEXPORT(int,wxDialUpManager_HangUp)(void* _obj)
-{
-	return (int)((wxDialUpManager*)_obj)->HangUp();
-}
-	
-EWXWEXPORT(int,wxDialUpManager_IsAlwaysOnline)(void* _obj)
-{
-	return (int)((wxDialUpManager*)_obj)->IsAlwaysOnline();
-}
-	
-EWXWEXPORT(int,wxDialUpManager_IsOnline)(void* _obj)
-{
-	return (int)((wxDialUpManager*)_obj)->IsOnline();
-}
-	
-EWXWEXPORT(void,wxDialUpManager_SetOnlineStatus)(void* _obj, int isOnline)
-{
-	((wxDialUpManager*)_obj)->SetOnlineStatus(isOnline != 0);
-}
-	
-EWXWEXPORT(int,wxDialUpManager_EnableAutoCheckOnlineStatus)(void* _obj, int nSeconds)
-{
-	return (int)((wxDialUpManager*)_obj)->EnableAutoCheckOnlineStatus((size_t)nSeconds);
-}
-	
-EWXWEXPORT(void,wxDialUpManager_DisableAutoCheckOnlineStatus)(void* _obj)
-{
-	((wxDialUpManager*)_obj)->DisableAutoCheckOnlineStatus();
-}
-	
-EWXWEXPORT(void,wxDialUpManager_SetWellKnownHost)(void* _obj, void* hostname, int portno)
-{
-	((wxDialUpManager*)_obj)->SetWellKnownHost((const wxChar*)hostname, portno);
-}
-	
-EWXWEXPORT(void,wxDialUpManager_SetConnectCommand)(void* _obj, void* commandDial, void* commandHangup)
-{
-	((wxDialUpManager*)_obj)->SetConnectCommand((const wxChar*)commandDial, (const wxChar*)commandHangup);
-}
-	
-
-EWXWEXPORT(int,wxDialUpEvent_IsConnectedEvent)(void* _obj)
-{
-	return (int)((wxDialUpEvent*)_obj)->IsConnectedEvent();
-}
-	
-EWXWEXPORT(int,wxDialUpEvent_IsOwnEvent)(void* _obj)
-{
-	return (int)((wxDialUpEvent*)_obj)->IsOwnEvent();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljdirdlg.cpp b/wxc/src/ewxw/eljdirdlg.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdirdlg.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxDirDialog_Create) (void* _prt, void* _msg, void* _dir, int _lft, int _top, int _stl)
-{
-	return (void*) new wxDirDialog ((wxWindow*)_prt, (wxChar*)_msg, (wxChar*) _dir, _stl, wxPoint(_lft, _top));
-}
-
-EWXWEXPORT(void, wxDirDialog_SetMessage)(void* _obj, void* msg)
-{
-	((wxDirDialog*)_obj)->SetMessage((wxChar*)msg);
-}
-	
-EWXWEXPORT(void, wxDirDialog_SetPath)(void* _obj, void* pth)
-{
-	((wxDirDialog*)_obj)->SetPath((wxChar*) pth);
-}
-	
-EWXWEXPORT(void, wxDirDialog_SetStyle)(void* _obj, int style)
-{
-	((wxDirDialog*)_obj)->SetStyle((long)style);
-}
-	
-EWXWEXPORT(int, wxDirDialog_GetMessage)(void* _obj, void* _buf)
-{
-	wxString result =((wxDirDialog*)_obj)->GetMessage();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDirDialog_GetPath)(void* _obj, void* _buf)
-{
-	wxString result =((wxDirDialog*)_obj)->GetPath();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxDirDialog_GetStyle)(void* _obj)
-{
-	return (int)((wxDirDialog*)_obj)->GetStyle();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljdnd.cpp b/wxc/src/ewxw/eljdnd.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdnd.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-#include "wrapper.h"
-
-wxDragResult ELJTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_data_func)
-		return (wxDragResult) on_data_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxTextDropTarget::OnData(x, y, def);
-}
-
-bool ELJTextDropTarget::OnDrop(wxCoord x, wxCoord y)
-{
-	if (on_drop_func)
-		return (bool) on_drop_func(obj, (long)x, (long)y);
-	else
-		return wxTextDropTarget::OnDrop(x, y);
-}
-
-wxDragResult ELJTextDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_enter_func)
-		return (wxDragResult) on_enter_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxTextDropTarget::OnEnter(x, y, def);
-}
-
-wxDragResult ELJTextDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_drag_func)
-		return (wxDragResult) on_drag_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxTextDropTarget::OnDragOver(x, y, def);
-}
-
-void ELJTextDropTarget::OnLeave()
-{
-	if (on_leave_func)
-		on_leave_func(obj);
-	else
-		wxTextDropTarget::OnLeave();
-}
-
-wxDragResult ELJFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_data_func)
-		return (wxDragResult) on_data_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxFileDropTarget::OnData(x, y, def);
-}
-
-bool ELJFileDropTarget::OnDrop(wxCoord x, wxCoord y)
-{
-	if (on_drop_func)
-		return (bool) on_drop_func(obj, (long)x, (long)y);
-	else
-		return wxFileDropTarget::OnDrop(x, y);
-}
-
-wxDragResult ELJFileDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_enter_func)
-		return (wxDragResult) on_enter_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxFileDropTarget::OnEnter(x, y, def);
-}
-
-wxDragResult ELJFileDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_drag_func)
-		return (wxDragResult) on_drag_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxFileDropTarget::OnDragOver(x, y, def);
-}
-
-void ELJFileDropTarget::OnLeave()
-{
-	if (on_leave_func)
-		on_leave_func(obj);
-	else
-		wxFileDropTarget::OnLeave();
-}
-
-wxDragResult ELJDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_data_func)
-		return (wxDragResult) on_data_func(obj, (long)x, (long)y, (int) def);
-	else
-	{
-		GetData();
-		return def;
-	}
-}
-
-bool ELJDropTarget::OnDrop(wxCoord x, wxCoord y)
-{
-	if (on_drop_func)
-		return (bool) on_drop_func(obj, (long)x, (long)y);
-	else
-		return wxDropTarget::OnDrop(x, y);
-}
-
-wxDragResult ELJDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_enter_func)
-		return (wxDragResult) on_enter_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxDropTarget::OnEnter(x, y, def);
-}
-
-wxDragResult ELJDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
-{
-	if (on_drag_func)
-		return (wxDragResult) on_drag_func(obj, (long)x, (long)y, (int) def);
-	else
-		return wxDropTarget::OnDragOver(x, y, def);
-}
-
-void ELJDropTarget::OnLeave()
-{
-	if (on_leave_func)
-		on_leave_func(obj);
-	else
-		wxDropTarget::OnLeave();
-}
-
-bool ELJFileDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
-{
-	bool result = false;
-	const wxChar** arr = (const wxChar**)malloc (sizeof(wxChar*) * filenames.GetCount());
-	
-	for (unsigned int i = 0; i < filenames.GetCount(); i++)
-		arr[i] = filenames.Item(i).c_str();
-	
-	result = func(obj, (long)x, (long)y, (void*)arr, (int)filenames.GetCount()) != 0;
-	free(arr);
-	
-	return result;
-}
-
-bool ELJTextDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& text)
-{
-	return func(obj, (long)x, (long)y, (void*)text.c_str()) != 0;
-}
-
-extern "C"
-{
-
-EWXWEXPORT(void*, ELJFileDropTarget_Create)(void* _obj, void* _func)
-{
-	return (void*) new ELJFileDropTarget(_obj, (FileDropFunc)_func);
-}
-
-EWXWEXPORT(void, ELJFileDropTarget_Delete)(void* _obj)
-{
-	delete (ELJFileDropTarget*)_obj;
-}
-
-EWXWEXPORT(void*, ELJTextDropTarget_Create)(void* _obj, void* _func)
-{
-	return (void*) new ELJTextDropTarget(_obj, (TextDropFunc)_func);
-}
-
-EWXWEXPORT(void, ELJTextDropTarget_Delete)(void* _obj)
-{
-	delete (ELJTextDropTarget*)_obj;
-}
-
-EWXWEXPORT(void*, TextDataObject_Create)(void* _txt)
-{
-	return (void*) new wxTextDataObject((wxChar*)_txt);
-}
-
-EWXWEXPORT(void, TextDataObject_Delete)(void* _obj)
-{
-	delete (wxTextDataObject*)_obj;
-}
-
-EWXWEXPORT(size_t, TextDataObject_GetTextLength)(void* _obj)
-{
-	return ((wxTextDataObject*)_obj)->GetTextLength();
-}
-
-EWXWEXPORT(int, TextDataObject_GetText)(void* _obj, void* _buf)
-{
-	wxString result =((wxTextDataObject*)_obj)->GetText();
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(void, TextDataObject_SetText)(void* _obj, const wxString* strText)
-{
-	((wxTextDataObject*)_obj)->SetText(*strText);
-}
-
-EWXWEXPORT(void*, FileDataObject_Create)(int _cnt, void* _lst )
-{
-	wxFileDataObject* result = new wxFileDataObject();
-	if (_cnt)
-	{
-		for (int i = 0; i < _cnt; i++)
-			result->AddFile(((wxChar**)_lst)[i]);
-	}
-	return (void*) result;
-}
-
-EWXWEXPORT(void, FileDataObject_Delete)(void* _obj)
-{
-	delete (wxFileDataObject*)_obj;
-}
-
-EWXWEXPORT(void, FileDataObject_AddFile)(void* _obj, void* _fle)
-{
-	((wxFileDataObject*)_obj)->AddFile((wxChar*)_fle);
-}
-
-EWXWEXPORT(int, FileDataObject_GetFilenames)(void* _obj, void* _lst)
-{
-	wxArrayString arr = ((wxFileDataObject*)_obj)->GetFilenames();
-	if (_lst)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)_lst)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	return arr.GetCount();
-}
-
-
-EWXWEXPORT(void*, BitmapDataObject_Create)(void* _bmp)
-{
-	return (void*) new wxBitmapDataObject(*((wxBitmap*)_bmp));
-}
-
-EWXWEXPORT(void*, BitmapDataObject_CreateEmpty)()
-{
-	return (void*) new wxBitmapDataObject();
-}
-
-EWXWEXPORT(void, BitmapDataObject_Delete)(void* _obj)
-{
-	delete (wxBitmapDataObject*)_obj;
-}
-
-EWXWEXPORT(void, BitmapDataObject_SetBitmap)(void* _obj, void* _bmp)
-{
-	((wxBitmapDataObject*)_obj)->SetBitmap (*((wxBitmap*)_bmp));
-}
-
-EWXWEXPORT(void, BitmapDataObject_GetBitmap)(void* _obj, void* _bmp)
-{
-	*((wxBitmap*)_bmp) = ((wxBitmapDataObject*)_obj)->GetBitmap ();
-}
-
-
-EWXWEXPORT(void*, DropSource_Create)(wxDataObject* data, void* win, void* copy, void* move, void* none)
-{
-#if (wxCHECK_VERSION(2,5,0) && defined(__WXMAC__)) || defined(__WIN32__)
-	return (void*) new wxDropSource(*data, (wxWindow*)win, *((wxCursor*)copy), *((wxCursor*)move), *((wxCursor*)none));
-#else
-	return (void*) new wxDropSource(*data, (wxWindow*)win, *((wxIcon*)copy), *((wxIcon*)move), *((wxIcon*)none));
-#endif
-}
-
-EWXWEXPORT(void, DropSource_Delete)(void* _obj)
-{
-	delete (wxDropSource*)_obj;
-}
-
-EWXWEXPORT(int, DropSource_DoDragDrop)(void* _obj, int _move)
-{
-	return (int)((wxDropSource*)_obj)->DoDragDrop(_move != 0);
-}
-
-EWXWEXPORT(void*, ELJDropTarget_Create)(void* _obj)
-{
-	return (void*) new ELJDropTarget(_obj);
-}
-
-EWXWEXPORT(void, ELJDropTarget_Delete)(void* _obj)
-{
-	delete (ELJDropTarget*)_obj;
-}
-
-EWXWEXPORT(void, ELJFileDropTarget_SetOnData)(void* _obj, void* _func)
-{
-	((ELJFileDropTarget*)_obj)->SetOnData((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJFileDropTarget_SetOnDrop)(void* _obj, void* _func)
-{
-	((ELJFileDropTarget*)_obj)->SetOnDrop((DragTwoFunc)_func);
-}
-
-EWXWEXPORT(void, ELJFileDropTarget_SetOnEnter)(void* _obj, void* _func)
-{
-	((ELJFileDropTarget*)_obj)->SetOnEnter((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJFileDropTarget_SetOnDragOver)(void* _obj, void* _func)
-{
-	((ELJFileDropTarget*)_obj)->SetOnDragOver((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJFileDropTarget_SetOnLeave)(void* _obj, void* _func)
-{
-	((ELJFileDropTarget*)_obj)->SetOnLeave((DragZeroFunc)_func);
-}
-
-EWXWEXPORT(void, ELJTextDropTarget_SetOnData)(void* _obj, void* _func)
-{
-	((ELJTextDropTarget*)_obj)->SetOnData((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJTextDropTarget_SetOnDrop)(void* _obj, void* _func)
-{
-	((ELJTextDropTarget*)_obj)->SetOnDrop((DragTwoFunc)_func);
-}
-
-EWXWEXPORT(void, ELJTextDropTarget_SetOnEnter)(void* _obj, void* _func)
-{
-	((ELJTextDropTarget*)_obj)->SetOnEnter((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJTextDropTarget_SetOnDragOver)(void* _obj, void* _func)
-{
-	((ELJTextDropTarget*)_obj)->SetOnDragOver((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJTextDropTarget_SetOnLeave)(void* _obj, void* _func)
-{
-	((ELJTextDropTarget*)_obj)->SetOnLeave((DragZeroFunc)_func);
-}
-
-EWXWEXPORT(void, ELJDropTarget_SetOnData)(void* _obj, void* _func)
-{
-	((ELJDropTarget*)_obj)->SetOnData((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJDropTarget_SetOnDrop)(void* _obj, void* _func)
-{
-	((ELJDropTarget*)_obj)->SetOnDrop((DragTwoFunc)_func);
-}
-
-EWXWEXPORT(void, ELJDropTarget_SetOnEnter)(void* _obj, void* _func)
-{
-	((ELJDropTarget*)_obj)->SetOnEnter((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJDropTarget_SetOnDragOver)(void* _obj, void* _func)
-{
-	((ELJDropTarget*)_obj)->SetOnDragOver((DragThreeFunc)_func);
-}
-
-EWXWEXPORT(void, ELJDropTarget_SetOnLeave)(void* _obj, void* _func)
-{
-	((ELJDropTarget*)_obj)->SetOnLeave((DragZeroFunc)_func);
-}
-
-EWXWEXPORT(void, wxDropTarget_GetData)(void* _obj)
-{
-	((wxDropTarget*)_obj)->GetData();
-}
-
-EWXWEXPORT(void, wxDropTarget_SetDataObject)(void* _obj, void* _dat)
-{
-	((wxDropTarget*)_obj)->SetDataObject((wxDataObject*)_dat);
-}
-
-EWXWEXPORT(void*, ELJDragDataObject_Create)(void* _obj, void* _fmt, void* _func1, void* _func2, void* _func3)
-{
-	return (void*) new ELJDragDataObject(_obj, (wxChar*)_fmt, (DataGetDataSize)_func1, (DataGetDataHere)_func2, (DataSetData)_func3);
-}
-
-EWXWEXPORT(void, ELJDragDataObject_Delete)(void* _obj)
-{
-	delete (ELJDragDataObject*)_obj;
-}
-
-EWXWEXPORT(void*, wxDataObjectComposite_Create)()
-{
-	return (void*) new wxDataObjectComposite();
-}
-
-EWXWEXPORT(void, wxDataObjectComposite_Delete)(void* _obj)
-{
-	delete (wxDataObjectComposite*)_obj;
-}
-
-EWXWEXPORT(void, wxDataObjectComposite_Add)(void* _obj, void* _dat, int _preferred)
-{
-	((wxDataObjectComposite*)_obj)->Add((wxDataObjectSimple*)_dat, _preferred != 0);
-}
-
-}
diff --git a/wxc/src/ewxw/eljdrawing.cpp b/wxc/src/ewxw/eljdrawing.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljdrawing.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxDrawWindow_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxWindow ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void*, wxDrawControl_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxControl ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-}
diff --git a/wxc/src/ewxw/eljevent.cpp b/wxc/src/ewxw/eljevent.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljevent.cpp
+++ /dev/null
@@ -1,2070 +0,0 @@
-#include "wrapper.h"
-#include "wx/process.h"
-#include "wx/dialup.h"
-#include "wx/tabctrl.h"
-#include "wx/plot/plot.h"
-#include "wx/gizmos/dynamicsash.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxCommandEvent_Create)(int _typ, int _id)
-{
-	return new wxCommandEvent((wxEventType)_typ, _id);
-}
-
-EWXWEXPORT(void,wxCommandEvent_Delete)(void* _obj)
-{
-	delete (wxCommandEvent*)_obj;
-}
-
-EWXWEXPORT(void, wxEvent_Skip)(void* _obj)
-{
-	((wxEvent*)_obj)->Skip();
-}
-
-EWXWEXPORT(int, wxEvent_GetEventType)(void* _obj)
-{
-	return (int)((wxEvent*)_obj)->GetEventType();
-}
-	
-EWXWEXPORT(void, wxEvent_SetEventType)(void* _obj, int typ)
-{
-	((wxEvent*)_obj)->SetEventType((wxEventType) typ);
-}
-	
-EWXWEXPORT(void*, wxEvent_GetEventObject)(void* _obj)
-{
-	return (void*)((wxEvent*)_obj)->GetEventObject();
-}
-	
-EWXWEXPORT(void, wxEvent_SetEventObject)(void* _obj, void* obj)
-{
-	((wxEvent*)_obj)->SetEventObject((wxObject*) obj);
-}
-	
-EWXWEXPORT(int, wxEvent_GetTimestamp)(void* _obj)
-{
-	return (int)((wxEvent*)_obj)->GetTimestamp();
-}
-	
-EWXWEXPORT(void, wxEvent_SetTimestamp)(void* _obj, int ts)
-{
-	((wxEvent*)_obj)->SetTimestamp((long)ts);
-}
-	
-EWXWEXPORT(int, wxEvent_GetId)(void* _obj)
-{
-	return ((wxEvent*)_obj)->GetId();
-}
-	
-EWXWEXPORT(void, wxEvent_SetId)(void* _obj, int Id)
-{
-	((wxEvent*)_obj)->SetId(Id);
-}
-	
-EWXWEXPORT(int, wxEvent_GetSkipped)(void* _obj)
-{
-	return (int)((wxEvent*)_obj)->GetSkipped();
-}
-	
-EWXWEXPORT(int, wxEvent_IsCommandEvent)(void* _obj)
-{
-	return (int)((wxEvent*)_obj)->IsCommandEvent();
-}
-	
-EWXWEXPORT(void, wxEvent_CopyObject)(void* _obj, void* object_dest)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxEvent*)_obj)->CopyObject(*((wxObject*) object_dest));
-#endif
-}
-	
-EWXWEXPORT(void, wxEvent_SetCallbackUserData)(void* _obj, wxObject* obj)
-{
-	((wxEvent*)_obj)->m_callbackUserData = (wxObject*) obj;
-}
-	
-EWXWEXPORT(void*, wxEvent_GetCallbackUserData)(void* _obj)
-{
-	return (void*)((wxEvent*)_obj)->m_callbackUserData;
-}
-	
-EWXWEXPORT(void, wxCommandEvent_SetClientData)(void* _obj, void* clientData)
-{
-	((wxCommandEvent*)_obj)->SetClientData(clientData);
-}
-	
-EWXWEXPORT(void*, wxCommandEvent_GetClientData)(void* _obj)
-{
-	return ((wxCommandEvent*)_obj)->m_clientData;
-}
-	
-EWXWEXPORT(void, wxCommandEvent_SetClientObject)(void* _obj, void* clientObject)
-{
-	((wxCommandEvent*)_obj)->SetClientObject((wxClientData*) clientObject);
-}
-	
-EWXWEXPORT(void*, wxCommandEvent_GetClientObject)(void* _obj)
-{
-	return (void*)((wxCommandEvent*)_obj)->GetClientObject();
-}
-	
-EWXWEXPORT(int, wxCommandEvent_GetSelection)(void* _obj)
-{
-	return ((wxCommandEvent*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(void, wxCommandEvent_SetString)(void* _obj, char* s)
-{
-	((wxCommandEvent*)_obj)->SetString(s);
-}
-	
-EWXWEXPORT(int, wxCommandEvent_GetString)(void* _obj, void* _buf)
-{
-	wxString result = ((wxCommandEvent*)_obj)->GetString();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxCommandEvent_IsChecked)(void* _obj)
-{
-	return (int)((wxCommandEvent*)_obj)->IsChecked();
-}
-	
-EWXWEXPORT(int, wxCommandEvent_IsSelection)(void* _obj)
-{
-	return (int)((wxCommandEvent*)_obj)->IsSelection();
-}
-	
-EWXWEXPORT(void, wxCommandEvent_SetExtraLong)(void* _obj, long extraLong)
-{
-	((wxCommandEvent*)_obj)->SetExtraLong(extraLong);
-}
-	
-EWXWEXPORT(long, wxCommandEvent_GetExtraLong)(void* _obj)
-{
-	return ((wxCommandEvent*)_obj)->m_extraLong;
-}
-	
-EWXWEXPORT(void, wxCommandEvent_SetInt)(void* _obj, int i)
-{
-	((wxCommandEvent*)_obj)->SetInt(i);
-}
-	
-EWXWEXPORT(long, wxCommandEvent_GetInt)(void* _obj)
-{
-	return ((wxCommandEvent*)_obj)->GetInt();
-}
-	
-EWXWEXPORT(void, wxCommandEvent_CopyObject)(void* _obj, void* object_dest)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxCommandEvent*)_obj)->CopyObject(*((wxObject*) object_dest));
-#endif
-}
-	
-EWXWEXPORT(void, wxNotifyEvent_Veto)(void* _obj)
-{
-	((wxNotifyEvent*)_obj)->Veto();
-}
-	
-EWXWEXPORT(void, wxNotifyEvent_Allow)(void* _obj)
-{
-	((wxNotifyEvent*)_obj)->Allow();
-}
-	
-EWXWEXPORT(int, wxNotifyEvent_IsAllowed)(void* _obj)
-{
-	return (int)((wxNotifyEvent*)_obj)->IsAllowed();
-}
-	
-EWXWEXPORT(void, wxNotifyEvent_CopyObject)(void* _obj, void* object_dest)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxNotifyEvent*)_obj)->CopyObject(*((wxObject*) object_dest));
-#endif
-}
-	
-EWXWEXPORT(int, wxScrollWinEvent_GetOrientation)(void* _obj)
-{
-	return ((wxScrollWinEvent*)_obj)->GetOrientation();
-}
-	
-EWXWEXPORT(int, wxScrollWinEvent_GetPosition)(void* _obj)
-{
-	return ((wxScrollWinEvent*)_obj)->GetPosition();
-}
-	
-EWXWEXPORT(void, wxScrollWinEvent_SetOrientation)(void* _obj, int orient)
-{
-	((wxScrollWinEvent*)_obj)->SetOrientation(orient);
-}
-	
-EWXWEXPORT(void, wxScrollWinEvent_SetPosition)(void* _obj, int pos)
-{
-	((wxScrollWinEvent*)_obj)->SetPosition(pos);
-}
-	
-EWXWEXPORT(int, wxMouseEvent_IsButton)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->IsButton();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_ButtonDown)(void* _obj, int but)
-{
-	return (int)((wxMouseEvent*)_obj)->ButtonDown(but);
-}
-	
-EWXWEXPORT(int, wxMouseEvent_ButtonDClick)(void* _obj, int but)
-{
-	return (int)((wxMouseEvent*)_obj)->ButtonDClick(but);
-}
-	
-EWXWEXPORT(int, wxMouseEvent_ButtonUp)(void* _obj, int but)
-{
-	return (int)((wxMouseEvent*)_obj)->ButtonUp(but);
-}
-	
-EWXWEXPORT(int, wxMouseEvent_Button)(void* _obj, int but)
-{
-	return (int)((wxMouseEvent*)_obj)->Button(but);
-}
-	
-EWXWEXPORT(int, wxMouseEvent_ButtonIsDown)(void* _obj, int but)
-{
-	return (int)((wxMouseEvent*)_obj)->ButtonIsDown(but);
-}
-	
-EWXWEXPORT(int, wxMouseEvent_ControlDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->ControlDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_MetaDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->MetaDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_AltDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->AltDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_ShiftDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->ShiftDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_LeftDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->LeftDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_MiddleDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->MiddleDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_RightDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->RightDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_LeftUp)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->LeftUp();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_MiddleUp)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->MiddleUp();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_RightUp)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->RightUp();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_LeftDClick)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->LeftDClick();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_MiddleDClick)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->MiddleDClick();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_RightDClick)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->RightDClick();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_LeftIsDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->LeftIsDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_MiddleIsDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->MiddleIsDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_RightIsDown)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->RightIsDown();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_Dragging)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->Dragging();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_Moving)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->Moving();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_Entering)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->Entering();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_Leaving)(void* _obj)
-{
-	return (int)((wxMouseEvent*)_obj)->Leaving();
-}
-	
-EWXWEXPORT(void, wxMouseEvent_GetPosition)(void* _obj, int* xpos, int* ypos)
-{
-	((wxMouseEvent*)_obj)->GetPosition((wxCoord*)xpos, (wxCoord*)ypos);
-}
-	
-EWXWEXPORT(void, wxMouseEvent_GetLogicalPosition)(void* _obj, void* dc, int* xpos, int* ypos)
-{
-	wxPoint pt = ((wxMouseEvent*)_obj)->GetLogicalPosition(*((wxDC*)dc));
-	*xpos = pt.x;
-	*ypos = pt.y;
-}
-	
-EWXWEXPORT(int, wxMouseEvent_GetX)(void* _obj)
-{
-	return ((wxMouseEvent*)_obj)->GetX();
-}
-	
-EWXWEXPORT(int, wxMouseEvent_GetY)(void* _obj)
-{
-	return ((wxMouseEvent*)_obj)->GetY();
-}
-	
-EWXWEXPORT(void, wxMouseEvent_CopyObject)(void* _obj, void* object_dest)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxMouseEvent*)_obj)->CopyObject(*((wxObject*) object_dest));
-#endif
-}
-	
-EWXWEXPORT(int, wxSetCursorEvent_GetX)(void* _obj)
-{
-	return (int)((wxSetCursorEvent*)_obj)->GetX();
-}
-	
-EWXWEXPORT(int, wxSetCursorEvent_GetY)(void* _obj)
-{
-	return (int)((wxSetCursorEvent*)_obj)->GetY();
-}
-	
-EWXWEXPORT(void, wxSetCursorEvent_SetCursor)(void* _obj, void* cursor)
-{
-	((wxSetCursorEvent*)_obj)->SetCursor(*((wxCursor*)cursor));
-}
-	
-EWXWEXPORT(void*, wxSetCursorEvent_GetCursor)(void* _obj)
-{
-	return (void*)(&((wxSetCursorEvent*)_obj)->GetCursor());
-}
-	
-EWXWEXPORT(int, wxSetCursorEvent_HasCursor)(void* _obj)
-{
-	return (int)((wxSetCursorEvent*)_obj)->HasCursor();
-}
-	
-EWXWEXPORT(int, wxKeyEvent_ControlDown)(void* _obj)
-{
-	return (int)((wxKeyEvent*)_obj)->ControlDown();
-}
-	
-EWXWEXPORT(int, wxKeyEvent_MetaDown)(void* _obj)
-{
-	return (int)((wxKeyEvent*)_obj)->MetaDown();
-}
-	
-EWXWEXPORT(int, wxKeyEvent_AltDown)(void* _obj)
-{
-	return (int)((wxKeyEvent*)_obj)->AltDown();
-}
-	
-EWXWEXPORT(int, wxKeyEvent_ShiftDown)(void* _obj)
-{
-	return (int)((wxKeyEvent*)_obj)->ShiftDown();
-}
-	
-EWXWEXPORT(int, wxKeyEvent_HasModifiers)(void* _obj)
-{
-	return (int)((wxKeyEvent*)_obj)->HasModifiers();
-}
-	
-EWXWEXPORT(int, wxKeyEvent_GetKeyCode)(void* _obj)
-{
-	return ((wxKeyEvent*)_obj)->GetKeyCode();
-}
-	
-EWXWEXPORT(void, wxKeyEvent_SetKeyCode)(void* _obj, int code)
-{
-	((wxKeyEvent*)_obj)->m_keyCode = code;
-}
-	
-EWXWEXPORT(void, wxKeyEvent_GetPosition)(void* _obj, int* xpos, int* ypos)
-{
-	((wxKeyEvent*)_obj)->GetPosition((wxCoord*) xpos, (wxCoord*) ypos);
-}
-	
-EWXWEXPORT(int, wxKeyEvent_GetX)(void* _obj)
-{
-	return (int)((wxKeyEvent*)_obj)->GetX();
-}
-	
-EWXWEXPORT(int, wxKeyEvent_GetY)(void* _obj)
-{
-	return (int)((wxKeyEvent*)_obj)->GetY();
-}
-	
-EWXWEXPORT(void, wxKeyEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxKeyEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-	
-EWXWEXPORT(void, wxSizeEvent_GetSize)(void* _obj, int* w, int* h)
-{
-	wxSize sz = ((wxSizeEvent*)_obj)->GetSize();
-	*w = sz.x;
-	*h = sz.y;
-}
-	
-EWXWEXPORT(void, wxSizeEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxSizeEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-	
-EWXWEXPORT(void, wxMoveEvent_GetPosition)(void* _obj, int* x, int* y)
-{
-	wxPoint pt = ((wxMoveEvent*)_obj)->GetPosition();
-	*x = pt.x;
-	*y = pt.y;
-}
-	
-EWXWEXPORT(void, wxMoveEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxMoveEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-	
-EWXWEXPORT(void*, wxEraseEvent_GetDC)(void* _obj)
-{
-	return (void*)((wxEraseEvent*)_obj)->GetDC();
-}
-	
-EWXWEXPORT(void, wxEraseEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxEraseEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(int, wxActivateEvent_GetActive)(void* _obj)
-{
-	return (int)((wxActivateEvent*)_obj)->GetActive();
-}
-	
-EWXWEXPORT(void, wxActivateEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxActivateEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(int, wxMenuEvent_GetMenuId)(void* _obj)
-{
-	return ((wxMenuEvent*)_obj)->GetMenuId();
-}
-	
-EWXWEXPORT(void, wxMenuEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxMenuEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(void, wxCloseEvent_SetLoggingOff)(void* _obj, int logOff)
-{
-	((wxCloseEvent*)_obj)->SetLoggingOff(logOff != 0);
-}
-	
-EWXWEXPORT(int, wxCloseEvent_GetLoggingOff)(void* _obj)
-{
-	return (int)((wxCloseEvent*)_obj)->GetLoggingOff();
-}
-	
-EWXWEXPORT(void, wxCloseEvent_Veto)(void* _obj, int veto)
-{
-	((wxCloseEvent*)_obj)->Veto(veto != 0);
-}
-	
-EWXWEXPORT(void, wxCloseEvent_SetCanVeto)(void* _obj, int canVeto)
-{
-	((wxCloseEvent*)_obj)->SetCanVeto(canVeto != 0);
-}
-	
-EWXWEXPORT(int, wxCloseEvent_CanVeto)(void* _obj)
-{
-	return (int)((wxCloseEvent*)_obj)->CanVeto();
-}
-	
-EWXWEXPORT(int, wxCloseEvent_GetVeto)(void* _obj)
-{
-	return (int)((wxCloseEvent*)_obj)->GetVeto();
-}
-	
-EWXWEXPORT(void, wxCloseEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxCloseEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(void, wxShowEvent_SetShow)(void* _obj, int show)
-{
-	((wxShowEvent*)_obj)->SetShow(show != 0);
-}
-	
-EWXWEXPORT(int, wxShowEvent_GetShow)(void* _obj)
-{
-	return (int)((wxShowEvent*)_obj)->GetShow();
-}
-	
-EWXWEXPORT(void, wxShowEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxShowEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(void, wxJoystickEvent_GetPosition)(void* _obj, int* x, int* y)
-{
-	wxPoint pt = ((wxJoystickEvent*)_obj)->GetPosition();
-	*x = pt.x;
-	*y = pt.y;
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_GetZPosition)(void* _obj)
-{
-	return ((wxJoystickEvent*)_obj)->GetZPosition();
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_GetButtonState)(void* _obj)
-{
-	return ((wxJoystickEvent*)_obj)->GetButtonState();
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_GetButtonChange)(void* _obj)
-{
-	return ((wxJoystickEvent*)_obj)->GetButtonChange();
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_GetJoystick)(void* _obj)
-{
-	return ((wxJoystickEvent*)_obj)->GetJoystick();
-}
-	
-EWXWEXPORT(void, wxJoystickEvent_SetJoystick)(void* _obj, int stick)
-{
-	((wxJoystickEvent*)_obj)->SetJoystick(stick);
-}
-	
-EWXWEXPORT(void, wxJoystickEvent_SetButtonState)(void* _obj, int state)
-{
-	((wxJoystickEvent*)_obj)->SetButtonState(state);
-}
-	
-EWXWEXPORT(void, wxJoystickEvent_SetButtonChange)(void* _obj, int change)
-{
-	((wxJoystickEvent*)_obj)->SetButtonChange(change);
-}
-	
-EWXWEXPORT(void, wxJoystickEvent_SetPosition)(void* _obj, void* pos)
-{
-	((wxJoystickEvent*)_obj)->SetPosition(*((wxPoint*)pos));
-}
-	
-EWXWEXPORT(void, wxJoystickEvent_SetZPosition)(void* _obj, int zPos)
-{
-	((wxJoystickEvent*)_obj)->SetZPosition(zPos);
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_IsButton)(void* _obj)
-{
-	return (int)((wxJoystickEvent*)_obj)->IsButton();
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_IsMove)(void* _obj)
-{
-	return (int)((wxJoystickEvent*)_obj)->IsMove();
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_IsZMove)(void* _obj)
-{
-	return (int)((wxJoystickEvent*)_obj)->IsZMove();
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_ButtonDown)(void* _obj, int but)
-{
-	return (int)((wxJoystickEvent*)_obj)->ButtonDown(but);
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_ButtonUp)(void* _obj, int but)
-{
-	return (int)((wxJoystickEvent*)_obj)->ButtonUp(but);
-}
-	
-EWXWEXPORT(int, wxJoystickEvent_ButtonIsDown)(void* _obj, int but)
-{
-	return (int)((wxJoystickEvent*)_obj)->ButtonIsDown(but);
-}
-	
-EWXWEXPORT(void, wxJoystickEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxJoystickEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-	
-EWXWEXPORT(int, wxUpdateUIEvent_GetChecked)(void* _obj)
-{
-	return (int)((wxUpdateUIEvent*)_obj)->GetChecked();
-}
-	
-EWXWEXPORT(int, wxUpdateUIEvent_GetEnabled)(void* _obj)
-{
-	return (int)((wxUpdateUIEvent*)_obj)->GetEnabled();
-}
-	
-EWXWEXPORT(int, wxUpdateUIEvent_GetText)(void* _obj, void* _buf)
-{
-	wxString result =((wxUpdateUIEvent*)_obj)->GetText();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxUpdateUIEvent_GetSetText)(void* _obj)
-{
-	return (int)((wxUpdateUIEvent*)_obj)->GetSetText();
-}
-	
-EWXWEXPORT(int, wxUpdateUIEvent_GetSetChecked)(void* _obj)
-{
-	return (int)((wxUpdateUIEvent*)_obj)->GetSetChecked();
-}
-	
-EWXWEXPORT(int, wxUpdateUIEvent_GetSetEnabled)(void* _obj)
-{
-	return (int)((wxUpdateUIEvent*)_obj)->GetSetEnabled();
-}
-	
-EWXWEXPORT(void, wxUpdateUIEvent_Check)(void* _obj, int check)
-{
-	((wxUpdateUIEvent*)_obj)->Check(check != 0);
-}
-	
-EWXWEXPORT(void, wxUpdateUIEvent_Enable)(void* _obj, int enable)
-{
-	((wxUpdateUIEvent*)_obj)->Enable(enable != 0);
-}
-	
-EWXWEXPORT(void, wxUpdateUIEvent_SetText)(void* _obj, char* text)
-{
-	((wxUpdateUIEvent*)_obj)->SetText(text);
-}
-	
-EWXWEXPORT(void, wxUpdateUIEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxUpdateUIEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(void, wxPaletteChangedEvent_SetChangedWindow)(void* _obj, void* win)
-{
-	((wxPaletteChangedEvent*)_obj)->SetChangedWindow((wxWindow*) win);
-}
-	
-EWXWEXPORT(void*, wxPaletteChangedEvent_GetChangedWindow)(void* _obj)
-{
-	return (void*)((wxPaletteChangedEvent*)_obj)->GetChangedWindow();
-}
-	
-EWXWEXPORT(void, wxPaletteChangedEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxPaletteChangedEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(void, wxQueryNewPaletteEvent_SetPaletteRealized)(void* _obj, int realized)
-{
-	((wxQueryNewPaletteEvent*)_obj)->SetPaletteRealized(realized != 0);
-}
-	
-EWXWEXPORT(int, wxQueryNewPaletteEvent_GetPaletteRealized)(void* _obj)
-{
-	return (int)((wxQueryNewPaletteEvent*)_obj)->GetPaletteRealized();
-}
-	
-EWXWEXPORT(void, wxQueryNewPaletteEvent_CopyObject)(void* _obj, void* obj)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxQueryNewPaletteEvent*)_obj)->CopyObject(*((wxObject*)obj));
-#endif
-}
-
-EWXWEXPORT(int, wxNavigationKeyEvent_GetDirection)(void* _obj)
-{
-	return (int)((wxNavigationKeyEvent*)_obj)->GetDirection();
-}
-	
-EWXWEXPORT(void, wxNavigationKeyEvent_SetDirection)(void* _obj, int bForward)
-{
-	((wxNavigationKeyEvent*)_obj)->SetDirection(bForward != 0);
-}
-	
-EWXWEXPORT(int, wxNavigationKeyEvent_IsWindowChange)(void* _obj)
-{
-	return (int)((wxNavigationKeyEvent*)_obj)->IsWindowChange();
-}
-	
-EWXWEXPORT(void, wxNavigationKeyEvent_SetWindowChange)(void* _obj, int bIs)
-{
-	((wxNavigationKeyEvent*)_obj)->SetWindowChange(bIs != 0);
-}
-	
-EWXWEXPORT(int, wxNavigationKeyEvent_ShouldPropagate)(void* _obj)
-{
-	return (int)((wxNavigationKeyEvent*)_obj)->ShouldPropagate();
-}
-	
-EWXWEXPORT(void, wxNavigationKeyEvent_SetPropagate)(void* _obj, int bDoIt)
-{
-	((wxNavigationKeyEvent*)_obj)->SetPropagate(bDoIt != 0);
-}
-	
-EWXWEXPORT(void*, wxNavigationKeyEvent_GetCurrentFocus)(void* _obj)
-{
-	return (void*)((wxNavigationKeyEvent*)_obj)->GetCurrentFocus();
-}
-	
-EWXWEXPORT(void, wxNavigationKeyEvent_SetCurrentFocus)(void* _obj, void* win)
-{
-	((wxNavigationKeyEvent*)_obj)->SetCurrentFocus((wxWindow*)win);
-}
-	
-EWXWEXPORT(void*, wxWindowCreateEvent_GetWindow)(void* _obj)
-{
-	return (void*)((wxWindowCreateEvent*)_obj)->GetWindow();
-}
-	
-EWXWEXPORT(void*, wxWindowDestroyEvent_GetWindow)(void* _obj)
-{
-	return (void*)((wxWindowDestroyEvent*)_obj)->GetWindow();
-}
-	
-EWXWEXPORT(void, wxIdleEvent_RequestMore)(void* _obj, int needMore)
-{
-	((wxIdleEvent*)_obj)->RequestMore(needMore != 0);
-}
-	
-EWXWEXPORT(int, wxIdleEvent_MoreRequested)(void* _obj)
-{
-	return (int)((wxIdleEvent*)_obj)->MoreRequested();
-}
-	
-EWXWEXPORT(void, wxIdleEvent_CopyObject)(void* _obj, void* object_dest)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxIdleEvent*)_obj)->CopyObject(*((wxObject*) object_dest));
-#endif
-}
-	
-EWXWEXPORT(int, wxListEvent_GetCode)(void* _obj)
-{
-#if wxVERSION_NUMBER < 2400
-	return ((wxListEvent*)_obj)->GetCode();
-#else
-	return ((wxListEvent*)_obj)->GetKeyCode();
-#endif
-}
-	
-EWXWEXPORT(int, wxListEvent_GetIndex)(void* _obj)
-{
-	return (int)((wxListEvent*)_obj)->GetIndex();
-}
-	
-EWXWEXPORT(int, wxListEvent_GetOldIndex)(void* _obj)
-{
-#if wxVERSION_NUMBER < 2400
-	return (int)((wxListEvent*)_obj)->GetOldIndex();
-#else
-	return 0;
-#endif
-}
-	
-EWXWEXPORT(int, wxListEvent_GetOldItem)(void* _obj)
-{
-#if wxVERSION_NUMBER < 2400
-	return (int)((wxListEvent*)_obj)->GetOldItem();
-#else
-	return 0;
-#endif
-}
-	
-EWXWEXPORT(int, wxListEvent_GetColumn)(void* _obj)
-{
-	return ((wxListEvent*)_obj)->GetColumn();
-}
-	
-EWXWEXPORT(int, wxListEvent_Cancelled)(void* _obj)
-{
-#if wxVERSION_NUMBER < 2400
-	return (int)((wxListEvent*)_obj)->Cancelled();
-#else
-	return 0;
-#endif
-}
-	
-EWXWEXPORT(void, wxListEvent_GetPoint)(void* _obj, void* x, void* y)
-{
-	wxPoint pos = ((wxListEvent*)_obj)->GetPoint();
-	*((int*)x) = pos.x;
-	*((int*)y) = pos.y;
-}
-	
-EWXWEXPORT(int, wxListEvent_GetLabel)(void* _obj, void* _buf)
-{
-	wxString result = ((wxListEvent*)_obj)->GetLabel();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxListEvent_GetText)(void* _obj, void* _buf)
-{
-	wxString result = ((wxListEvent*)_obj)->GetText();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxListEvent_GetImage)(void* _obj)
-{
-	return ((wxListEvent*)_obj)->GetImage();
-}
-	
-EWXWEXPORT(int, wxListEvent_GetData)(void* _obj)
-{
-	return (int)((wxListEvent*)_obj)->GetData();
-}
-	
-EWXWEXPORT(int, wxListEvent_GetMask)(void* _obj)
-{
-	return (int)((wxListEvent*)_obj)->GetMask();
-}
-	
-EWXWEXPORT(void, wxListEvent_GetItem)(void* _obj, void* _ref)
-{
-#if wxVERSION_NUMBER < 2400
-	*((wxListItem*)_ref) = ((wxListEvent*)_obj)->GetItem();
-#else
-	wxListItem* ret = new wxListItem(((wxListEvent*)_obj)->GetItem());
-	*((void**)_ref) = (void*)ret;
-#endif
-}
-	
-EWXWEXPORT(void, wxTreeEvent_GetItem)(void* _obj, void* _ref)
-{
-	*((wxTreeItemId*)_ref) = ((wxTreeEvent*)_obj)->GetItem();
-}
-	
-EWXWEXPORT(void, wxTreeEvent_GetOldItem)(void* _obj, void* _ref)
-{
-	*((wxTreeItemId*)_ref) = ((wxTreeEvent*)_obj)->GetOldItem();
-}
-	
-EWXWEXPORT(void, wxTreeEvent_GetPoint)(void* _obj, void* x, void* y)
-{
-	wxPoint pos = ((wxTreeEvent*)_obj)->GetPoint();
-	*((int*)x) = pos.x;
-	*((int*)y) = pos.y;
-}
-	
-EWXWEXPORT(int, wxTreeEvent_GetCode)(void* _obj)
-{
-#if wxVERSION_NUMBER < 2400
-	return ((wxTreeEvent*)_obj)->GetCode();
-#else
-	return ((wxTreeEvent*)_obj)->GetKeyCode();
-#endif
-}
-	
-EWXWEXPORT(int, wxTreeEvent_GetLabel)(void* _obj, void* _buf)
-{
-	wxString result = ((wxTreeEvent*)_obj)->GetLabel();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxSpinEvent_GetPosition)(void* _obj)
-{
-	return ((wxSpinEvent*)_obj)->GetPosition();
-}
-	
-EWXWEXPORT(void, wxSpinEvent_SetPosition)(void* _obj, int pos)
-{
-	((wxSpinEvent*)_obj)->SetPosition(pos);
-}
-	
-EWXWEXPORT(int, wxTimerEvent_GetInterval)(void* _obj)
-{
-	return ((wxTimerEvent*)_obj)->GetInterval();
-}
-	
-EWXWEXPORT(int, wxCalendarEvent_GetWeekDay)(void* _obj)
-{
-	return ((wxCalendarEvent*)_obj)->GetWeekDay();
-}
-
-EWXWEXPORT(void, wxCalendarEvent_GetDate)(void* _obj, void* _dte)
-{
-	*((wxDateTime*)_dte) = ((wxCalendarEvent*)_obj)->GetDate();
-}
-
-
-EWXWEXPORT(int, wxScrollEvent_GetOrientation)(void* _obj)
-{
-	return ((wxScrollEvent*)_obj)->GetOrientation();
-}
-	
-EWXWEXPORT(int, wxScrollEvent_GetPosition)(void* _obj)
-{
-	return ((wxScrollEvent*)_obj)->GetPosition();
-}
-	
-#if wxVERSION_NUMBER >= 2400
-
-EWXWEXPORT(void,wxHelpEvent_GetPosition)(void* _obj, void* x, void* y)
-{
-	wxPoint pos = ((wxHelpEvent*)_obj)->GetPosition();
-	*((int*)x) = pos.x;
-	*((int*)y) = pos.y;
-}
-	
-EWXWEXPORT(void,wxHelpEvent_SetPosition)(void* _obj, int x, int y)
-{
-	((wxHelpEvent*)_obj)->SetPosition(wxPoint(x, y));
-}
-	
-EWXWEXPORT(int,wxHelpEvent_GetLink)(void* _obj, void* _ref)
-{
-	wxString tmp =((wxHelpEvent*)_obj)->GetLink();
-        return copyStrToBuf(_ref, tmp);
-}
-	
-EWXWEXPORT(void,wxHelpEvent_SetLink)(void* _obj, void* link)
-{
-	((wxHelpEvent*)_obj)->SetLink((char*)link);
-}
-	
-EWXWEXPORT(int,wxHelpEvent_GetTarget)(void* _obj, void* _ref)
-{
-	wxString tmp =((wxHelpEvent*)_obj)->GetTarget();
-        return copyStrToBuf(_ref, tmp);
-}
-	
-EWXWEXPORT(void,wxHelpEvent_SetTarget)(void* _obj, void* target)
-{
-	((wxHelpEvent*)_obj)->SetTarget((char*)target);
-}
-	
-
-EWXWEXPORT(int,expEVT_COMMAND_BUTTON_CLICKED)()
-{
-	return (int)wxEVT_COMMAND_BUTTON_CLICKED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_CHECKBOX_CLICKED)()
-{
-	return (int)wxEVT_COMMAND_CHECKBOX_CLICKED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_CHOICE_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_CHOICE_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LISTBOX_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_LISTBOX_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LISTBOX_DOUBLECLICKED)()
-{
-	return (int)wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_CHECKLISTBOX_TOGGLED)()
-{
-	return (int)wxEVT_COMMAND_CHECKLISTBOX_TOGGLED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TEXT_UPDATED)()
-{
-	return (int)wxEVT_COMMAND_TEXT_UPDATED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TEXT_ENTER)()
-{
-	return (int)wxEVT_COMMAND_TEXT_ENTER;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_MENU_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_MENU_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TOOL_CLICKED)()
-{
-	return (int)wxEVT_COMMAND_TOOL_CLICKED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SLIDER_UPDATED)()
-{
-	return (int)wxEVT_COMMAND_SLIDER_UPDATED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_RADIOBOX_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_RADIOBOX_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_RADIOBUTTON_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_RADIOBUTTON_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SCROLLBAR_UPDATED)()
-{
-	return (int)wxEVT_COMMAND_SCROLLBAR_UPDATED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_VLBOX_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_VLBOX_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_COMBOBOX_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_COMBOBOX_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TOOL_RCLICKED)()
-{
-	return (int)wxEVT_COMMAND_TOOL_RCLICKED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TOOL_ENTER)()
-{
-	return (int)wxEVT_COMMAND_TOOL_ENTER;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SPINCTRL_UPDATED)()
-{
-	return (int)wxEVT_COMMAND_SPINCTRL_UPDATED;
-}
-
-EWXWEXPORT(int,expEVT_SOCKET)()
-{
-	return (int)wxEVT_SOCKET;
-}
-
-EWXWEXPORT(int,expEVT_TIMER )()
-{
-	return (int)wxEVT_TIMER ;
-}
-
-EWXWEXPORT(int,expEVT_LEFT_DOWN)()
-{
-	return (int)wxEVT_LEFT_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_LEFT_UP)()
-{
-	return (int)wxEVT_LEFT_UP;
-}
-
-EWXWEXPORT(int,expEVT_MIDDLE_DOWN)()
-{
-	return (int)wxEVT_MIDDLE_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_MIDDLE_UP)()
-{
-	return (int)wxEVT_MIDDLE_UP;
-}
-
-EWXWEXPORT(int,expEVT_RIGHT_DOWN)()
-{
-	return (int)wxEVT_RIGHT_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_RIGHT_UP)()
-{
-	return (int)wxEVT_RIGHT_UP;
-}
-
-EWXWEXPORT(int,expEVT_MOTION)()
-{
-	return (int)wxEVT_MOTION;
-}
-
-EWXWEXPORT(int,expEVT_ENTER_WINDOW)()
-{
-	return (int)wxEVT_ENTER_WINDOW;
-}
-
-EWXWEXPORT(int,expEVT_LEAVE_WINDOW)()
-{
-	return (int)wxEVT_LEAVE_WINDOW;
-}
-
-EWXWEXPORT(int,expEVT_LEFT_DCLICK)()
-{
-	return (int)wxEVT_LEFT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_MIDDLE_DCLICK)()
-{
-	return (int)wxEVT_MIDDLE_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_RIGHT_DCLICK)()
-{
-	return (int)wxEVT_RIGHT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_SET_FOCUS)()
-{
-	return (int)wxEVT_SET_FOCUS;
-}
-
-EWXWEXPORT(int,expEVT_KILL_FOCUS)()
-{
-	return (int)wxEVT_KILL_FOCUS;
-}
-
-EWXWEXPORT(int,expEVT_NC_LEFT_DOWN)()
-{
-	return (int)wxEVT_NC_LEFT_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_NC_LEFT_UP)()
-{
-	return (int)wxEVT_NC_LEFT_UP;
-}
-
-EWXWEXPORT(int,expEVT_NC_MIDDLE_DOWN)()
-{
-	return (int)wxEVT_NC_MIDDLE_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_NC_MIDDLE_UP)()
-{
-	return (int)wxEVT_NC_MIDDLE_UP;
-}
-
-EWXWEXPORT(int,expEVT_NC_RIGHT_DOWN)()
-{
-	return (int)wxEVT_NC_RIGHT_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_NC_RIGHT_UP)()
-{
-	return (int)wxEVT_NC_RIGHT_UP;
-}
-
-EWXWEXPORT(int,expEVT_NC_MOTION)()
-{
-	return (int)wxEVT_NC_MOTION;
-}
-
-EWXWEXPORT(int,expEVT_NC_ENTER_WINDOW)()
-{
-	return (int)wxEVT_NC_ENTER_WINDOW;
-}
-
-EWXWEXPORT(int,expEVT_NC_LEAVE_WINDOW)()
-{
-	return (int)wxEVT_NC_LEAVE_WINDOW;
-}
-
-EWXWEXPORT(int,expEVT_NC_LEFT_DCLICK)()
-{
-	return (int)wxEVT_NC_LEFT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_NC_MIDDLE_DCLICK)()
-{
-	return (int)wxEVT_NC_MIDDLE_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_NC_RIGHT_DCLICK)()
-{
-	return (int)wxEVT_NC_RIGHT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_CHAR)()
-{
-	return (int)wxEVT_CHAR;
-}
-
-EWXWEXPORT(int,expEVT_CHAR_HOOK)()
-{
-	return (int)wxEVT_CHAR_HOOK;
-}
-
-EWXWEXPORT(int,expEVT_NAVIGATION_KEY)()
-{
-	return (int)wxEVT_NAVIGATION_KEY;
-}
-
-EWXWEXPORT(int,expEVT_KEY_DOWN)()
-{
-	return (int)wxEVT_KEY_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_KEY_UP)()
-{
-	return (int)wxEVT_KEY_UP;
-}
-
-EWXWEXPORT(int,expEVT_SET_CURSOR)()
-{
-	return (int)wxEVT_SET_CURSOR;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_TOP)()
-{
-	return (int)wxEVT_SCROLL_TOP;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_BOTTOM)()
-{
-	return (int)wxEVT_SCROLL_BOTTOM;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_LINEUP)()
-{
-	return (int)wxEVT_SCROLL_LINEUP;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_LINEDOWN)()
-{
-	return (int)wxEVT_SCROLL_LINEDOWN;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_PAGEUP)()
-{
-	return (int)wxEVT_SCROLL_PAGEUP;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_PAGEDOWN)()
-{
-	return (int)wxEVT_SCROLL_PAGEDOWN;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_THUMBTRACK)()
-{
-	return (int)wxEVT_SCROLL_THUMBTRACK;
-}
-
-EWXWEXPORT(int,expEVT_SCROLL_THUMBRELEASE)()
-{
-	return (int)wxEVT_SCROLL_THUMBRELEASE;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_TOP)()
-{
-	return (int)wxEVT_SCROLLWIN_TOP;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_BOTTOM)()
-{
-	return (int)wxEVT_SCROLLWIN_BOTTOM;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_LINEUP)()
-{
-	return (int)wxEVT_SCROLLWIN_LINEUP;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_LINEDOWN)()
-{
-	return (int)wxEVT_SCROLLWIN_LINEDOWN;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_PAGEUP)()
-{
-	return (int)wxEVT_SCROLLWIN_PAGEUP;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_PAGEDOWN)()
-{
-	return (int)wxEVT_SCROLLWIN_PAGEDOWN;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_THUMBTRACK)()
-{
-	return (int)wxEVT_SCROLLWIN_THUMBTRACK;
-}
-
-EWXWEXPORT(int,expEVT_SCROLLWIN_THUMBRELEASE)()
-{
-	return (int)wxEVT_SCROLLWIN_THUMBRELEASE;
-}
-
-EWXWEXPORT(int,expEVT_SIZE)()
-{
-	return (int)wxEVT_SIZE;
-}
-
-EWXWEXPORT(int,expEVT_MOVE)()
-{
-	return (int)wxEVT_MOVE;
-}
-
-EWXWEXPORT(int,expEVT_CLOSE_WINDOW)()
-{
-	return (int)wxEVT_CLOSE_WINDOW;
-}
-
-EWXWEXPORT(int,expEVT_END_SESSION)()
-{
-	return (int)wxEVT_END_SESSION;
-}
-
-EWXWEXPORT(int,expEVT_QUERY_END_SESSION)()
-{
-	return (int)wxEVT_QUERY_END_SESSION;
-}
-
-EWXWEXPORT(int,expEVT_ACTIVATE_APP)()
-{
-	return (int)wxEVT_ACTIVATE_APP;
-}
-
-EWXWEXPORT(int,expEVT_POWER)()
-{
-	return (int)wxEVT_POWER;
-}
-
-EWXWEXPORT(int,expEVT_ACTIVATE)()
-{
-	return (int)wxEVT_ACTIVATE;
-}
-
-EWXWEXPORT(int,expEVT_CREATE)()
-{
-	return (int)wxEVT_CREATE;
-}
-
-EWXWEXPORT(int,expEVT_DESTROY)()
-{
-	return (int)wxEVT_DESTROY;
-}
-
-EWXWEXPORT(int,expEVT_SHOW)()
-{
-	return (int)wxEVT_SHOW;
-}
-
-EWXWEXPORT(int,expEVT_ICONIZE)()
-{
-	return (int)wxEVT_ICONIZE;
-}
-
-EWXWEXPORT(int,expEVT_MAXIMIZE)()
-{
-	return (int)wxEVT_MAXIMIZE;
-}
-
-EWXWEXPORT(int,expEVT_MOUSE_CAPTURE_CHANGED)()
-{
-	return (int)wxEVT_MOUSE_CAPTURE_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_PAINT)()
-{
-	return (int)wxEVT_PAINT;
-}
-
-EWXWEXPORT(int,expEVT_ERASE_BACKGROUND)()
-{
-	return (int)wxEVT_ERASE_BACKGROUND;
-}
-
-EWXWEXPORT(int,expEVT_NC_PAINT)()
-{
-	return (int)wxEVT_NC_PAINT;
-}
-
-EWXWEXPORT(int,expEVT_PAINT_ICON)()
-{
-	return (int)wxEVT_PAINT_ICON;
-}
-
-EWXWEXPORT(int,expEVT_MENU_CHAR)()
-{
-	return -1;
-}
-
-EWXWEXPORT(int,expEVT_MENU_INIT)()
-{
-	return -1;
-}
-
-EWXWEXPORT(int,expEVT_MENU_HIGHLIGHT)()
-{
-	return (int)wxEVT_MENU_HIGHLIGHT;
-}
-
-EWXWEXPORT(int,expEVT_POPUP_MENU_INIT)()
-{
-	return -1;
-}
-
-EWXWEXPORT(int,expEVT_CONTEXT_MENU)()
-{
-	return (int)wxEVT_CONTEXT_MENU;
-}
-
-EWXWEXPORT(int,expEVT_SYS_COLOUR_CHANGED)()
-{
-	return (int)wxEVT_SYS_COLOUR_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_SETTING_CHANGED)()
-{
-	return (int)wxEVT_SETTING_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_QUERY_NEW_PALETTE)()
-{
-	return (int)wxEVT_QUERY_NEW_PALETTE;
-}
-
-EWXWEXPORT(int,expEVT_PALETTE_CHANGED)()
-{
-	return (int)wxEVT_PALETTE_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_JOY_BUTTON_DOWN)()
-{
-	return (int)wxEVT_JOY_BUTTON_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_JOY_BUTTON_UP)()
-{
-	return (int)wxEVT_JOY_BUTTON_UP;
-}
-
-EWXWEXPORT(int,expEVT_JOY_MOVE)()
-{
-	return (int)wxEVT_JOY_MOVE;
-}
-
-EWXWEXPORT(int,expEVT_JOY_ZMOVE)()
-{
-	return (int)wxEVT_JOY_ZMOVE;
-}
-
-EWXWEXPORT(int,expEVT_DROP_FILES)()
-{
-	return (int)wxEVT_DROP_FILES;
-}
-
-EWXWEXPORT(int,expEVT_DRAW_ITEM)()
-{
-	return (int)wxEVT_DRAW_ITEM;
-}
-
-EWXWEXPORT(int,expEVT_MEASURE_ITEM)()
-{
-	return (int)wxEVT_MEASURE_ITEM;
-}
-
-EWXWEXPORT(int,expEVT_COMPARE_ITEM)()
-{
-	return (int)wxEVT_COMPARE_ITEM;
-}
-
-EWXWEXPORT(int,expEVT_INIT_DIALOG)()
-{
-	return (int)wxEVT_INIT_DIALOG;
-}
-
-EWXWEXPORT(int,expEVT_IDLE)()
-{
-	return (int)wxEVT_IDLE;
-}
-
-EWXWEXPORT(int,expEVT_UPDATE_UI)()
-{
-	return (int)wxEVT_UPDATE_UI;
-}
-
-EWXWEXPORT(int,expEVT_END_PROCESS)()
-{
-	return (int)wxEVT_END_PROCESS;
-}
-
-EWXWEXPORT(int,expEVT_DIALUP_CONNECTED)()
-{
-	return (int)wxEVT_DIALUP_CONNECTED;
-}
-
-EWXWEXPORT(int,expEVT_DIALUP_DISCONNECTED)()
-{
-	return (int)wxEVT_DIALUP_DISCONNECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LEFT_CLICK)()
-{
-	return (int)wxEVT_COMMAND_LEFT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LEFT_DCLICK)()
-{
-	return (int)wxEVT_COMMAND_LEFT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_RIGHT_CLICK)()
-{
-	return (int)wxEVT_COMMAND_RIGHT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_RIGHT_DCLICK)()
-{
-	return (int)wxEVT_COMMAND_RIGHT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SET_FOCUS)()
-{
-	return (int)wxEVT_COMMAND_SET_FOCUS;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_KILL_FOCUS)()
-{
-	return (int)wxEVT_COMMAND_KILL_FOCUS;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_ENTER)()
-{
-	return (int)wxEVT_COMMAND_ENTER;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_BEGIN_DRAG)()
-{
-	return (int)wxEVT_COMMAND_TREE_BEGIN_DRAG;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_BEGIN_RDRAG)()
-{
-	return (int)wxEVT_COMMAND_TREE_BEGIN_RDRAG;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_BEGIN_LABEL_EDIT)()
-{
-	return (int)wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_END_LABEL_EDIT)()
-{
-	return (int)wxEVT_COMMAND_TREE_END_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_DELETE_ITEM)()
-{
-	return (int)wxEVT_COMMAND_TREE_DELETE_ITEM;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_GET_INFO)()
-{
-	return (int)wxEVT_COMMAND_TREE_GET_INFO;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_SET_INFO)()
-{
-	return (int)wxEVT_COMMAND_TREE_SET_INFO;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_ITEM_EXPANDED)()
-{
-	return (int)wxEVT_COMMAND_TREE_ITEM_EXPANDED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_ITEM_EXPANDING)()
-{
-	return (int)wxEVT_COMMAND_TREE_ITEM_EXPANDING;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_ITEM_COLLAPSED)()
-{
-	return (int)wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_ITEM_COLLAPSING)()
-{
-	return (int)wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_SEL_CHANGED)()
-{
-	return (int)wxEVT_COMMAND_TREE_SEL_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_SEL_CHANGING)()
-{
-	return (int)wxEVT_COMMAND_TREE_SEL_CHANGING;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_KEY_DOWN)()
-{
-	return (int)wxEVT_COMMAND_TREE_KEY_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_ITEM_ACTIVATED)()
-{
-	return (int)wxEVT_COMMAND_TREE_ITEM_ACTIVATED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_ITEM_RIGHT_CLICK)()
-{
-	return (int)wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK)()
-{
-	return (int)wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TREE_END_DRAG)()
-{
-	return (int)wxEVT_COMMAND_TREE_END_DRAG;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_BEGIN_DRAG)()
-{
-	return (int)wxEVT_COMMAND_LIST_BEGIN_DRAG;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_BEGIN_RDRAG)()
-{
-	return (int)wxEVT_COMMAND_LIST_BEGIN_RDRAG;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)()
-{
-	return (int)wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_END_LABEL_EDIT)()
-{
-	return (int)wxEVT_COMMAND_LIST_END_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_DELETE_ITEM)()
-{
-	return (int)wxEVT_COMMAND_LIST_DELETE_ITEM;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_DELETE_ALL_ITEMS)()
-{
-	return (int)wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_GET_INFO)()
-{
-	return (int)wxEVT_COMMAND_LIST_GET_INFO;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_SET_INFO)()
-{
-	return (int)wxEVT_COMMAND_LIST_SET_INFO;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_ITEM_SELECTED)()
-{
-	return (int)wxEVT_COMMAND_LIST_ITEM_SELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_ITEM_DESELECTED)()
-{
-	return (int)wxEVT_COMMAND_LIST_ITEM_DESELECTED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_KEY_DOWN)()
-{
-	return (int)wxEVT_COMMAND_LIST_KEY_DOWN;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_INSERT_ITEM)()
-{
-	return (int)wxEVT_COMMAND_LIST_INSERT_ITEM;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_COL_CLICK)()
-{
-	return (int)wxEVT_COMMAND_LIST_COL_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)()
-{
-	return (int)wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)()
-{
-	return (int)wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_ITEM_ACTIVATED)()
-{
-	return (int)wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_LIST_ITEM_FOCUSED)()
-{
-	return (int)wxEVT_COMMAND_LIST_ITEM_FOCUSED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TAB_SEL_CHANGED)()
-{
-#ifdef __WXGTK__
-	return -1;
-#else
-	return (int)wxEVT_COMMAND_TAB_SEL_CHANGED;
-#endif
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TAB_SEL_CHANGING)()
-{
-#ifdef __WXGTK__
-	return -1;
-#else
-	return (int)wxEVT_COMMAND_TAB_SEL_CHANGING;
-#endif
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)()
-{
-	return (int)wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)()
-{
-	return (int)wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)()
-{
-	return (int)wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)()
-{
-	return (int)wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SPLITTER_DOUBLECLICKED)()
-{
-	return (int)wxEVT_COMMAND_SPLITTER_DOUBLECLICKED;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_SPLITTER_UNSPLIT)()
-{
-	return (int)wxEVT_COMMAND_SPLITTER_UNSPLIT;
-}
-
-EWXWEXPORT(int,expEVT_WIZARD_PAGE_CHANGED)()
-{
-	return (int)wxEVT_WIZARD_PAGE_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_WIZARD_PAGE_CHANGING)()
-{
-	return (int)wxEVT_WIZARD_PAGE_CHANGING;
-}
-
-EWXWEXPORT(int,expEVT_WIZARD_CANCEL)()
-{
-	return (int)wxEVT_WIZARD_CANCEL;
-}
-
-EWXWEXPORT(int,expEVT_CALENDAR_SEL_CHANGED)()
-{
-	return (int)wxEVT_CALENDAR_SEL_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_CALENDAR_DAY_CHANGED)()
-{
-	return (int)wxEVT_CALENDAR_DAY_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_CALENDAR_MONTH_CHANGED)()
-{
-	return (int)wxEVT_CALENDAR_MONTH_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_CALENDAR_YEAR_CHANGED)()
-{
-	return (int)wxEVT_CALENDAR_YEAR_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_CALENDAR_DOUBLECLICKED)()
-{
-	return (int)wxEVT_CALENDAR_DOUBLECLICKED;
-}
-
-EWXWEXPORT(int,expEVT_CALENDAR_WEEKDAY_CLICKED)()
-{
-	return (int)wxEVT_CALENDAR_WEEKDAY_CLICKED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_SEL_CHANGING)()
-{
-	return (int)wxEVT_PLOT_SEL_CHANGING;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_SEL_CHANGED)()
-{
-	return (int)wxEVT_PLOT_SEL_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_CLICKED)()
-{
-	return (int)wxEVT_PLOT_CLICKED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_DOUBLECLICKED)()
-{
-	return (int)wxEVT_PLOT_DOUBLECLICKED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_ZOOM_IN)()
-{
-	return (int)wxEVT_PLOT_ZOOM_IN;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_ZOOM_OUT)()
-{
-	return (int)wxEVT_PLOT_ZOOM_OUT;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_VALUE_SEL_CREATING)()
-{
-	return (int)wxEVT_PLOT_VALUE_SEL_CREATING;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_VALUE_SEL_CREATED)()
-{
-	return (int)wxEVT_PLOT_VALUE_SEL_CREATED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_VALUE_SEL_CHANGING)()
-{
-	return (int)wxEVT_PLOT_VALUE_SEL_CHANGING;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_VALUE_SEL_CHANGED)()
-{
-	return (int)wxEVT_PLOT_VALUE_SEL_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_AREA_SEL_CREATING)()
-{
-	return (int)wxEVT_PLOT_AREA_SEL_CREATING;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_AREA_SEL_CREATED)()
-{
-	return (int)wxEVT_PLOT_AREA_SEL_CREATED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_AREA_SEL_CHANGING)()
-{
-	return (int)wxEVT_PLOT_AREA_SEL_CHANGING;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_AREA_SEL_CHANGED)()
-{
-	return (int)wxEVT_PLOT_AREA_SEL_CHANGED;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_BEGIN_X_LABEL_EDIT)()
-{
-	return (int)wxEVT_PLOT_BEGIN_X_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_END_X_LABEL_EDIT)()
-{
-	return (int)wxEVT_PLOT_END_X_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_BEGIN_Y_LABEL_EDIT)()
-{
-	return (int)wxEVT_PLOT_BEGIN_Y_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_END_Y_LABEL_EDIT)()
-{
-	return (int)wxEVT_PLOT_END_Y_LABEL_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_BEGIN_TITLE_EDIT)()
-{
-	return (int)wxEVT_PLOT_BEGIN_TITLE_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_END_TITLE_EDIT)()
-{
-	return (int)wxEVT_PLOT_END_TITLE_EDIT;
-}
-
-EWXWEXPORT(int,expEVT_PLOT_AREA_CREATE)()
-{
-	return (int)wxEVT_PLOT_AREA_CREATE;
-}
-
-EWXWEXPORT(int,expEVT_USER_FIRST)()
-{
-	return (int)wxEVT_USER_FIRST;
-}
-
-EWXWEXPORT(int,expEVT_DYNAMIC_SASH_SPLIT)()
-{
-	return (int)wxEVT_DYNAMIC_SASH_SPLIT;
-}
-
-EWXWEXPORT(int,expEVT_DYNAMIC_SASH_UNIFY)()
-{
-	return (int)wxEVT_DYNAMIC_SASH_UNIFY;
-}
-
-EWXWEXPORT(int,expEVT_HELP)()
-{
-	return (int)wxEVT_HELP;
-}
-
-EWXWEXPORT(int,expEVT_DETAILED_HELP)()
-{
-	return (int)wxEVT_DETAILED_HELP;
-}
-
-EWXWEXPORT(int,expEVT_GRID_CELL_LEFT_CLICK)()
-{
-	return (int)wxEVT_GRID_CELL_LEFT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_CELL_RIGHT_CLICK)()
-{
-	return (int)wxEVT_GRID_CELL_RIGHT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_CELL_LEFT_DCLICK)()
-{
-	return (int)wxEVT_GRID_CELL_LEFT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_CELL_RIGHT_DCLICK)()
-{
-	return (int)wxEVT_GRID_CELL_RIGHT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_LABEL_LEFT_CLICK)()
-{
-	return (int)wxEVT_GRID_LABEL_LEFT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_LABEL_RIGHT_CLICK)()
-{
-	return (int)wxEVT_GRID_LABEL_RIGHT_CLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_LABEL_LEFT_DCLICK)()
-{
-	return (int)wxEVT_GRID_LABEL_LEFT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_LABEL_RIGHT_DCLICK)()
-{
-	return (int)wxEVT_GRID_LABEL_RIGHT_DCLICK;
-}
-
-EWXWEXPORT(int,expEVT_GRID_ROW_SIZE)()
-{
-	return (int)wxEVT_GRID_ROW_SIZE;
-}
-
-EWXWEXPORT(int,expEVT_GRID_COL_SIZE)()
-{
-	return (int)wxEVT_GRID_COL_SIZE;
-}
-
-EWXWEXPORT(int,expEVT_GRID_RANGE_SELECT)()
-{
-	return (int)wxEVT_GRID_RANGE_SELECT;
-}
-
-EWXWEXPORT(int,expEVT_GRID_CELL_CHANGE)()
-{
-	return (int)wxEVT_GRID_CELL_CHANGE;
-}
-
-EWXWEXPORT(int,expEVT_GRID_SELECT_CELL)()
-{
-	return (int)wxEVT_GRID_SELECT_CELL;
-}
-
-EWXWEXPORT(int,expEVT_GRID_EDITOR_SHOWN)()
-{
-	return (int)wxEVT_GRID_EDITOR_SHOWN;
-}
-
-EWXWEXPORT(int,expEVT_GRID_EDITOR_HIDDEN)()
-{
-	return (int)wxEVT_GRID_EDITOR_HIDDEN;
-}
-
-EWXWEXPORT(int,expEVT_GRID_EDITOR_CREATED)()
-{
-	return (int)wxEVT_GRID_EDITOR_CREATED;
-}
-
-#endif
-
-}
diff --git a/wxc/src/ewxw/eljfiledialog.cpp b/wxc/src/ewxw/eljfiledialog.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljfiledialog.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxFileDialog_Create) (void* _prt, void* _msg, void* _dir, void* _fle, void* _wcd, int _lft, int _top, int _stl)
-{
-	return (void*) new wxFileDialog ((wxWindow*)_prt, (wxChar*)_msg, (wxChar*) _dir, (wxChar*) _fle, (wxChar*) _wcd, _stl, wxPoint(_lft, _top));
-}
-
-EWXWEXPORT(void, wxFileDialog_SetMessage)(void* _obj, void* message)
-{
-	((wxFileDialog*)_obj)->SetMessage((wxChar*)message);
-}
-	
-EWXWEXPORT(void, wxFileDialog_SetPath)(void* _obj, void* path)
-{
-	((wxFileDialog*)_obj)->SetPath((wxChar*)path);
-}
-	
-EWXWEXPORT(void, wxFileDialog_SetDirectory)(void* _obj, void* dir)
-{
-	((wxFileDialog*)_obj)->SetDirectory((wxChar*)dir);
-}
-	
-EWXWEXPORT(void, wxFileDialog_SetFilename)(void* _obj, void* name)
-{
-	((wxFileDialog*)_obj)->SetFilename((wxChar*)name);
-}
-	
-EWXWEXPORT(void, wxFileDialog_SetWildcard)(void* _obj, void* wildCard)
-{
-	((wxFileDialog*)_obj)->SetWildcard((wxChar*)wildCard);
-}
-	
-EWXWEXPORT(void, wxFileDialog_SetStyle)(void* _obj, int style)
-{
-	((wxFileDialog*)_obj)->SetStyle((long)style);
-}
-	
-EWXWEXPORT(void, wxFileDialog_SetFilterIndex)(void* _obj, int filterIndex)
-{
-	((wxFileDialog*)_obj)->SetFilterIndex(filterIndex);
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetMessage)(void* _obj, void* _buf)
-{
-	wxString result = ((wxFileDialog*)_obj)->GetMessage();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetPath)(void* _obj, void* _buf)
-{
-	wxString result = ((wxFileDialog*)_obj)->GetPath();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetPaths)(void* _obj, void* paths)
-{
-	wxArrayString arr;
-	((wxFileDialog*)_obj)->GetPaths(arr);
-	if (paths)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)paths)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetDirectory)(void* _obj, void* _buf)
-{
-	wxString result =((wxFileDialog*)_obj)->GetDirectory();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetFilename)(void* _obj, void* _buf)
-{
-	wxString result =((wxFileDialog*)_obj)->GetFilename();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetFilenames)(void* _obj, void* paths)
-{
-	wxArrayString arr;
-	((wxFileDialog*)_obj)->GetFilenames(arr);
-	if (paths)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)paths)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetWildcard)(void* _obj, void* _buf)
-{
-	wxString result =((wxFileDialog*)_obj)->GetWildcard();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetStyle)(void* _obj)
-{
-	return (int)((wxFileDialog*)_obj)->GetStyle();
-}
-	
-EWXWEXPORT(int, wxFileDialog_GetFilterIndex)(void* _obj)
-{
-	return ((wxFileDialog*)_obj)->GetFilterIndex();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljfilehist.cpp b/wxc/src/ewxw/eljfilehist.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljfilehist.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "wrapper.h"
-#include "wx/docview.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxFileHistory_Create)(int maxFiles)
-{
-	return (void*)new wxFileHistory(maxFiles);
-}
-	
-EWXWEXPORT(void,wxFileHistory_Delete)(void* _obj)
-{
-	delete (wxFileHistory*)_obj;
-}
-	
-EWXWEXPORT(void,wxFileHistory_AddFileToHistory)(void* _obj, void* file)
-{
-	((wxFileHistory*)_obj)->AddFileToHistory((const wxChar*)file);
-}
-	
-EWXWEXPORT(void,wxFileHistory_RemoveFileFromHistory)(void* _obj, int i)
-{
-	((wxFileHistory*)_obj)->RemoveFileFromHistory(i);
-}
-	
-EWXWEXPORT(int,wxFileHistory_GetMaxFiles)(void* _obj)
-{
-	return ((wxFileHistory*)_obj)->GetMaxFiles();
-}
-	
-EWXWEXPORT(void,wxFileHistory_UseMenu)(void* _obj, void* menu)
-{
-	((wxFileHistory*)_obj)->UseMenu((wxMenu*)menu);
-}
-	
-EWXWEXPORT(void,wxFileHistory_RemoveMenu)(void* _obj, void* menu)
-{
-	((wxFileHistory*)_obj)->RemoveMenu((wxMenu*)menu);
-}
-	
-EWXWEXPORT(void,wxFileHistory_Load)(void* _obj, void* config)
-{
-	((wxFileHistory*)_obj)->Load(*((wxConfigBase*)config));
-}
-	
-EWXWEXPORT(void,wxFileHistory_Save)(void* _obj, void* config)
-{
-	((wxFileHistory*)_obj)->Save(*((wxConfigBase*)config));
-}
-	
-EWXWEXPORT(void,wxFileHistory_AddFilesToMenu)(void* _obj, void* menu)
-{
-	if (menu)
-		((wxFileHistory*)_obj)->AddFilesToMenu((wxMenu*)menu);
-	else
-		((wxFileHistory*)_obj)->AddFilesToMenu();
-}
-	
-EWXWEXPORT(int,wxFileHistory_GetHistoryFile)(void* _obj, int i, void* _buf)
-{
-	wxString tmp = ((wxFileHistory*)_obj)->GetHistoryFile(i);
-	return copyStrToBuf(_buf, tmp);
-}
-	
-EWXWEXPORT(int,wxFileHistory_GetCount)(void* _obj)
-{
-#if (wxVERSION_NUMBER <= 2600)
-	return ((wxFileHistory*)_obj)->GetNoHistoryFiles();
-#else
-	return ((wxFileHistory*)_obj)->GetCount();
-#endif
-}
-	
-EWXWEXPORT(int,wxFileHistory_GetMenus)(void* _obj, void* _ref)
-{
-	wxList lst = ((wxFileHistory*)_obj)->GetMenus();
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < lst.GetCount(); i++)
-			((void**)_ref)[i] = (void*)lst.Item(i);
-	}
-	
-	return lst.GetCount();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljfindrepldlg.cpp b/wxc/src/ewxw/eljfindrepldlg.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljfindrepldlg.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-#include "wx/fdrepdlg.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxFindReplaceData_CreateDefault)()
-{
-	return (void*)new wxFindReplaceData();
-}
-	
-EWXWEXPORT(void*,wxFindReplaceData_Create)(int flags)
-{
-	return (void*)new wxFindReplaceData((wxUint32)flags);
-}
-
-EWXWEXPORT(void,wxFindReplaceData_Delete)(void* _obj)
-{
-	delete (wxFindReplaceData*)_obj;
-}
-	
-EWXWEXPORT(int,wxFindReplaceData_GetFindString)(void* _obj, void* _ref)
-{
-	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
-        return copyStrToBuf(_ref, tmp);
-}
-	
-EWXWEXPORT(int,wxFindReplaceData_GetReplaceString)(void* _obj, void* _ref)
-{
-	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
-        return copyStrToBuf(_ref, tmp);
-}
-	
-EWXWEXPORT(int,wxFindReplaceData_GetFlags)(void* _obj)
-{
-	return ((wxFindReplaceData*)_obj)->GetFlags();
-}
-	
-EWXWEXPORT(void,wxFindReplaceData_SetFlags)(void* _obj, int flags)
-{
-	((wxFindReplaceData*)_obj)->SetFlags((wxUint32)flags);
-}
-	
-EWXWEXPORT(void,wxFindReplaceData_SetFindString)(void* _obj, void* str)
-{
-	((wxFindReplaceData*)_obj)->SetFindString((wxChar*)str);
-}
-	
-EWXWEXPORT(void,wxFindReplaceData_SetReplaceString)(void* _obj, void* str)
-{
-	((wxFindReplaceData*)_obj)->SetReplaceString((wxChar*)str);
-}
-	
-
-EWXWEXPORT(int,wxFindDialogEvent_GetFlags)(void* _obj)
-{
-	return ((wxFindDialogEvent*)_obj)->GetFlags();
-}
-	
-EWXWEXPORT(int,wxFindDialogEvent_GetFindString)(void* _obj, void* _ref)
-{
-	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
-        return copyStrToBuf(_ref, tmp);
-}
-	
-EWXWEXPORT(int,wxFindDialogEvent_GetReplaceString)(void* _obj, void* _ref)
-{
-	wxString tmp = ((wxFindReplaceData*)_obj)->GetFindString();
-        return copyStrToBuf(_ref, tmp);
-}
-	
-
-EWXWEXPORT(void*,wxFindReplaceDialog_Create)(void* parent, void* data, void* title, int style)
-{
-	return (void*)new wxFindReplaceDialog((wxWindow*)parent, (wxFindReplaceData*)data, (wxChar*)title, style);
-}
-	
-EWXWEXPORT(void*,wxFindReplaceDialog_GetData)(void* _obj)
-{
-	return (void*)((wxFindReplaceDialog*)_obj)->GetData();
-}
-	
-EWXWEXPORT(void,wxFindReplaceDialog_SetData)(void* _obj, void* data)
-{
-	((wxFindReplaceDialog*)_obj)->SetData((wxFindReplaceData*)data);
-}
-	
-
-EWXWEXPORT(int,expEVT_COMMAND_FIND)()
-{
-	return (int)wxEVT_COMMAND_FIND;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_FIND_NEXT)()
-{
-	return (int)wxEVT_COMMAND_FIND_NEXT;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_FIND_REPLACE)()
-{
-	return (int)wxEVT_COMMAND_FIND_REPLACE;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_FIND_REPLACE_ALL)()
-{
-	return (int)wxEVT_COMMAND_FIND_REPLACE_ALL;
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_FIND_CLOSE)()
-{
-	return (int)wxEVT_COMMAND_FIND_CLOSE;
-}
-
-}
-#endif
diff --git a/wxc/src/ewxw/eljfl.cpp b/wxc/src/ewxw/eljfl.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljfl.cpp
+++ /dev/null
@@ -1,1550 +0,0 @@
-#include "wrapper.h"
-#include "wx/fl/toolwnd.h"
-#include "wx/fl/antiflickpl.h"
-#include "wx/fl/bardragpl.h"
-#include "wx/fl/barhintspl.h"
-#include "wx/fl/cbcustom.h"
-#include "wx/fl/dyntbar.h"
-#include "wx/fl/dyntbarhnd.h"
-#include "wx/fl/gcupdatesmgr.h"
-#include "wx/fl/hintanimpl.h"
-#include "wx/fl/newbmpbtn.h"
-#include "wx/fl/panedrawpl.h"
-#include "wx/fl/rowdragpl.h"
-#include "wx/fl/rowlayoutpl.h"
-
-typedef void (*TButtonClick)(void* _obj, int _btn);
-typedef int  (*TTitleClick)(void* _obj, void* _evt);
-typedef void (*TMiniDraw)(void* _obj, void* _dct);
-
-class ELJToolWindow : public wxToolWindow
-{
-    private:
-        void*        EifObj;
-        TButtonClick BtnCb;
-        TTitleClick  TtlCb;
-    public:
-        ELJToolWindow(void* _obj, void* _btn, void* _ttl) : wxToolWindow()
-        {
-        	EifObj = _obj;
-        	BtnCb = (TButtonClick)_btn;
-        	TtlCb = (TTitleClick)_ttl;
-        }
-    
-    virtual void OnMiniButtonClicked( int btnIdx ) {BtnCb (EifObj, btnIdx);}
-    virtual bool HandleTitleClick( wxMouseEvent& event ) { return TtlCb (EifObj, (void*)&event) != 0; }
-};
-
-class ELJMiniButton : public cbMiniButton
-{
-    private:
-        void*     EifObj;
-        TMiniDraw DrwCb;
-	public:
-        ELJMiniButton(void* _obj, void* _drw) : cbMiniButton()
-        {
-        	EifObj = _obj;
-        	DrwCb = (TMiniDraw)_drw;
-		}
-		
-		virtual void Draw(wxDC& dc) {DrwCb(EifObj, (void*)&dc);}
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxToolWindow_Create)(void* _obj, void* _btn, void* _ttl)
-{
-    return (void*) new ELJToolWindow(_obj, _btn, _ttl);
-}
-EWXWEXPORT(void, wxToolWindow_SetClient)(void* _obj, void* _wnd)
-{
-	((ELJToolWindow*)_obj)->SetClient((wxWindow*)_wnd);
-}
-
-EWXWEXPORT(void*, wxToolWindow_GetClient)(void* _obj)
-{
-	return (void*)((ELJToolWindow*)_obj)->GetClient();
-}
-
-EWXWEXPORT(void, wxToolWindow_SetTitleFont)(void* _obj, void* _fnt)
-{
-	((ELJToolWindow*)_obj)->SetTitleFont (*((wxFont*)_fnt));
-}
-
-EWXWEXPORT(void, wxToolWindow_AddMiniButton)(void* _obj, void* _btn)
-{
-	((ELJToolWindow*)_obj)->AddMiniButton((cbMiniButton*)_btn);
-}
-
-EWXWEXPORT(void*,cbMiniButton_Create)()
-{
-	return (void*) new cbMiniButton();
-}
-	
-EWXWEXPORT(void,cbMiniButton_Delete)(void* _obj)
-{
-	delete (cbMiniButton*)_obj;
-}
-	
-EWXWEXPORT(void,cbMiniButton_Pos)(void* _obj, void* x, void* y)
-{
-	wxPoint pos = ((cbMiniButton*)_obj)->mPos;
-	*((int*)x) = pos.x;
-	*((int*)y) = pos.y;
-}
-	
-EWXWEXPORT(void,cbMiniButton_Dim)(void* _obj, void* w, void* h)
-{
-	wxSize size = ((cbMiniButton*)_obj)->mDim;
-	*((int*)w) = size.x;
-	*((int*)h) = size.y;
-}
-	
-EWXWEXPORT(int,cbMiniButton_Visible)(void* _obj)
-{
-	return (int)((cbMiniButton*)_obj)->mVisible;
-}
-	
-EWXWEXPORT(int,cbMiniButton_Enabled)(void* _obj)
-{
-	return (int)((cbMiniButton*)_obj)->mEnabled;
-}
-	
-EWXWEXPORT(void*,cbMiniButton_Layout)(void* _obj)
-{
-	return (void*)((cbMiniButton*)_obj)->mpLayout;
-}
-	
-EWXWEXPORT(void*,cbMiniButton_Pane)(void* _obj)
-{
-	return (void*)((cbMiniButton*)_obj)->mpPane;
-}
-	
-EWXWEXPORT(void*,cbMiniButton_Plugin)(void* _obj)
-{
-	return (void*)((cbMiniButton*)_obj)->mpPlugin;
-}
-	
-EWXWEXPORT(void*,cbMiniButton_Wnd)(void* _obj)
-{
-	return (void*)((cbMiniButton*)_obj)->mpWnd;
-}
-	
-EWXWEXPORT(int,cbMiniButton_DragStarted)(void* _obj)
-{
-	return (int)((cbMiniButton*)_obj)->mDragStarted;
-}
-	
-EWXWEXPORT(int,cbMiniButton_Pressed)(void* _obj)
-{
-	return (int)((cbMiniButton*)_obj)->mPressed;
-}
-	
-EWXWEXPORT(void,cbMiniButton_SetPos)(void* _obj, int x, int y)
-{
-	((cbMiniButton*)_obj)->SetPos(wxPoint(x, y));
-}
-	
-EWXWEXPORT(int,cbMiniButton_HitTest)(void* _obj,  int x, int y)
-{
-	return (int)((cbMiniButton*)_obj)->HitTest(wxPoint(x, y));
-}
-	
-EWXWEXPORT(void,cbMiniButton_Refresh)(void* _obj)
-{
-	((cbMiniButton*)_obj)->Refresh();
-}
-	
-EWXWEXPORT(int,cbMiniButton_WasClicked)(void* _obj)
-{
-	return (int)((cbMiniButton*)_obj)->WasClicked();
-}
-	
-EWXWEXPORT(void,cbMiniButton_Reset)(void* _obj)
-{
-	((cbMiniButton*)_obj)->Reset();
-}
-	
-EWXWEXPORT(void,cbMiniButton_Enable)(void* _obj,  int enable)
-{
-	((cbMiniButton*)_obj)->Enable(enable != 0);
-}
-	
-EWXWEXPORT(int,cbMiniButton_IsPressed)(void* _obj)
-{
-	return (int)((cbMiniButton*)_obj)->IsPressed();
-}
-	
-EWXWEXPORT(void*,cbCloseBox_Create)()
-{
-	return (void*) new cbCloseBox();
-}
-	
-EWXWEXPORT(void*,cbCollapseBox_Create)()
-{
-	return (void*) new cbCollapseBox();
-}
-	
-EWXWEXPORT(void*,cbDockBox_Create)()
-{
-	return (void*) new cbDockBox();
-}
-	
-EWXWEXPORT(void*,cbFloatedBarWindow_Create)(void* _obj)
-{
-	return (void*) new cbFloatedBarWindow();
-}
-	
-EWXWEXPORT(void,cbFloatedBarWindow_SetBar)(void* _obj, void* _bar)
-{
-	((cbFloatedBarWindow*)_obj)->SetBar((cbBarInfo*)_bar);
-}
-	
-EWXWEXPORT(void,cbFloatedBarWindow_SetLayout)(void* _obj, void* _layout)
-{
-	((cbFloatedBarWindow*)_obj)->SetLayout((wxFrameLayout*)_layout);
-}
-	
-EWXWEXPORT(void*,cbFloatedBarWindow_GetBar)(void* _obj)
-{
-	return (void*)((cbFloatedBarWindow*)_obj)->GetBar();
-}
-	
-EWXWEXPORT(void,cbFloatedBarWindow_PositionFloatedWnd)(void* _obj, int _x, int _y, int _w, int _h)
-{
-	((cbFloatedBarWindow*)_obj)->PositionFloatedWnd(_x, _y, _w, _h);
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_Create)(void* pParentFrame, void* pFrameClient, int activateNow)
-{
-	return (void*) new wxFrameLayout((wxWindow*)pParentFrame, (wxWindow*)pFrameClient, activateNow != 0);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_Delete)(void* _obj)
-{
-	delete (wxFrameLayout*)_obj;
-}
-
-EWXWEXPORT(void,wxFrameLayout_EnableFloating)(void* _obj, int enable)
-{
-	((wxFrameLayout*)_obj)->EnableFloating(enable != 0);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_Activate)(void* _obj)
-{
-	((wxFrameLayout*)_obj)->Activate();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_Deactivate)(void* _obj)
-{
-	((wxFrameLayout*)_obj)->Deactivate();
-}
-
-EWXWEXPORT(void,wxFrameLayout_HideBarWindows)(void* _obj)
-{
-	((wxFrameLayout*)_obj)->HideBarWindows();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_DestroyBarWindows)(void* _obj)
-{
-	return ((wxFrameLayout*)_obj)->DestroyBarWindows();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_SetFrameClient)(void* _obj, void* pFrameClient)
-{
-	((wxFrameLayout*)_obj)->SetFrameClient((wxWindow*)pFrameClient);
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_GetFrameClient)(void* _obj)
-{
-	return (void*)((wxFrameLayout*)_obj)->GetFrameClient();
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_GetParentFrame)(void* _obj)
-{
-	return (void*)((wxFrameLayout*)_obj)->mpFrame;
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_GetPane)(void* _obj, int alignment)
-{
-	return (void*)((wxFrameLayout*)_obj)->GetPane(alignment);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_AddBar)(void* _obj, void* pBarWnd, void* dimInfo, int alignment, int rowNo, int columnPos, void* name, int spyEvents, int state)
-{
-	((wxFrameLayout*)_obj)->AddBar((wxWindow*)pBarWnd, *((cbDimInfo*)dimInfo), alignment, rowNo, columnPos, (char*)name, spyEvents != 0, state);
-}
-	
-EWXWEXPORT(int,wxFrameLayout_RedockBar)(void* _obj, void* pBar, int x, int y, int w, int h, void* pToPane, int updateNow)
-{
-	return (int)((wxFrameLayout*)_obj)->RedockBar((cbBarInfo*)pBar, wxRect(x, y, w, h), (cbDockPane*)pToPane, updateNow != 0);
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_FindBarByName)(void* _obj, void* name)
-{
-	return (void*)((wxFrameLayout*)_obj)->FindBarByName((char*)name);
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_FindBarByWindow)(void* _obj, void* pWnd)
-{
-	return (void*)((wxFrameLayout*)_obj)->FindBarByWindow((wxWindow*)pWnd);
-}
-	
-EWXWEXPORT(int,wxFrameLayout_GetBars)(void* _obj, void* _ref)
-{
-	BarArrayT arr = ((wxFrameLayout*)_obj)->GetBars();
-	
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((void**)_ref)[i] = arr.Item(i);
-	}
-	
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_SetBarState)(void* _obj, void* pBar, int newStatem, int updateNow)
-{
-	((wxFrameLayout*)_obj)->SetBarState((cbBarInfo*)pBar, newStatem, updateNow != 0);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_InverseVisibility)(void* _obj, void* pBar)
-{
-	((wxFrameLayout*)_obj)->InverseVisibility((cbBarInfo*)pBar);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_ApplyBarProperties)(void* _obj, void* pBar)
-{
-	((wxFrameLayout*)_obj)->ApplyBarProperties((cbBarInfo*)pBar);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_RemoveBar)(void* _obj, void* pBar)
-{
-	((wxFrameLayout*)_obj)->RemoveBar((cbBarInfo*)pBar);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_RecalcLayout)(void* _obj, int repositionBarsNow)
-{
-	((wxFrameLayout*)_obj)->RecalcLayout(repositionBarsNow != 0);
-}
-	
-EWXWEXPORT(int,wxFrameLayout_GetClientHeight)(void* _obj)
-{
-	return ((wxFrameLayout*)_obj)->GetClientHeight();
-}
-	
-EWXWEXPORT(int,wxFrameLayout_GetClientWidth)(void* _obj)
-{
-	return ((wxFrameLayout*)_obj)->GetClientWidth();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_GetClientRect)(void* _obj, void* x, void* y, void* w, void* h)
-{
-	wxRect rect = ((wxFrameLayout*)_obj)->GetClientRect();
-	*((int*)x) = rect.x;
-	*((int*)y) = rect.y;
-	*((int*)w) = rect.width;
-	*((int*)h) = rect.height;
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_GetUpdatesManager)(void* _obj)
-{
-	return (void*)((wxFrameLayout*)_obj)->mpUpdatesMgr;
-}
-	
-EWXWEXPORT(void,wxFrameLayout_SetUpdatesManager)(void* _obj, void* pUMgr)
-{
-	((wxFrameLayout*)_obj)->SetUpdatesManager((cbUpdatesManagerBase*)pUMgr);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_GetPaneProperties)(void* _obj, void* props, int alignment)
-{
-	((wxFrameLayout*)_obj)->GetPaneProperties(*((cbCommonPaneProperties*)props), alignment);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_SetPaneProperties)(void* _obj, void* props, int paneMask)
-{
-	((wxFrameLayout*)_obj)->SetPaneProperties(*((cbCommonPaneProperties*)props), paneMask);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_SetMargins)(void* _obj, int top, int bottom, int left, int right, int paneMask)
-{
-	((wxFrameLayout*)_obj)->SetMargins(top, bottom, left, right, paneMask);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_SetPaneBackground)(void* _obj, void* colour)
-{
-	((wxFrameLayout*)_obj)->SetPaneBackground(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_RefreshNow)(void* _obj, int recalcLayout)
-{
-	((wxFrameLayout*)_obj)->RefreshNow(recalcLayout != 0);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_OnSize)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->OnSize(*((wxSizeEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_OnLButtonDown)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->OnLButtonDown(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_OnLDblClick)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->OnLDblClick(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_OnLButtonUp)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->OnLButtonUp(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_OnRButtonDown)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->OnRButtonDown(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_OnRButtonUp)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->OnRButtonUp(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_OnMouseMove)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->OnMouseMove(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_FirePluginEvent)(void* _obj, void* event)
-{
-	((wxFrameLayout*)_obj)->FirePluginEvent(*((cbPluginEvent*)event));
-}
-	
-EWXWEXPORT(void,wxFrameLayout_CaptureEventsForPlugin)(void* _obj, void* pPlugin)
-{
-	((wxFrameLayout*)_obj)->CaptureEventsForPlugin((cbPluginBase*)pPlugin);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_ReleaseEventsFromPlugin)(void* _obj, void* pPlugin)
-{
-	((wxFrameLayout*)_obj)->ReleaseEventsFromPlugin((cbPluginBase*)pPlugin);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_CaptureEventsForPane)(void* _obj, void* toPane)
-{
-	((wxFrameLayout*)_obj)->CaptureEventsForPane((cbDockPane*)toPane);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_ReleaseEventsFromPane)(void* _obj, void* fromPane)
-{
-	((wxFrameLayout*)_obj)->ReleaseEventsFromPane((cbDockPane*)fromPane);
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_GetTopPlugin)(void* _obj)
-{
-	return (void*)((wxFrameLayout*)_obj)->mpTopPlugin;
-}
-	
-EWXWEXPORT(void,wxFrameLayout_SetTopPlugin)(void* _obj, void* pPlugin)
-{
-	((wxFrameLayout*)_obj)->SetTopPlugin((cbPluginBase*)pPlugin);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_PushPlugin)(void* _obj, void* pPugin)
-{
-	((wxFrameLayout*)_obj)->PushPlugin((cbPluginBase*)pPugin);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_PopPlugin)(void* _obj)
-{
-	((wxFrameLayout*)_obj)->PopPlugin();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_PopAllPlugins)(void* _obj)
-{
-	((wxFrameLayout*)_obj)->PopAllPlugins();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_PushDefaultPlugins)(void* _obj)
-{
-	((wxFrameLayout*)_obj)->PushDefaultPlugins();
-}
-	
-EWXWEXPORT(void,wxFrameLayout_AddPlugin)(void* _obj, void* pPlInfo, int paneMask)
-{
-	((wxFrameLayout*)_obj)->AddPlugin((wxClassInfo*)pPlInfo, paneMask);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_AddPluginBefore)(void* _obj, void* pNextPlInfo, void* pPlInfo, int paneMask)
-{
-	((wxFrameLayout*)_obj)->AddPluginBefore((wxClassInfo*)pNextPlInfo, (wxClassInfo*)pPlInfo, paneMask);
-}
-	
-EWXWEXPORT(void,wxFrameLayout_RemovePlugin)(void* _obj, void* pPlInfo)
-{
-	((wxFrameLayout*)_obj)->RemovePlugin((wxClassInfo*)pPlInfo);
-}
-	
-EWXWEXPORT(void*,wxFrameLayout_FindPlugin)(void* _obj, void* pPlInfo )
-{
-	return (void*)((wxFrameLayout*)_obj)->FindPlugin((wxClassInfo*)pPlInfo);
-}
-	
-EWXWEXPORT(int,wxFrameLayout_HasTopPlugin)(void* _obj)
-{
-	return (int)((wxFrameLayout*)_obj)->HasTopPlugin();
-}
-	
-EWXWEXPORT(void*,cbDimInfo_CreateDefault)()
-{
-	return (void*) new cbDimInfo();
-}
-	
-EWXWEXPORT(void*,cbDimInfo_CreateWithHandler)(void* pDimHandler, int isFixed)
-{
-	return (void*) new cbDimInfo((cbBarDimHandlerBase*)pDimHandler, isFixed != 0);
-}
-	
-EWXWEXPORT(void*,cbDimInfo_CreateWithInfo)(int dh_x, int dh_y, int dv_x, int dv_y, int f_x, int f_y, int isFixed, int horizGap, int vertGap, void* pDimHandler)
-{
-	return (void*) new cbDimInfo(dh_x, dh_y, dv_x, dv_y, f_x, f_y, isFixed != 0, horizGap, vertGap, (cbBarDimHandlerBase*)pDimHandler);
-}
-	
-EWXWEXPORT(void*,cbDimInfo_Create)(int x, int y, bool isFixed, int gap, void* pDimHandler)
-{
-	return (void*) new cbDimInfo(x, y, isFixed != 0, gap, (cbBarDimHandlerBase*)pDimHandler);
-}
-	
-EWXWEXPORT(void,cbDimInfo_Delete)(void* _obj)
-{
-	delete (cbDimInfo*)_obj;
-}
-
-EWXWEXPORT(void,cbDimInfo_Assign)(void* _obj, void* other)
-{
-	*((cbDimInfo*)_obj) = *((cbDimInfo*)other);
-}
-	
-EWXWEXPORT(void*,cbDimInfo_GetDimHandler)(void* _obj)
-{
-	return (void*)((cbDimInfo*)_obj)->GetDimHandler();
-}
-	
-EWXWEXPORT(void*,cbBarInfo_Create)()
-{
-	return (void*) new cbBarInfo();
-}
-	
-EWXWEXPORT(void,cbBarInfo_Delete)(void* _obj)
-{
-	delete (cbBarInfo*)_obj;
-}
-	
-EWXWEXPORT(int,cbBarInfo_IsFixed)(void* _obj)
-{
-	return (int)((cbBarInfo*)_obj)->IsFixed();
-}
-	
-EWXWEXPORT(int,cbBarInfo_IsExpanded)(void* _obj)
-{
-	return (int)((cbBarInfo*)_obj)->IsExpanded();
-}
-	
-EWXWEXPORT(void*,cbBarSpy_CreateDefault)()
-{
-	return (void*) new cbBarSpy();
-}
-	
-EWXWEXPORT(void*,cbBarSpy_Create)(void* pPanel)
-{
-	return (void*) new cbBarSpy((wxFrameLayout*)pPanel);
-}
-	
-EWXWEXPORT(void,cbBarSpy_Delete)(void* _obj)
-{
-	delete (cbBarSpy*)_obj;
-}
-	
-EWXWEXPORT(void,cbBarSpy_SetBarWindow)(void* _obj, void* pWnd)
-{
-	((cbBarSpy*)_obj)->SetBarWindow((wxWindow*)pWnd);
-}
-	
-EWXWEXPORT(int,cbBarSpy_ProcessEvent)(void* _obj, void* event)
-{
-	return (int)((cbBarSpy*)_obj)->ProcessEvent(*((wxEvent*)event));
-}
-	
-EWXWEXPORT(void*,cbRowInfo_Create)()
-{
-	return (void*) new cbRowInfo();
-}
-	
-EWXWEXPORT(void,cbRowInfo_Delete)(void* _obj)
-{
-	delete (cbRowInfo*)_obj;
-}
-	
-EWXWEXPORT(void*,cbRowInfo_GetFirstBar)(void* _obj)
-{
-	return (void*)((cbRowInfo*)_obj)->GetFirstBar();
-}
-	
-EWXWEXPORT(void*,cbDockPane_CreateDefault)()
-{
-	return (void*) new cbDockPane();
-}
-	
-EWXWEXPORT(void*,cbDockPane_Create)(int alignment, void* pPanel)
-{
-	return (void*) new cbDockPane(alignment, (wxFrameLayout*)pPanel);
-}
-	
-EWXWEXPORT(void,cbDockPane_Delete)(void* _obj)
-{
-	delete (cbDockPane*)_obj;
-}
-	
-EWXWEXPORT(void,cbDockPane_SetMargins)(void* _obj, int top, int bottom, int left, int right)
-{
-	((cbDockPane*)_obj)->SetMargins(top, bottom, left, right);
-}
-	
-EWXWEXPORT(void,cbDockPane_RemoveBar)(void* _obj, void* pBar)
-{
-	((cbDockPane*)_obj)->RemoveBar((cbBarInfo*)pBar);
-}
-	
-EWXWEXPORT(void,cbDockPane_InsertBarByCoord)(void* _obj, void* pBar, int x, int y, int w, int h)
-{
-	((cbDockPane*)_obj)->InsertBar((cbBarInfo*)pBar, wxRect(x, y, w, h));
-}
-	
-EWXWEXPORT(void,cbDockPane_InsertBarToRow)(void* _obj, void* pBar, void* pIntoRow)
-{
-	((cbDockPane*)_obj)->InsertBar((cbBarInfo*)pBar, (cbRowInfo*)pIntoRow);
-}
-	
-EWXWEXPORT(void,cbDockPane_InsertBarByInfo)(void* _obj, void* pBarInfo)
-{
-	((cbDockPane*)_obj)->InsertBar((cbBarInfo*)pBarInfo);
-}
-	
-EWXWEXPORT(void,cbDockPane_RemoveRow)(void* _obj, void* pRow)
-{
-	((cbDockPane*)_obj)->RemoveRow((cbRowInfo*)pRow);
-}
-	
-EWXWEXPORT(void,cbDockPane_InsertRow)(void* _obj, void* pRow, void* pBeforeRow)
-{
-	((cbDockPane*)_obj)->InsertRow((cbRowInfo*)pRow, (cbRowInfo*)pBeforeRow);
-}
-	
-EWXWEXPORT(void,cbDockPane_SetPaneWidth)(void* _obj, int width)
-{
-	((cbDockPane*)_obj)->SetPaneWidth(width);
-}
-	
-EWXWEXPORT(void,cbDockPane_SetBoundsInParent)(void* _obj, int _x, int _y, int _w, int _h)
-{
-	((cbDockPane*)_obj)->SetBoundsInParent(wxRect(_x, _y, _w, _h));
-}
-	
-EWXWEXPORT(void,cbDockPane_GetRealRect)(void* _obj, void* _x, void* _y, void* _w, void* _h)
-{
-	wxRect rect = ((cbDockPane*)_obj)->GetRealRect();
-	*((int*)_x) = rect.x;
-	*((int*)_y) = rect.y;
-	*((int*)_w) = rect.width;
-	*((int*)_h) = rect.height;
-}
-	
-EWXWEXPORT(int,cbDockPane_GetRowList)(void* _obj, void* _ref)
-{
-	RowArrayT arr = ((cbDockPane*)_obj)->GetRowList();
-	
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((void**)_ref)[i] = (void*)arr.Item(i);
-	}
-	
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(void*,cbDockPane_GetFirstRow)(void* _obj)
-{
-	return (void*)((cbDockPane*)_obj)->GetFirstRow();
-}
-	
-EWXWEXPORT(int,cbDockPane_BarPresent)(void* _obj, void* pBar)
-{
-	return (int)((cbDockPane*)_obj)->BarPresent((cbBarInfo*)pBar);
-}
-	
-EWXWEXPORT(int,cbDockPane_GetPaneHeight)(void* _obj)
-{
-	return ((cbDockPane*)_obj)->GetPaneHeight();
-}
-	
-EWXWEXPORT(int,cbDockPane_GetAlignment)(void* _obj)
-{
-	return ((cbDockPane*)_obj)->GetAlignment();
-}
-	
-EWXWEXPORT(int,cbDockPane_MatchesMask)(void* _obj, int paneMask)
-{
-	return (int)((cbDockPane*)_obj)->MatchesMask(paneMask);
-}
-	
-EWXWEXPORT(int,cbDockPane_IsHorizontal)(void* _obj)
-{
-	return (int)((cbDockPane*)_obj)->IsHorizontal();
-}
-	
-EWXWEXPORT(int,cbDockPane_GetDockingState)(void* _obj)
-{
-	return ((cbDockPane*)_obj)->GetDockingState();
-}
-	
-EWXWEXPORT(int,cbDockPane_HitTestPaneItems)(void* _obj, int x, int y, void* ppRow, void* ppBar)
-{
-	return ((cbDockPane*)_obj)->HitTestPaneItems(wxPoint(x, y), (cbRowInfo**)ppRow, (cbBarInfo**)ppBar);
-}
-	
-EWXWEXPORT(void,cbDockPane_GetBarResizeRange)(void* _obj, void* pBar, void* from, void* till, int forLeftHandle)
-{
-	((cbDockPane*)_obj)->GetBarResizeRange((cbBarInfo*)pBar, (int*)from, (int*)till, forLeftHandle != 0);
-}
-	
-EWXWEXPORT(void,cbDockPane_GetRowResizeRange)(void* _obj, void* pRow, void* from, void* till, int forUpperHandle)
-{
-	((cbDockPane*)_obj)->GetRowResizeRange((cbRowInfo*)pRow, (int*)from, (int*)till, forUpperHandle != 0);
-}
-	
-EWXWEXPORT(void*,cbDockPane_GetBarInfoByWindow)(void* _obj, void* pBarWnd)
-{
-	return (void*)((cbDockPane*)_obj)->GetBarInfoByWindow((wxWindow*)pBarWnd);
-}
-	
-EWXWEXPORT(int,cbPluginBase_GetPaneMask)(void* _obj)
-{
-	return ((cbPluginBase*)_obj)->GetPaneMask();
-}
-
-EWXWEXPORT(void,cbPluginBase_Delete)(void* _obj)
-{
-	delete (cbPluginBase*)_obj;
-}
-
-EWXWEXPORT(int,cbPluginBase_IsReady)(void* _obj)
-{
-	return (int)((cbPluginBase*)_obj)->IsReady();
-}
-	
-EWXWEXPORT(int,cbPluginBase_ProcessEvent)(void* _obj, void* event)
-{
-	return (int)((cbPluginBase*)_obj)->ProcessEvent(*((wxEvent*)event));
-}
-	
-EWXWEXPORT(void*,cbPluginEvent_Pane)(void* _obj)
-{
-	return ((cbPluginEvent*)_obj)->mpPane;
-}
-
-EWXWEXPORT(void,cbLeftDownEvent_Pos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbLeftDownEvent*)_obj)->mPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void,cbLeftUpEvent_Pos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbLeftUpEvent*)_obj)->mPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void,cbRightDownEvent_Pos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbRightDownEvent*)_obj)->mPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void,cbRightUpEvent_Pos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbRightUpEvent*)_obj)->mPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void,cbMotionEvent_Pos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbMotionEvent*)_obj)->mPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void,cbLeftDClickEvent_Pos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbLeftDClickEvent*)_obj)->mPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void*,cbLayoutRowEvent_Row)(void* _obj)
-{
-	return (void*)((cbLayoutRowEvent*)_obj)->mpRow;
-}
-
-EWXWEXPORT(void*,cbResizeRowEvent_Row)(void* _obj)
-{
-	return (void*)((cbResizeRowEvent*)_obj)->mpRow;
-}
-
-EWXWEXPORT(int,cbResizeRowEvent_HandleOfs)(void* _obj)
-{
-	return ((cbResizeRowEvent*)_obj)->mHandleOfs;
-}
-	
-EWXWEXPORT(int,cbResizeRowEvent_ForUpperHandle)(void* _obj)
-{
-	return (int)((cbResizeRowEvent*)_obj)->mForUpperHandle;
-}
-	
-EWXWEXPORT(void*,cbInsertBarEvent_Bar)(void* _obj)
-{
-	return (void*)((cbInsertBarEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void*,cbInsertBarEvent_Row)(void* _obj)
-{
-	return (void*)((cbInsertBarEvent*)_obj)->mpRow;
-}
-	
-EWXWEXPORT(void*,cbResizeBarEvent_Bar)(void* _obj)
-{
-	return (void*)((cbResizeBarEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void*,cbResizeBarEvent_Row)(void* _obj)
-{
-	return (void*)((cbResizeBarEvent*)_obj)->mpRow;
-}
-	
-EWXWEXPORT(void*,cbRemoveBarEvent_Bar)(void* _obj)
-{
-	return (void*)((cbRemoveBarEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void*,cbSizeBarWndEvent_Bar)(void* _obj)
-{
-	return (void*)((cbSizeBarWndEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void,cbSizeBarWndEvent_BoundsInParent)(void* _obj, void* _x, void* _y, void* _w, void* _h)
-{
-	wxRect rect = ((cbSizeBarWndEvent*)_obj)->mBoundsInParent;
-	*((int*)_x) = rect.x;
-	*((int*)_y) = rect.y;
-	*((int*)_w) = rect.width;
-	*((int*)_h) = rect.height;
-}
-	
-EWXWEXPORT(void*,cbDrawBarDecorEvent_Bar)(void* _obj)
-{
-	return (void*)((cbDrawBarDecorEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void,cbDrawBarDecorEvent_BoundsInParent)(void* _obj, void* _x, void* _y, void* _w, void* _h)
-{
-	wxRect rect = ((cbDrawBarDecorEvent*)_obj)->mBoundsInParent;
-	*((int*)_x) = rect.x;
-	*((int*)_y) = rect.y;
-	*((int*)_w) = rect.width;
-	*((int*)_h) = rect.height;
-}
-	
-EWXWEXPORT(void*,cbDrawBarDecorEvent_Dc)(void* _obj)
-{
-	return (void*)((cbDrawBarDecorEvent*)_obj)->mpDc;
-}
-	
-EWXWEXPORT(void*,cbDrawRowDecorEvent_Row)(void* _obj)
-{
-	return (void*)((cbDrawRowDecorEvent*)_obj)->mpRow;
-}
-	
-EWXWEXPORT(void*,cbDrawRowDecorEvent_Dc)(void* _obj)
-{
-	return (void*)((cbDrawRowDecorEvent*)_obj)->mpDc;
-}
-	
-EWXWEXPORT(void*,cbDrawPaneDecorEvent_Dc)(void* _obj)
-{
-	return (void*)((cbDrawPaneDecorEvent*)_obj)->mpDc;
-}
-	
-EWXWEXPORT(void*,cbDrawBarHandlesEvent_Bar)(void* _obj)
-{
-	return (void*)((cbDrawBarHandlesEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void*,cbDrawBarHandlesEvent_Dc)(void* _obj)
-{
-	return (void*)((cbDrawBarHandlesEvent*)_obj)->mpDc;
-}
-	
-EWXWEXPORT(void*,cbDrawRowHandlesEvent_Row)(void* _obj)
-{
-	return (void*)((cbDrawRowHandlesEvent*)_obj)->mpRow;
-}
-	
-EWXWEXPORT(void*,cbDrawRowHandlesEvent_Dc)(void* _obj)
-{
-	return (void*)((cbDrawRowHandlesEvent*)_obj)->mpDc;
-}
-	
-EWXWEXPORT(void*,cbDrawRowBkGroundEvent_Row)(void* _obj)
-{
-	return (void*)((cbDrawRowBkGroundEvent*)_obj)->mpRow;
-}
-	
-EWXWEXPORT(void*,cbDrawRowBkGroundEvent_Dc)(void* _obj)
-{
-	return (void*)((cbDrawRowBkGroundEvent*)_obj)->mpDc;
-}
-	
-EWXWEXPORT(void*,cbDrawPaneBkGroundEvent_Dc)(void* _obj)
-{
-	return (void*)((cbDrawPaneBkGroundEvent*)_obj)->mpDc;
-}
-	
-EWXWEXPORT(void*,cbStartBarDraggingEvent_Bar)(void* _obj)
-{
-	return (void*)((cbStartBarDraggingEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void,cbStartBarDraggingEvent_Pos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbStartBarDraggingEvent*)_obj)->mPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void,cbDrawHintRectEvent_Rect)(void* _obj, void* _x, void* _y, void* _w, void* _h)
-{
-	wxRect rect = ((cbDrawHintRectEvent*)_obj)->mRect;
-	*((int*)_x) = rect.x;
-	*((int*)_y) = rect.y;
-	*((int*)_w) = rect.width;
-	*((int*)_h) = rect.height;
-}
-	
-EWXWEXPORT(int,cbDrawHintRectEvent_LastTime)(void* _obj)
-{
-	return (int)((cbDrawHintRectEvent*)_obj)->mLastTime;
-}
-	
-EWXWEXPORT(int,cbDrawHintRectEvent_EraseRect)(void* _obj)
-{
-	return (int)((cbDrawHintRectEvent*)_obj)->mEraseRect;
-}
-	
-EWXWEXPORT(int,cbDrawHintRectEvent_IsInClient)(void* _obj)
-{
-	return (int)((cbDrawHintRectEvent*)_obj)->mIsInClient;
-}
-	
-EWXWEXPORT(void,cbStartDrawInAreaEvent_Area)(void* _obj, void* _x, void* _y, void* _w, void* _h)
-{
-	wxRect rect = ((cbStartDrawInAreaEvent*)_obj)->mArea;
-	*((int*)_x) = rect.x;
-	*((int*)_y) = rect.y;
-	*((int*)_w) = rect.width;
-	*((int*)_h) = rect.height;
-}
-	
-EWXWEXPORT(void,cbFinishDrawInAreaEvent_Area)(void* _obj, void* _x, void* _y, void* _w, void* _h)
-{
-	wxRect rect = ((cbFinishDrawInAreaEvent*)_obj)->mArea;
-	*((int*)_x) = rect.x;
-	*((int*)_y) = rect.y;
-	*((int*)_w) = rect.width;
-	*((int*)_h) = rect.height;
-}
-	
-EWXWEXPORT(void,cbCustomizeBarEvent_ClickPos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbCustomizeBarEvent*)_obj)->mClickPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void*,cbCustomizeBarEvent_Bar)(void* _obj)
-{
-	return (void*)((cbCustomizeBarEvent*)_obj)->mpBar;
-}
-	
-EWXWEXPORT(void,cbCustomizeLayoutEvent_ClickPos)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pos = ((cbCustomizeLayoutEvent*)_obj)->mClickPos;
-	*((int*)_x) = pos.x;
-	*((int*)_y) = pos.y;
-}
-	
-EWXWEXPORT(void*,cbAntiflickerPlugin_CreateDefault)()
-{
-	return (void*) new cbAntiflickerPlugin();
-}
-	
-EWXWEXPORT(void*,cbAntiflickerPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbAntiflickerPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbAntiflickerPlugin_Delete)(void* _obj)
-{
-	delete (cbAntiflickerPlugin*)_obj;
-}
-
-EWXWEXPORT(void*,cbBarDragPlugin_CreateDefault)()
-{
-	return (void*) new cbBarDragPlugin();
-}
-	
-EWXWEXPORT(void*,cbBarDragPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbBarDragPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbBarDragPlugin_Delete)(void* _obj)
-{
-	delete (cbBarDragPlugin*)_obj;
-}
-
-EWXWEXPORT(void*,cbBarHintsPlugin_CreateDefault)()
-{
-	return (void*) new cbBarHintsPlugin();
-}
-	
-EWXWEXPORT(void*,cbBarHintsPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbBarHintsPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbBarHintsPlugin_Delete)(void* _obj)
-{
-	delete (cbBarHintsPlugin*)_obj;
-}
-
-EWXWEXPORT(void,cbBarHintsPlugin_SetGrooveCount)(void* _obj, int nGrooves)
-{
-	((cbBarHintsPlugin*)_obj)->SetGrooveCount(nGrooves);
-}
-	
-EWXWEXPORT(void*,cbSimpleCustomizationPlugin_CreateDefault)()
-{
-	return (void*) new cbSimpleCustomizationPlugin();
-}
-	
-EWXWEXPORT(void*,cbSimpleCustomizationPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbSimpleCustomizationPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbSimpleCustomizationPlugin_Delete)(void* _obj)
-{
-	delete (cbSimpleCustomizationPlugin*)_obj;
-}
-
-EWXWEXPORT(int,wxToolLayoutItem_IsSeparator)(void* _obj)
-{
-	return (int)((wxToolLayoutItem*)_obj)->mIsSeparator;
-}
-	
-EWXWEXPORT(void,wxToolLayoutItem_Rect)(void* _obj, void* _x, void* _y, void* _w, void* _h)
-{
-	wxRect rect = ((wxToolLayoutItem*)_obj)->mRect;
-	*((int*)_x) = rect.x;
-	*((int*)_y) = rect.y;
-	*((int*)_w) = rect.width;
-	*((int*)_h) = rect.height;
-}
-	
-EWXWEXPORT(void*,wxDynToolInfo_pToolWnd)(void* _obj)
-{
-	return (void*)((wxDynToolInfo*)_obj)->mpToolWnd;
-}
-	
-EWXWEXPORT(int,wxDynToolInfo_Index)(void* _obj)
-{
-	return ((wxDynToolInfo*)_obj)->mIndex;
-}
-	
-EWXWEXPORT(void,wxDynToolInfo_RealSize)(void* _obj, void* _w, void* _h)
-{
-	wxSize size = ((wxDynToolInfo*)_obj)->mRealSize;
-	*((int*)_w) = size.x;
-	*((int*)_h) = size.y;
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_CreateDefault)()
-{
-	return (void*) new wxDynamicToolBar();
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_Create)(void* parent, int id, int x, int y, int w, int h, int style, int orientation, int RowsOrColumns)
-{
-	return (void*) new wxDynamicToolBar((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style, orientation, RowsOrColumns);
-}
-
-EWXWEXPORT(void,wxDynamicToolBar_Delete)(void* _obj)
-{
-	delete (wxDynamicToolBar*)_obj;
-}
-
-EWXWEXPORT(int,wxDynamicToolBar_CreateParams)(void* _obj, void* parent, int id, int x, int y, int w, int h, int style, int orientation, int RowsOrColumns)
-{
-	return (int)((wxDynamicToolBar*)_obj)->Create((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style, orientation, RowsOrColumns);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_AddTool)(void* _obj, int toolIndex, void* pToolWindow, int w, int h)
-{
-	((wxDynamicToolBar*)_obj)->AddTool(toolIndex, (wxWindow*)pToolWindow, wxSize(w, h));
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_AddToolImage)(void* _obj, int toolIndex, void* imageFileName, int imageFileType, void* labelText, int alignTextRight, int isFlat)
-{
-	((wxDynamicToolBar*)_obj)->AddTool(toolIndex, (char*)imageFileName, (wxBitmapType)imageFileType, (char*)labelText, alignTextRight != 0, isFlat != 0);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_AddToolLabel)(void* _obj, int toolIndex, void* labelBmp, void* labelText, int alignTextRight, int isFlat)
-{
-	((wxDynamicToolBar*)_obj)->AddTool(toolIndex, *((wxBitmap*)labelBmp), (char*)labelText, alignTextRight != 0, isFlat != 0);
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_AddToolBitmap)(void* _obj, int toolIndex, void* bitmap, void* pushedBitmap, int toggle, int x, int y, void* clientData, void* helpString1, void* helpString2)
-{
-	return (void*)((wxDynamicToolBar*)_obj)->AddTool(toolIndex, *((wxBitmap*)bitmap), *((wxBitmap*)pushedBitmap), toggle != 0, (long)x, (long)y, (wxObject*)clientData, (char*)helpString1, (char*)helpString2);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_AddSeparator)(void* _obj, void* pSepartorWnd)
-{
-	((wxDynamicToolBar*)_obj)->AddSeparator((wxWindow*)pSepartorWnd);
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_GetToolInfo)(void* _obj, int toolIndex)
-{
-	return (void*)((wxDynamicToolBar*)_obj)->GetToolInfo(toolIndex);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_RemoveTool)(void* _obj, int toolIndex)
-{
-	((wxDynamicToolBar*)_obj)->RemveTool(toolIndex);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_DrawSeparator)(void* _obj, void* info, void* dc)
-{
-	((wxDynamicToolBar*)_obj)->DrawSeparator(*((wxDynToolInfo*)info), *((wxDC*)dc));
-}
-	
-EWXWEXPORT(int,wxDynamicToolBar_Layout)(void* _obj)
-{
-	return (int)((wxDynamicToolBar*)_obj)->Layout();
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_GetPreferredDim)(void* _obj, int gw, int gh, void* pw, void* ph)
-{
-	wxSize size;
-	((wxDynamicToolBar*)_obj)->GetPreferredDim(wxSize(gw, gh), size);
-	*((int*)pw) = size.x;
-	*((int*)ph) = size.y;
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_CreateDefaultLayout)(void* _obj)
-{
-	return (void*)((wxDynamicToolBar*)_obj)->CreateDefaultLayout();
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_SetLayout)(void* _obj, void* pLayout)
-{
-	((wxDynamicToolBar*)_obj)->SetLayout((LayoutManagerBase*)pLayout);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_EnableTool)(void* _obj, int toolIndex, int enable)
-{
-	((wxDynamicToolBar*)_obj)->EnableTool(toolIndex, enable != 0);
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_FindToolForPosition)(void* _obj, int x, int y)
-{
-	return (void*)((wxDynamicToolBar*)_obj)->FindToolForPosition((wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(int,wxDynamicToolBar_DoInsertTool)(void* _obj, int pos, void* tool)
-{
-	return (int)((wxDynamicToolBar*)_obj)->DoInsertTool((size_t)pos, (wxToolBarToolBase*)tool);
-}
-	
-EWXWEXPORT(int,wxDynamicToolBar_DoDeleteTool)(void* _obj, int pos, void* tool)
-{
-	return (int)((wxDynamicToolBar*)_obj)->DoDeleteTool((size_t)pos, (wxToolBarToolBase*)tool);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_DoEnableTool)(void* _obj, void* tool, int enable)
-{
-	((wxDynamicToolBar*)_obj)->DoEnableTool((wxToolBarToolBase*)tool, enable != 0);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_DoToggleTool)(void* _obj, void* tool, int toggle)
-{
-	((wxDynamicToolBar*)_obj)->DoToggleTool((wxToolBarToolBase*)tool, toggle != 0);
-}
-	
-EWXWEXPORT(void,wxDynamicToolBar_DoSetToggle)(void* _obj, void* tool, int toggle)
-{
-	((wxDynamicToolBar*)_obj)->DoSetToggle((wxToolBarToolBase*)tool, toggle != 0);
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_CreateTool)(void* _obj, int id, void* label, void* bmpNormal, void* bmpDisabled, int kind, void* clientData, void* shortHelp, void* longHelp)
-{
-	return (void*)((wxDynamicToolBar*)_obj)->CreateTool(id, (char*)label, *((wxBitmap*)bmpNormal), *((wxBitmap*)bmpDisabled), (wxItemKind)kind, (wxObject*)clientData, (char*)shortHelp, (char*)longHelp);
-}
-	
-EWXWEXPORT(void*,wxDynamicToolBar_CreateToolControl)(void* _obj, void* control)
-{
-	return (void*)((wxDynamicToolBar*)_obj)->CreateTool((wxControl*)control);
-}
-	
-EWXWEXPORT(void*,cbDynToolBarDimHandler_Create)()
-{
-	return (void*) new cbDynToolBarDimHandler();
-}
-	
-EWXWEXPORT(void,cbDynToolBarDimHandler_Delete)(void* _obj)
-{
-	delete (cbDynToolBarDimHandler*)_obj;
-}
-
-EWXWEXPORT(void*,cbGCUpdatesMgr_Create)(void* pPanel)
-{
-	return (void*) new cbGCUpdatesMgr((wxFrameLayout*)pPanel);
-}
-	
-EWXWEXPORT(void*,cbGCUpdatesMgr_CreateDefault)()
-{
-	return (void*) new cbGCUpdatesMgr();
-}
-	
-EWXWEXPORT(void,cbGCUpdatesMgr_Delete)(void* _obj)
-{
-	delete (cbGCUpdatesMgr*)_obj;
-}
-	
-EWXWEXPORT(void,cbGCUpdatesMgr_UpdateNow)(void* _obj)
-{
-	((cbGCUpdatesMgr*)_obj)->UpdateNow();
-}
-
-EWXWEXPORT(void*,cbHintAnimationPlugin_CreateDefault)()
-{
-	return (void*) new cbHintAnimationPlugin();
-}
-	
-EWXWEXPORT(void*,cbHintAnimationPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbHintAnimationPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbHintAnimationPlugin_Delete)(void* _obj)
-{
-	delete (cbHintAnimationPlugin*)_obj;
-}
-
-EWXWEXPORT(void*,wxNewBitmapButton_Create)(void* labelBitmap, void* labelText, int alignText, int isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, int isSticky)
-{
-	return (void*) new wxNewBitmapButton(*((wxBitmap*)labelBitmap), (char*)labelText, alignText, isFlat != 0, firedEventType, marginX, marginY, textToLabelGap, isSticky != 0);
-}
-	
-EWXWEXPORT(void*,wxNewBitmapButton_CreateFromFile)(void* bitmapFileName, int bitmapFileType, void* labelText, int alignText, int isFlat, int firedEventType, int marginX, int marginY, int textToLabelGap, int isSticky)
-{
-	return (void*) new wxNewBitmapButton((char*)bitmapFileName, (wxBitmapType)bitmapFileType, (char*)labelText, alignText, isFlat != 0, firedEventType, marginX, marginY, textToLabelGap, isSticky != 0);
-}
-
-EWXWEXPORT(void,wxNewBitmapButton_Realize)(void* _obj, void* _prt, int _id, int _x, int _y, int _w, int _h)
-{
-	((wxNewBitmapButton*)_obj)->Create((wxWindow*)_prt, (wxWindowID)_id, wxPoint(_x, _y), wxSize(_w, _h));
-}
-
-EWXWEXPORT(void,wxNewBitmapButton_Delete)(void* _obj)
-{
-	delete (wxNewBitmapButton*)_obj;
-}
-
-EWXWEXPORT(void,wxNewBitmapButton_Reshape)(void* _obj)
-{
-	((wxNewBitmapButton*)_obj)->Reshape();
-}
-	
-EWXWEXPORT(void,wxNewBitmapButton_SetLabel)(void* _obj, void* labelBitmap, void* labelText)
-{
-	((wxNewBitmapButton*)_obj)->SetLabel(*((wxBitmap*)labelBitmap), (char*)labelText);
-}
-	
-EWXWEXPORT(void,wxNewBitmapButton_SetAlignments)(void* _obj, int alignText, int marginX, int marginY, int textToLabelGap)
-{
-	((wxNewBitmapButton*)_obj)->SetAlignments(alignText, marginX, marginY, textToLabelGap);
-}
-	
-EWXWEXPORT(void,wxNewBitmapButton_DrawDecorations)(void* _obj, void* dc)
-{
-	((wxNewBitmapButton*)_obj)->DrawDecorations(*((wxDC*)dc));
-}
-	
-EWXWEXPORT(void,wxNewBitmapButton_DrawLabel)(void* _obj, void* dc)
-{
-	((wxNewBitmapButton*)_obj)->DrawLabel(*((wxDC*)dc));
-}
-	
-EWXWEXPORT(void,wxNewBitmapButton_RenderLabelImage)(void* _obj, void* destBmp, void* srcBmp, int isEnabled, int isPressed)
-{
-	((wxNewBitmapButton*)_obj)->RenderLabelImage((wxBitmap*)destBmp, (wxBitmap*)srcBmp, isEnabled != 0, isPressed != 0);
-}
-	
-EWXWEXPORT(void,wxNewBitmapButton_RenderLabelImages)(void* _obj)
-{
-	((wxNewBitmapButton*)_obj)->RenderLabelImages();
-}
-	
-EWXWEXPORT(void,wxNewBitmapButton_RenderAllLabelImages)(void* _obj)
-{
-	((wxNewBitmapButton*)_obj)->RenderAllLabelImages();
-}
-	
-EWXWEXPORT(int,wxNewBitmapButton_Enable)(void* _obj, int enable)
-{
-	return (int)((wxNewBitmapButton*)_obj)->Enable(enable != 0);
-}
-	
-EWXWEXPORT(void*,cbPaneDrawPlugin_CreateDefault)()
-{
-	return (void*) new cbPaneDrawPlugin();
-}
-	
-EWXWEXPORT(void*,cbPaneDrawPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbPaneDrawPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbPaneDrawPlugin_Delete)(void* _obj)
-{
-	delete (cbPaneDrawPlugin*)_obj;
-}
-
-EWXWEXPORT(void*,cbRowDragPlugin_CreateDefault)()
-{
-	return (void*) new cbRowDragPlugin();
-}
-	
-EWXWEXPORT(void*,cbRowDragPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbRowDragPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbRowDragPlugin_Delete)(void* _obj)
-{
-	delete (cbRowDragPlugin*)_obj;
-}
-
-EWXWEXPORT(void*,cbRowLayoutPlugin_CreateDefault)()
-{
-	return (void*) new cbRowLayoutPlugin();
-}
-	
-EWXWEXPORT(void*,cbRowLayoutPlugin_Create)(void* pPanel, int paneMask)
-{
-	return (void*) new cbRowLayoutPlugin((wxFrameLayout*)pPanel, paneMask);
-}
-	
-EWXWEXPORT(void,cbRowLayoutPlugin_Delete)(void* _obj)
-{
-	delete (cbRowLayoutPlugin*)_obj;
-}
-
-EWXWEXPORT(void*,cbPluginBase_Plugin)(int _swt)
-{
-	switch (_swt)
-	{
-		case 0:
-			return CLASSINFO(cbAntiflickerPlugin);
-		
-		case 1:
-			return CLASSINFO(cbBarDragPlugin);
-		
-		case 2:
-			return CLASSINFO(cbBarHintsPlugin);
-		
-		case 3:
-			return CLASSINFO(cbSimpleCustomizationPlugin);
-		
-		case 4:
-			return CLASSINFO(cbHintAnimationPlugin);
-		
-		case 5:
-			return CLASSINFO(cbPaneDrawPlugin);
-		
-		case 6:
-			return CLASSINFO(cbRowDragPlugin);
-		
-		case 7:
-			return CLASSINFO(cbRowLayoutPlugin);
-		
-		default:
-			return NULL;
-	}
-}
-
-EWXWEXPORT(void*,cbCommonPaneProperties_CreateDefault)()
-{
-	return (void*)new cbCommonPaneProperties();
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_Delete)(void* _obj)
-{
-	delete (cbCommonPaneProperties*)_obj;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_RealTimeUpdatesOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mRealTimeUpdatesOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_OutOfPaneDragOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mOutOfPaneDragOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_ExactDockPredictionOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mExactDockPredictionOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_NonDestructFrictionOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mNonDestructFrictionOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_Show3DPaneBorderOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mShow3DPaneBorderOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_BarFloatingOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mBarFloatingOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_RowProportionsOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mRowProportionsOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_ColProportionsOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mColProportionsOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_BarCollapseIconsOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mBarCollapseIconsOn;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_BarDragHintsOn)(void* _obj)
-{
-	return (int)((cbCommonPaneProperties*)_obj)->mBarDragHintsOn;
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_MinCBarDim)(void* _obj, void* _w, void* _h)
-{
-	wxSize size = ((cbCommonPaneProperties*)_obj)->mMinCBarDim;
-	*((int*)_w) = size.x;
-	*((int*)_h) = size.y;
-}
-	
-EWXWEXPORT(int,cbCommonPaneProperties_ResizeHandleSize)(void* _obj)
-{
-	return ((cbCommonPaneProperties*)_obj)->mResizeHandleSize;
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetRealTimeUpdatesOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mRealTimeUpdatesOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetOutOfPaneDragOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mOutOfPaneDragOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetExactDockPredictionOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mExactDockPredictionOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetNonDestructFrictionOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mNonDestructFrictionOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetShow3DPaneBorderOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mShow3DPaneBorderOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetBarFloatingOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mBarFloatingOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetRowProportionsOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mRowProportionsOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetColProportionsOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mColProportionsOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetBarCollapseIconsOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mBarCollapseIconsOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetBarDragHintsOn)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mBarDragHintsOn = (_val != 0);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetMinCBarDim)(void* _obj, int _w, int _h)
-{
-	((cbCommonPaneProperties*)_obj)->mMinCBarDim = wxSize (_w, _h);
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_SetResizeHandleSize)(void* _obj, int _val)
-{
-	((cbCommonPaneProperties*)_obj)->mResizeHandleSize = _val;
-}
-	
-EWXWEXPORT(void,cbCommonPaneProperties_Assign)(void* _obj, void* _other)
-{
-	*((cbCommonPaneProperties*)_obj) = *((cbCommonPaneProperties*)_other);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljfont.cpp b/wxc/src/ewxw/eljfont.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljfont.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-#include "wrapper.h"
-#include "wx/fontenum.h"
-#include "wx/fontmap.h"
-#include "wx/encconv.h"
-
-extern "C"
-{
-
-typedef int _cdecl (*TTextEnum) (void* _obj, void* _txt);
-
-}
-
-class ELJFontEnumerator : public wxFontEnumerator
-{
-	private:
-		TTextEnum func;
-		void*     EiffelObject;
-	public:
-		ELJFontEnumerator (void* _obj, void* _fnc) : wxFontEnumerator()
-		{
-			func = (TTextEnum)_fnc;
-			EiffelObject = _obj;
-		}
-		
-	    virtual bool OnFacename(const wxString& facename)
-        { 
-			return func(EiffelObject, (void*)facename.c_str()) != 0;
-		}
-		virtual bool OnFontEncoding(const wxString& WXUNUSED(facename), const wxString& encoding)
-        {
-			return func(EiffelObject, (void*)encoding.c_str()) != 0;
-		}
-
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxFont_Create) (int pointSize, int family, int style, int weight, int underlined, wxChar* face, int enc)
-{
-	return new wxFont (pointSize, family, style, weight, underlined != 0, face, (wxFontEncoding)enc);
-}
-
-EWXWEXPORT(void*, wxFont_CreateDefault)()
-{
-	return new wxFont ();
-}
-
-EWXWEXPORT(void, wxFont_Delete)(void* _obj)
-{
-	delete ((wxFont*)_obj);
-}
-
-EWXWEXPORT(int, wxFont_Ok)(void* _obj)
-{
-	return (int)((wxFont*)_obj)->Ok();
-}
-	
-EWXWEXPORT(int, wxFont_GetPointSize)(void* _obj)
-{
-	return ((wxFont*)_obj)->GetPointSize();
-}
-	
-EWXWEXPORT(int, wxFont_GetFamily)(void* _obj)
-{
-	return ((wxFont*)_obj)->GetFamily();
-}
-	
-EWXWEXPORT(int, wxFont_GetStyle)(void* _obj)
-{
-	return ((wxFont*)_obj)->GetStyle();
-}
-	
-EWXWEXPORT(int, wxFont_GetWeight)(void* _obj)
-{
-	return ((wxFont*)_obj)->GetWeight();
-}
-	
-EWXWEXPORT(int, wxFont_GetUnderlined)(void* _obj)
-{
-	return (int)((wxFont*)_obj)->GetUnderlined();
-}
-	
-EWXWEXPORT(int, wxFont_GetFaceName)(void* _obj, void* _buf)
-{
-	wxString result = ((wxFont*)_obj)->GetFaceName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFont_GetEncoding)(void* _obj)
-{
-	return (int)((wxFont*)_obj)->GetEncoding();
-}
-	
-EWXWEXPORT(void, wxFont_SetPointSize)(void* _obj, int pointSize)
-{
-	((wxFont*)_obj)->SetPointSize(pointSize);
-}
-	
-EWXWEXPORT(void, wxFont_SetFamily)(void* _obj, int family)
-{
-	((wxFont*)_obj)->SetFamily(family);
-}
-	
-EWXWEXPORT(void, wxFont_SetStyle)(void* _obj, int style)
-{
-	((wxFont*)_obj)->SetStyle(style);
-}
-	
-EWXWEXPORT(void, wxFont_SetWeight)(void* _obj, int weight)
-{
-	((wxFont*)_obj)->SetWeight(weight);
-}
-	
-EWXWEXPORT(void, wxFont_SetFaceName)(void* _obj, wxChar* faceName)
-{
-	((wxFont*)_obj)->SetFaceName(faceName);
-}
-	
-EWXWEXPORT(void, wxFont_SetUnderlined)(void* _obj, int underlined)
-{
-	((wxFont*)_obj)->SetUnderlined(underlined != 0);
-}
-	
-EWXWEXPORT(void, wxFont_SetEncoding)(void* _obj, int encoding)
-{
-	((wxFont*)_obj)->SetEncoding((wxFontEncoding)encoding);
-}
-	
-EWXWEXPORT(int, wxFont_GetFamilyString)(void* _obj, void* _buf)
-{
-	wxString result = ((wxFont*)_obj)->GetFamilyString();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFont_GetStyleString)(void* _obj, void* _buf)
-{
-	wxString result = ((wxFont*)_obj)->GetStyleString();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFont_GetWeightString)(void* _obj, void* _buf)
-{
-	wxString result = ((wxFont*)_obj)->GetWeightString();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxFont_GetDefaultEncoding)(void* _obj)
-{
-	return (int)((wxFont*)_obj)->GetDefaultEncoding();
-}
-	
-EWXWEXPORT(void, wxFont_SetDefaultEncoding)(void* _obj, int encoding)
-{
-	((wxFont*)_obj)->SetDefaultEncoding((wxFontEncoding) encoding);
-}
-	
-
-EWXWEXPORT(void*, wxFontEnumerator_Create)(void* _obj, void* _fnc)
-{
-	return (void*) new ELJFontEnumerator(_obj, _fnc);
-}
-
-EWXWEXPORT(void, wxFontEnumerator_Delete)(void* _obj)
-{
-	delete ((ELJFontEnumerator*)_obj);
-}
-
-EWXWEXPORT(int,wxFontEnumerator_EnumerateFacenames)(void* _obj, int encoding, int fixedWidthOnly)
-{
-	return (int)((ELJFontEnumerator*)_obj)->EnumerateFacenames((wxFontEncoding)encoding, fixedWidthOnly != 0);
-}
-	
-EWXWEXPORT(int,wxFontEnumerator_EnumerateEncodings)(void* _obj, void* facename)
-{
-	return (int)((ELJFontEnumerator*)_obj)->EnumerateEncodings((const wxChar*)facename);
-}
-	
-
-EWXWEXPORT(void*, wxFontMapper_Create)()
-{
-	return wxTheFontMapper;
-}
-
-EWXWEXPORT(int,wxFontMapper_GetAltForEncoding)(void* _obj, int encoding, void* alt_encoding, void* _buf)
-{
-	return (int)((wxFontMapper*)_obj)->GetAltForEncoding((wxFontEncoding)encoding, (wxFontEncoding*)alt_encoding, (const wxChar*)_buf, false);
-}
-	
-EWXWEXPORT(int,wxFontMapper_IsEncodingAvailable)(void* _obj, int encoding, void* _buf)
-{
-	return (int)((wxFontMapper*)_obj)->IsEncodingAvailable((wxFontEncoding)encoding, (const wxChar*)_buf);
-}
-	
-
-EWXWEXPORT(void*, wxEncodingConverter_Create)()
-{
-	return (void*) new wxEncodingConverter();
-}
-
-EWXWEXPORT(void, wxEncodingConverter_Delete)(void* _obj)
-{
-	delete (wxEncodingConverter*)_obj;
-}
-
-EWXWEXPORT(int,wxEncodingConverter_Init)(void* _obj, int input_enc, int output_enc, int method)
-{
-	return (int)((wxEncodingConverter*)_obj)->Init((wxFontEncoding)input_enc, (wxFontEncoding)output_enc, method);
-}
-	
-EWXWEXPORT(void,wxEncodingConverter_Convert)(void* _obj, void* input, void* output)
-{
-	((wxEncodingConverter*)_obj)->Convert((const char*)input, (char*)output);
-}
-
-EWXWEXPORT(int,wxEncodingConverter_GetPlatformEquivalents)(void* _obj, int enc, int platform, void* _lst)
-{
-	wxFontEncodingArray arr = ((wxEncodingConverter*)_obj)->GetPlatformEquivalents((wxFontEncoding)enc, platform);
-	if (_lst)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((int*)_lst)[i] = (int)arr.Item(i);
-	}
-	return (int)arr.GetCount();
-}
-
-EWXWEXPORT(int,wxEncodingConverter_GetAllEquivalents)(void* _obj, int enc, void* _lst)
-{
-	wxFontEncodingArray arr = ((wxEncodingConverter*)_obj)->GetAllEquivalents((wxFontEncoding)enc);
-	if (_lst)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((int*)_lst)[i] = (int)arr.Item(i);
-	}
-	return (int)arr.GetCount();
-}
-
-}
diff --git a/wxc/src/ewxw/eljfontdata.cpp b/wxc/src/ewxw/eljfontdata.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljfontdata.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxFontData_Create) ()
-{
-	return (void*) new wxFontData();
-}
-
-EWXWEXPORT(void, wxFontData_Delete) (void* _obj)
-{
-	delete (wxFontData*)_obj;
-}
-
-EWXWEXPORT(void, wxFontData_SetAllowSymbols)(void* _obj, int flag)
-{
-	((wxFontData*)_obj)->SetAllowSymbols(flag != 0);
-}
-	
-EWXWEXPORT(int, wxFontData_GetAllowSymbols)(void* _obj)
-{
-	return (int)((wxFontData*)_obj)->GetAllowSymbols();
-}
-	
-EWXWEXPORT(void, wxFontData_SetColour)(void* _obj, void* colour)
-{
-	((wxFontData*)_obj)->SetColour(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxFontData_GetColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxFontData*)_obj)->GetColour();
-}
-	
-EWXWEXPORT(void, wxFontData_SetShowHelp)(void* _obj, int flag)
-{
-	((wxFontData*)_obj)->SetShowHelp(flag != 0);
-}
-	
-EWXWEXPORT(int, wxFontData_GetShowHelp)(void* _obj)
-{
-	return (int)((wxFontData*)_obj)->GetShowHelp();
-}
-	
-EWXWEXPORT(void, wxFontData_EnableEffects)(void* _obj, int flag)
-{
-	((wxFontData*)_obj)->EnableEffects(flag != 0);
-}
-	
-EWXWEXPORT(int, wxFontData_GetEnableEffects)(void* _obj)
-{
-	return (int)((wxFontData*)_obj)->GetEnableEffects();
-}
-	
-EWXWEXPORT(void, wxFontData_SetInitialFont)(void* _obj, void* font)
-{
-	((wxFontData*)_obj)->SetInitialFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(void, wxFontData_GetInitialFont)(void* _obj, void* ref)
-{
-	*((wxFont*)ref) = ((wxFontData*)_obj)->GetInitialFont();
-}
-	
-EWXWEXPORT(void, wxFontData_SetChosenFont)(void* _obj, void* font)
-{
-	((wxFontData*)_obj)->SetChosenFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(void, wxFontData_GetChosenFont)(void* _obj, void* ref)
-{
-	*((wxFont*)ref) = ((wxFontData*)_obj)->GetChosenFont();
-}
-	
-EWXWEXPORT(void, wxFontData_SetRange)(void* _obj, int minRange, int maxRange)
-{
-	((wxFontData*)_obj)->SetRange(minRange, maxRange);
-}
-	
-EWXWEXPORT(int, wxFontData_GetEncoding)(void* _obj)
-{
-	return (int)((wxFontData*)_obj)->GetEncoding();
-}
-	
-EWXWEXPORT(void, wxFontData_SetEncoding)(void* _obj, int encoding)
-{
-	((wxFontData*)_obj)->SetEncoding((wxFontEncoding)encoding);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljfontdlg.cpp b/wxc/src/ewxw/eljfontdlg.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljfontdlg.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxFontDialog_Create) (void* _prt, void* fnt)
-{
-#ifdef wxMAC_USE_EXPERIMENTAL_FONTDIALOG
-	return (void*) new wxFontDialog ((wxWindow*)_prt, (wxFontData&) fnt);
-#else
-	return (void*) new wxFontDialog ((wxWindow*)_prt, (wxFontData*) fnt);
-#endif
-}
-
-EWXWEXPORT(void, wxFontDialog_GetFontData)(void* _obj, void* _ref)
-{
-	*((wxFontData*)_ref) = ((wxFontDialog*)_obj)->GetFontData();
-}
-
-}
diff --git a/wxc/src/ewxw/eljframe.cpp b/wxc/src/ewxw/eljframe.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljframe.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxFrame_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxFrame ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void*, wxFrame_CreateStatusBar)(void* _obj, int number, int style)
-{
-	return (void*)((wxFrame*)_obj)->CreateStatusBar(number, style, 1);
-}
-	
-EWXWEXPORT(void, wxFrame_Maximize)(void* _obj)
-{
-	((wxFrame*)_obj)->Maximize();
-}
-	
-EWXWEXPORT(void, wxFrame_Restore)(void* _obj)
-{
-	((wxFrame*)_obj)->Restore();
-}
-	
-EWXWEXPORT(void, wxFrame_Iconize)(void* _obj)
-{
-	((wxFrame*)_obj)->Iconize();
-}
-	
-EWXWEXPORT(int, wxFrame_IsMaximized)(void* _obj)
-{
-	return (int)((wxFrame*)_obj)->IsMaximized();
-}
-	
-EWXWEXPORT(int, wxFrame_IsIconized)(void* _obj)
-{
-	return (int)((wxFrame*)_obj)->IsIconized();
-}
-	
-EWXWEXPORT(void*, wxFrame_GetIcon)(void* _obj)
-{
-	return (void*) (&((wxFrame*)_obj)->GetIcon());
-}
-	
-EWXWEXPORT(void, wxFrame_SetIcon)(void* _obj, void* _icon)
-{
-	((wxFrame*)_obj)->SetIcon(*((wxIcon*) _icon));
-}
-	
-EWXWEXPORT(int, wxFrame_GetClientAreaOrigin_left)(void* _obj)
-{
-	return ((wxFrame*)_obj)->GetClientAreaOrigin().x;
-}
-	
-EWXWEXPORT(int, wxFrame_GetClientAreaOrigin_top)(void* _obj)
-{
-	return ((wxFrame*)_obj)->GetClientAreaOrigin().y;
-}
-	
-EWXWEXPORT(void, wxFrame_SetMenuBar)(void* _obj, void* menubar)
-{
-	((wxFrame*)_obj)->SetMenuBar((wxMenuBar*)menubar);
-}
-	
-EWXWEXPORT(void*, wxFrame_GetMenuBar)(void* _obj)
-{
-	return (void*)((wxFrame*)_obj)->GetMenuBar();
-}
-	
-EWXWEXPORT(void*, wxFrame_GetStatusBar)(void* _obj)
-{
-	return (void*)((wxFrame*)_obj)->GetStatusBar();
-}
-	
-EWXWEXPORT(void, wxFrame_SetStatusBar)(void* _obj, void* statBar)
-{
-	((wxFrame*)_obj)->SetStatusBar((wxStatusBar*) statBar);
-}
-	
-EWXWEXPORT(void, wxFrame_SetStatusText)(void* _obj, wxChar* _txt, int _number)
-{
-	((wxFrame*)_obj)->SetStatusText(_txt, _number);
-}
-	
-EWXWEXPORT(void, wxFrame_SetStatusWidths)(void* _obj, int _n, void* _widths_field)
-{
-	((wxFrame*)_obj)->SetStatusWidths(_n, (int*) _widths_field);
-}
-	
-EWXWEXPORT(void*, wxFrame_CreateToolBar)(void* _obj, long style)
-{
-	return (void*)((wxFrame*)_obj)->CreateToolBar(style, 1);
-}
-	
-EWXWEXPORT(void*, wxFrame_GetToolBar)(void* _obj)
-{
-	return (void*)((wxFrame*)_obj)->GetToolBar();
-}
-	
-EWXWEXPORT(void, wxFrame_SetToolBar)(void* _obj, void* _toolbar)
-{
-	((wxFrame*)_obj)->SetToolBar((wxToolBar*) _toolbar);
-}
-
-#if wxVERSION_NUMBER >= 2400
-EWXWEXPORT(void, wxFrame_SetIcons)(void* _obj, void* _icons)
-{
-	((wxFrame*)_obj)->SetIcons(*((wxIconBundle*)_icons));
-}
-#endif
-
-}
diff --git a/wxc/src/ewxw/eljgauge.cpp b/wxc/src/ewxw/eljgauge.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljgauge.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxGauge_Create) (void* _prt, int _id, int _rng, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxGauge ((wxWindow*)_prt, _id, _rng, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void, wxGauge_SetShadowWidth)(void* _obj, int w)
-{
-	((wxGauge*)_obj)->SetShadowWidth(w);
-}
-	
-EWXWEXPORT(void, wxGauge_SetBezelFace)(void* _obj, int w)
-{
-	((wxGauge*)_obj)->SetBezelFace(w);
-}
-	
-EWXWEXPORT(void, wxGauge_SetRange)(void* _obj, int r)
-{
-	((wxGauge*)_obj)->SetRange(r);
-}
-	
-EWXWEXPORT(void, wxGauge_SetValue)(void* _obj, int pos)
-{
-	((wxGauge*)_obj)->SetValue(pos);
-}
-	
-EWXWEXPORT(int, wxGauge_GetShadowWidth)(void* _obj)
-{
-	return ((wxGauge*)_obj)->GetShadowWidth();
-}
-	
-EWXWEXPORT(int, wxGauge_GetBezelFace)(void* _obj)
-{
-	return ((wxGauge*)_obj)->GetBezelFace();
-}
-	
-EWXWEXPORT(int, wxGauge_GetRange)(void* _obj)
-{
-	return ((wxGauge*)_obj)->GetRange();
-}
-	
-EWXWEXPORT(int, wxGauge_GetValue)(void* _obj)
-{
-	return ((wxGauge*)_obj)->GetValue();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljgizmos.cpp b/wxc/src/ewxw/eljgizmos.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljgizmos.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-#include "wrapper.h"
-#include "wx/gizmos/dynamicsash.h"
-#include "wx/gizmos/editlbox.h"
-#include "wx/gizmos/ledctrl.h"
-#include "wx/gizmos/multicell.h"
-#include "wx/gizmos/splittree.h"
-
-class ELJSCTreeControl : public wxRemotelyScrolledTreeCtrl
-{
-	private:
-		TreeCompareFunc compare_func;
-		void* EiffelObject;
-
-	public:
-	    ELJSCTreeControl(void* _obj,
-		                 void* _cmp,
-		                 wxWindow *parent,
-		                 wxWindowID id = -1,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT) :
-		wxRemotelyScrolledTreeCtrl (parent, id, pos, size, style)
-		{
-			EiffelObject = _obj;
-			compare_func = (TreeCompareFunc)_cmp;
-		};
-
-		virtual int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2)
-		{
-			return EiffelObject ? compare_func (EiffelObject, (void*)&item1, (void*)&item2) : wxRemotelyScrolledTreeCtrl::OnCompareItems(item1, item2);
-		}
-
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxDynamicSashWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
-{
-	return (void*) new wxDynamicSashWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(void,wxDynamicSashWindow_Delete)(void* _obj)
-{
-	delete (wxDynamicSashWindow*)_obj;
-}
-
-EWXWEXPORT(void*,wxDynamicSashWindow_GetHScrollBar)(void* _obj, void* child)
-{
-	return (void*)((wxDynamicSashWindow*)_obj)->GetHScrollBar((wxWindow*)child);
-}
-	
-EWXWEXPORT(void*,wxDynamicSashWindow_GetVScrollBar)(void* _obj, void* child)
-{
-	return (void*)((wxDynamicSashWindow*)_obj)->GetVScrollBar((wxWindow*)child);
-}
-	
-EWXWEXPORT(void*,wxEditableListBox_Create)(void* parent, int id, void* label, int x, int y, int w, int h, int style)
-{
-	return (void*) new wxEditableListBox((wxWindow*)parent, (wxWindowID)id, (char*)label, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(void,wxEditableListBox_SetStrings)(void* _obj, void* strings, int _n)
-{
-	wxArrayString list;
-
-	for (int i = 0; i < _n; i++)
-		list.Add(((char**)strings)[i]);
-
-	((wxEditableListBox*)_obj)->SetStrings(list);
-}
-	
-EWXWEXPORT(int,wxEditableListBox_GetStrings)(void* _obj, void* _ref)
-{
-	wxArrayString list;
-	((wxEditableListBox*)_obj)->GetStrings(list);
-	
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < list.GetCount(); i++)
-			((char**)_ref)[i] = strdup (list.Item(i).c_str());
-	}
-
-	return list.GetCount();
-}
-	
-EWXWEXPORT(void*,wxEditableListBox_GetListCtrl)(void* _obj)
-{
-	return (void*)((wxEditableListBox*)_obj)->GetListCtrl();
-}
-	
-EWXWEXPORT(void*,wxEditableListBox_GetDelButton)(void* _obj)
-{
-	return (void*)((wxEditableListBox*)_obj)->GetDelButton();
-}
-	
-EWXWEXPORT(void*,wxEditableListBox_GetNewButton)(void* _obj)
-{
-	return (void*)((wxEditableListBox*)_obj)->GetNewButton();
-}
-	
-EWXWEXPORT(void*,wxEditableListBox_GetUpButton)(void* _obj)
-{
-	return (void*)((wxEditableListBox*)_obj)->GetUpButton();
-}
-	
-EWXWEXPORT(void*,wxEditableListBox_GetDownButton)(void* _obj)
-{
-	return (void*)((wxEditableListBox*)_obj)->GetDownButton();
-}
-	
-EWXWEXPORT(void*,wxEditableListBox_GetEditButton)(void* _obj)
-{
-	return (void*)((wxEditableListBox*)_obj)->GetEditButton();
-}
-	
-EWXWEXPORT(void*,wxLEDNumberCtrl_Create)(void* parent, int id, int x, int y, int w, int h, int style)
-{
-	return (void*) new wxLEDNumberCtrl((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(int,wxLEDNumberCtrl_GetAlignment)(void* _obj)
-{
-	return (int)((wxLEDNumberCtrl*)_obj)->GetAlignment();
-}
-	
-EWXWEXPORT(int,wxLEDNumberCtrl_GetDrawFaded)(void* _obj)
-{
-	return (int)((wxLEDNumberCtrl*)_obj)->GetDrawFaded();
-}
-	
-EWXWEXPORT(int,wxLEDNumberCtrl_GetValue)(void* _obj, void* _ref)
-{
-	wxString res = ((wxLEDNumberCtrl*)_obj)->GetValue();
-        return copyStrToBuf(_ref, res);
-}
-	
-EWXWEXPORT(void,wxLEDNumberCtrl_SetAlignment)(void* _obj, int Alignment, int Redraw)
-{
-	((wxLEDNumberCtrl*)_obj)->SetAlignment((wxLEDValueAlign)Alignment, Redraw != 0);
-}
-	
-EWXWEXPORT(void,wxLEDNumberCtrl_SetDrawFaded)(void* _obj, int DrawFaded, int Redraw)
-{
-	((wxLEDNumberCtrl*)_obj)->SetDrawFaded(DrawFaded != 0, Redraw != 0);
-}
-	
-EWXWEXPORT(void,wxLEDNumberCtrl_SetValue)(void* _obj, void* Value, int Redraw)
-{
-	((wxLEDNumberCtrl*)_obj)->SetValue((char*)Value, Redraw != 0);
-}
-	
-EWXWEXPORT(void*,wxMultiCellItemHandle_Create)(int row, int column, int height, int width, int sx, int sy, int style, int wx, int wy, int align)
-{
-	return (void*) new wxMultiCellItemHandle(row, column, height, width, wxSize(sx, sy), (wxResizable)style, wxSize(wx, wy), align);
-}
-	
-EWXWEXPORT(void*,wxMultiCellItemHandle_CreateWithSize)(void* _obj, int row, int column, int sx, int sy, int style, int wx, int wy, int align)
-{
-	return (void*) new wxMultiCellItemHandle(row, column, wxSize(sx, sy), (wxResizable)style, wxSize(wx, wy), align);
-}
-	
-EWXWEXPORT(void*,wxMultiCellItemHandle_CreateWithStyle)(void* _obj, int row, int column, int style, int wx, int wy, int align)
-{
-	return (void*) new wxMultiCellItemHandle(row, column, (wxResizable)style, wxSize(wx, wy), align);
-}
-	
-EWXWEXPORT(int,wxMultiCellItemHandle_GetColumn)(void* _obj)
-{
-	return ((wxMultiCellItemHandle*)_obj)->GetColumn();
-}
-	
-EWXWEXPORT(int,wxMultiCellItemHandle_GetRow)(void* _obj)
-{
-	return ((wxMultiCellItemHandle*)_obj)->GetRow();
-}
-	
-EWXWEXPORT(int,wxMultiCellItemHandle_GetWidth)(void* _obj)
-{
-	return ((wxMultiCellItemHandle*)_obj)->GetWidth();
-}
-	
-EWXWEXPORT(int,wxMultiCellItemHandle_GetHeight)(void* _obj)
-{
-	return ((wxMultiCellItemHandle*)_obj)->GetHeight();
-}
-	
-EWXWEXPORT(int,wxMultiCellItemHandle_GetStyle)(void* _obj)
-{
-	return (int)((wxMultiCellItemHandle*)_obj)->GetStyle();
-}
-	
-EWXWEXPORT(void,wxMultiCellItemHandle_GetLocalSize)(void* _obj, void* w, void* h)
-{
-	wxSize size = ((wxMultiCellItemHandle*)_obj)->GetLocalSize();
-	*((int*)w) = size.x;
-	*((int*)h) = size.y;
-}
-	
-EWXWEXPORT(int,wxMultiCellItemHandle_GetAlignment)(void* _obj)
-{
-	return ((wxMultiCellItemHandle*)_obj)->GetAlignment();
-}
-	
-EWXWEXPORT(void,wxMultiCellItemHandle_GetWeight)(void* _obj, void* w, void* h)
-{
-	wxSize size = ((wxMultiCellItemHandle*)_obj)->GetWeight();
-	*((int*)w) = size.x;
-	*((int*)h) = size.y;
-}
-	
-EWXWEXPORT(void*,wxMultiCellSizer_Create)(int rows, int cols)
-{
-	return (void*) new wxMultiCellSizer(rows, cols);
-}
-	
-EWXWEXPORT(void,wxMultiCellSizer_Delete)(void* _obj)
-{
-	delete (wxMultiCellSizer*)_obj;
-}
-
-EWXWEXPORT(void,wxMultiCellSizer_RecalcSizes)(void* _obj)
-{
-	((wxMultiCellSizer*)_obj)->RecalcSizes();
-}
-	
-EWXWEXPORT(void,wxMultiCellSizer_CalcMin)(void* _obj, void* w, void* h)
-{
-	wxSize size = ((wxMultiCellSizer*)_obj)->CalcMin();
-	*((int*)w) = size.x;
-	*((int*)h) = size.y;
-}
-	
-EWXWEXPORT(int,wxMultiCellSizer_SetDefaultCellSize)(void* _obj, int w, int h)
-{
-	return (int)((wxMultiCellSizer*)_obj)->SetDefaultCellSize(wxSize(w, h));
-}
-	
-EWXWEXPORT(int,wxMultiCellSizer_SetColumnWidth)(void* _obj, int column, int colSize, int expandable)
-{
-	return (int)((wxMultiCellSizer*)_obj)->SetColumnWidth(column, colSize, expandable != 0);
-}
-	
-EWXWEXPORT(int,wxMultiCellSizer_SetRowHeight)(void* _obj, int row, int rowSize, int expandable)
-{
-	return (int)((wxMultiCellSizer*)_obj)->SetRowHeight(row, rowSize, expandable != 0);
-}
-	
-EWXWEXPORT(int,wxMultiCellSizer_EnableGridLines)(void* _obj, void* win)
-{
-	return (int)((wxMultiCellSizer*)_obj)->EnableGridLines((wxWindow*)win);
-}
-	
-EWXWEXPORT(int,wxMultiCellSizer_SetGridPen)(void* _obj, void* pen)
-{
-	return (int)((wxMultiCellSizer*)_obj)->SetGridPen((wxPen*)pen);
-}
-	
-EWXWEXPORT(void*,wxMultiCellCanvas_Create)(void* parent, int numRows, int numCols)
-{
-	return (void*) new wxMultiCellCanvas((wxWindow*)parent, numRows, numCols);
-}
-	
-EWXWEXPORT(void,wxMultiCellCanvas_Add)(void* _obj, void* win, int row, int col)
-{
-	((wxMultiCellCanvas*)_obj)->Add((wxWindow*)win, (unsigned int)row, (unsigned int)col);
-}
-	
-EWXWEXPORT(int,wxMultiCellCanvas_MaxRows)(void* _obj)
-{
-	return ((wxMultiCellCanvas*)_obj)->MaxRows();
-}
-	
-EWXWEXPORT(int,wxMultiCellCanvas_MaxCols)(void* _obj)
-{
-	return ((wxMultiCellCanvas*)_obj)->MaxCols();
-}
-	
-EWXWEXPORT(void,wxMultiCellCanvas_CalculateConstraints)(void* _obj)
-{
-	((wxMultiCellCanvas*)_obj)->CalculateConstraints();
-}
-	
-EWXWEXPORT(void,wxMultiCellCanvas_SetMinCellSize)(void* _obj, int w, int h)
-{
-	((wxMultiCellCanvas*)_obj)->SetMinCellSize(wxSize(w, h));
-}
-	
-EWXWEXPORT(void*,wxSplitterScrolledWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
-{
-	return (void*) new wxSplitterScrolledWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(void*,wxThinSplitterWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
-{
-	return (void*) new wxThinSplitterWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(void,wxThinSplitterWindow_SizeWindows)(void* _obj)
-{
-	((wxThinSplitterWindow*)_obj)->SizeWindows();
-}
-	
-EWXWEXPORT(int,wxThinSplitterWindow_SashHitTest)(void* _obj, int x, int y, int tolerance)
-{
-	return (int)((wxThinSplitterWindow*)_obj)->SashHitTest(x, y, tolerance);
-}
-	
-EWXWEXPORT(void,wxThinSplitterWindow_DrawSash)(void* _obj, void* dc)
-{
-	((wxThinSplitterWindow*)_obj)->DrawSash(*((wxDC*)dc));
-}
-	
-EWXWEXPORT(void*,wxTreeCompanionWindow_Create)(void* parent, int id, int x, int y, int w, int h, int style)
-{
-	return (void*) new wxTreeCompanionWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(void,wxTreeCompanionWindow_DrawItem)(void* _obj, void* dc, void* id, int x, int y, int w, int h)
-{
-	((wxTreeCompanionWindow*)_obj)->DrawItem(*((wxDC*)dc), *((wxTreeItemId*)id), wxRect(x, y, w, h));
-}
-	
-EWXWEXPORT(void*,wxTreeCompanionWindow_GetTreeCtrl)(void* _obj)
-{
-	return (void*)((wxTreeCompanionWindow*)_obj)->GetTreeCtrl();
-}
-	
-EWXWEXPORT(void,wxTreeCompanionWindow_SetTreeCtrl)(void* _obj, void* treeCtrl)
-{
-	((wxTreeCompanionWindow*)_obj)->SetTreeCtrl((wxRemotelyScrolledTreeCtrl*)treeCtrl);
-}
-	
-EWXWEXPORT(void*,wxRemotelyScrolledTreeCtrl_Create)(void* _obj, void* _cmp, void* parent, int id, int x, int y, int w, int h, int style)
-{
-	return (void*) new ELJSCTreeControl(_obj, _cmp, (wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_Delete)(void* _obj)
-{
-	delete (ELJSCTreeControl*)_obj;
-}
-
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_SetScrollbars)(void* _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, int noRefresh)
-{
-	((ELJSCTreeControl*)_obj)->SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh != 0);
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_GetViewStart)(void* _obj, void* x, void* y)
-{
-	((ELJSCTreeControl*)_obj)->GetViewStart((int*)x, (int*)y);
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_PrepareDC)(void* _obj, void* dc)
-{
-	((ELJSCTreeControl*)_obj)->PrepareDC(*((wxDC*)dc));
-}
-	
-EWXWEXPORT(int,wxRemotelyScrolledTreeCtrl_GetScrollPos)(void* _obj, int orient)
-{
-	return ((ELJSCTreeControl*)_obj)->GetScrollPos(orient);
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_HideVScrollbar)(void* _obj)
-{
-	((ELJSCTreeControl*)_obj)->HideVScrollbar();
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_CalcTreeSize)(void* _obj, void* x, void* y, void* w, void* h)
-{
-	wxRect rect;
-	((ELJSCTreeControl*)_obj)->CalcTreeSize(rect);
-	*((int*)x) = rect.x;
-	*((int*)y) = rect.y;
-	*((int*)w) = rect.width;
-	*((int*)h) = rect.height;
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_CalcTreeSizeItem)(void* _obj, void* id, void* x, void* y, void* w, void* h)
-{
-	wxRect rect;
-	((ELJSCTreeControl*)_obj)->CalcTreeSize(*((wxTreeItemId*)id), rect);
-	*((int*)x) = rect.x;
-	*((int*)y) = rect.y;
-	*((int*)w) = rect.width;
-	*((int*)h) = rect.height;
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_AdjustRemoteScrollbars)(void* _obj)
-{
-	((ELJSCTreeControl*)_obj)->AdjustRemoteScrollbars();
-}
-	
-EWXWEXPORT(void*,wxRemotelyScrolledTreeCtrl_GetScrolledWindow)(void* _obj)
-{
-	return (void*)((ELJSCTreeControl*)_obj)->GetScrolledWindow();
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_ScrollToLine)(void* _obj, int posHoriz, int posVert)
-{
-	((ELJSCTreeControl*)_obj)->ScrollToLine(posHoriz, posVert);
-}
-	
-EWXWEXPORT(void,wxRemotelyScrolledTreeCtrl_SetCompanionWindow)(void* _obj, void* companion)
-{
-	((ELJSCTreeControl*)_obj)->SetCompanionWindow((wxWindow*)companion);
-}
-	
-EWXWEXPORT(void*,wxRemotelyScrolledTreeCtrl_GetCompanionWindow)(void* _obj)
-{
-	return (void*)((ELJSCTreeControl*)_obj)->GetCompanionWindow();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljgrid.cpp b/wxc/src/ewxw/eljgrid.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljgrid.cpp
+++ /dev/null
@@ -1,1465 +0,0 @@
-#include "wrapper.h"
-#include "eljgrid.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxGridCellCoordsArray_Create)()
-{
-	return (void*) new wxGridCellCoordsArray();
-}
-
-EWXWEXPORT(void,wxGridCellCoordsArray_Delete)(void* _obj)
-{
-	delete (wxGridCellCoordsArray*)_obj;
-}
-
-EWXWEXPORT(int,wxGridCellCoordsArray_GetCount)(void* _obj)
-{
-	return ((wxGridCellCoordsArray*)_obj)->GetCount();
-}
-
-EWXWEXPORT(void,wxGridCellCoordsArray_Item)(void* _obj, int _idx, void* _c, void* _r)
-{
-	*((int*)_c) = ((wxGridCellCoordsArray*)_obj)->Item(_idx).GetCol();
-	*((int*)_r) = ((wxGridCellCoordsArray*)_obj)->Item(_idx).GetRow();
-}
-
-
-EWXWEXPORT(int, wxGridCellEditor_IsCreated)(void* _obj)
-{
-	return (int)((wxGridCellEditor*)_obj)->IsCreated();
-}
-	
-EWXWEXPORT(void*, wxGridCellEditor_GetControl)(void* _obj)
-{
-	return (void*)((wxGridCellEditor*)_obj)->GetControl();
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_SetControl)(void* _obj, void* control)
-{
-	((wxGridCellEditor*)_obj)->SetControl((wxControl*) control);
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_Create)(void* _obj, void* parent, int id, void* evtHandler)
-{
-	((wxGridCellEditor*)_obj)->Create((wxWindow*) parent, (wxWindowID) id, (wxEvtHandler*) evtHandler);
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_SetSize)(void* _obj, int x, int y, int w, int h)
-{
-	((wxGridCellEditor*)_obj)->SetSize(wxRect(x, y, w, h));
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_Show)(void* _obj, int show, void* attr)
-{
-	((wxGridCellEditor*)_obj)->Show(show != 0, (wxGridCellAttr*) attr);
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_PaintBackground)(void* _obj, int x, int y, int w, int h, void* attr)
-{
-	((wxGridCellEditor*)_obj)->PaintBackground(wxRect(x, y, w, h), (wxGridCellAttr*)attr);
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_BeginEdit)(void* _obj, int row, int col, void* grid)
-{
-	((wxGridCellEditor*)_obj)->BeginEdit(row, col, (wxGrid*)grid);
-}
-	
-EWXWEXPORT(int, wxGridCellEditor_EndEdit)(void* _obj, int row, int col, void* grid)
-{
-	return (int)((wxGridCellEditor*)_obj)->EndEdit(row, col, (wxGrid*) grid);
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_Reset)(void* _obj)
-{
-	((wxGridCellEditor*)_obj)->Reset();
-}
-	
-EWXWEXPORT(int, wxGridCellEditor_IsAcceptedKey)(void* _obj, void* event)
-{
-	return (int)((wxGridCellEditor*)_obj)->IsAcceptedKey(*((wxKeyEvent*)event));
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_StartingKey)(void* _obj, void* event)
-{
-	((wxGridCellEditor*)_obj)->StartingKey(*((wxKeyEvent*)event));
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_StartingClick)(void* _obj)
-{
-	((wxGridCellEditor*)_obj)->StartingClick();
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_HandleReturn)(void* _obj, void* event)
-{
-	((wxGridCellEditor*)_obj)->HandleReturn(*((wxKeyEvent*)event));
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_Destroy)(void* _obj)
-{
-	((wxGridCellEditor*)_obj)->Destroy();
-}
-	
-EWXWEXPORT(void, wxGridCellEditor_SetParameters)(void* _obj, void* params)
-{
-	((wxGridCellEditor*)_obj)->SetParameters((wxChar*)params);
-}
-	
-EWXWEXPORT(void*, wxGridCellTextEditor_Ctor)()
-{
-	return (void*) new wxGridCellTextEditor();
-}
-
-EWXWEXPORT(void*, wxGridCellNumberEditor_Ctor)(int min, int max)
-{
-	return (void*) new wxGridCellNumberEditor(min, max);
-}
-
-EWXWEXPORT(void*, wxGridCellFloatEditor_Ctor)(int width, int precision)
-{
-	return (void*) new wxGridCellFloatEditor(width, precision);
-}
-
-EWXWEXPORT(void*, wxGridCellBoolEditor_Ctor)()
-{
-	return (void*) new wxGridCellBoolEditor();
-}
-
-EWXWEXPORT(void*, wxGridCellChoiceEditor_Ctor)(int count, void* choices, int allowOthers)
-{
-	wxString items[256];
-
-	for (int i = 0; i < count; i++)
-		items[i] = ((wxChar**)choices)[i];
-
-	return (void*) new wxGridCellChoiceEditor (count, items, allowOthers != 0);
-}
-
-EWXWEXPORT(void*, wxGridCellAttr_Ctor)()
-{
-	return (void*) new wxGridCellAttr();
-}
-
-EWXWEXPORT(void, wxGridCellAttr_IncRef)(void* _obj)
-{
-	((wxGridCellAttr*)_obj)->IncRef();
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_DecRef)(void* _obj)
-{
-	((wxGridCellAttr*)_obj)->DecRef();
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetTextColour)(void* _obj, void* colText)
-{
-	((wxGridCellAttr*)_obj)->SetTextColour(*((wxColour*)colText));
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetBackgroundColour)(void* _obj, void* colBack)
-{
-	((wxGridCellAttr*)_obj)->SetBackgroundColour(*((wxColour*)colBack));
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetFont)(void* _obj, void* font)
-{
-	((wxGridCellAttr*)_obj)->SetFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetAlignment)(void* _obj, int hAlign, int vAlign)
-{
-	((wxGridCellAttr*)_obj)->SetAlignment(hAlign, vAlign);
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetReadOnly)(void* _obj, int isReadOnly)
-{
-	((wxGridCellAttr*)_obj)->SetReadOnly(isReadOnly != 0);
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetRenderer)(void* _obj, void* renderer)
-{
-	((wxGridCellAttr*)_obj)->SetRenderer((wxGridCellRenderer*)renderer);
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetEditor)(void* _obj, void* editor)
-{
-	((wxGridCellAttr*)_obj)->SetEditor((wxGridCellEditor*) editor);
-}
-	
-EWXWEXPORT(int, wxGridCellAttr_HasTextColour)(void* _obj)
-{
-	return (int)((wxGridCellAttr*)_obj)->HasTextColour();
-}
-	
-EWXWEXPORT(int, wxGridCellAttr_HasBackgroundColour)(void* _obj)
-{
-	return (int)((wxGridCellAttr*)_obj)->HasBackgroundColour();
-}
-	
-EWXWEXPORT(int, wxGridCellAttr_HasFont)(void* _obj)
-{
-	return (int)((wxGridCellAttr*)_obj)->HasFont();
-}
-	
-EWXWEXPORT(int, wxGridCellAttr_HasAlignment)(void* _obj)
-{
-	return (int)((wxGridCellAttr*)_obj)->HasAlignment();
-}
-	
-EWXWEXPORT(int, wxGridCellAttr_HasRenderer)(void* _obj)
-{
-	return (int)((wxGridCellAttr*)_obj)->HasRenderer();
-}
-	
-EWXWEXPORT(int, wxGridCellAttr_HasEditor)(void* _obj)
-{
-	return (int)((wxGridCellAttr*)_obj)->HasEditor();
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_GetTextColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGridCellAttr*)_obj)->GetTextColour();
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_GetBackgroundColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGridCellAttr*)_obj)->GetBackgroundColour();
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_GetFont)(void* _obj, void* font)
-{
-	*((wxFont*)font) = ((wxGridCellAttr*)_obj)->GetFont();
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_GetAlignment)(void* _obj, void* hAlign, void* vAlign)
-{
-	((wxGridCellAttr*)_obj)->GetAlignment((int*)hAlign, (int*)vAlign);
-}
-	
-EWXWEXPORT(void*, wxGridCellAttr_GetRenderer)(void* _obj, void* grid, int row, int col)
-{
-	return (void*)((wxGridCellAttr*)_obj)->GetRenderer((wxGrid*)grid, row, col);
-}
-	
-EWXWEXPORT(void*, wxGridCellAttr_GetEditor)(void* _obj, void* grid, int row, int col)
-{
-	return (void*)((wxGridCellAttr*)_obj)->GetEditor((wxGrid*)grid, row, col);
-}
-	
-EWXWEXPORT(int, wxGridCellAttr_IsReadOnly)(void* _obj)
-{
-	return (int)((wxGridCellAttr*)_obj)->IsReadOnly();
-}
-	
-EWXWEXPORT(void, wxGridCellAttr_SetDefAttr)(void* _obj, void* defAttr)
-{
-	((wxGridCellAttr*)_obj)->SetDefAttr((wxGridCellAttr*) defAttr);
-}
-	
-EWXWEXPORT(void*, wxGrid_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxGrid ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl | wxWANTS_CHARS);
-}
-
-EWXWEXPORT(void, wxGrid_CreateGrid) (void* _obj, int rows, int cols, int selmode)
-{
-	((wxGrid*)_obj)->CreateGrid (rows, cols, (wxGrid::wxGridSelectionModes)selmode);
-}
-
-EWXWEXPORT(void, wxGrid_SetSelectionMode)(void* _obj, int selmode)
-{
-	((wxGrid*)_obj)->SetSelectionMode((wxGrid::wxGridSelectionModes) selmode);
-}
-	
-EWXWEXPORT(int, wxGrid_GetNumberRows)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetNumberRows();
-}
-	
-EWXWEXPORT(int, wxGrid_GetNumberCols)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetNumberCols();
-}
-	
-EWXWEXPORT(void, wxGrid_CalcRowLabelsExposed)(void* _obj, void* reg)
-{
-	((wxGrid*)_obj)->CalcRowLabelsExposed(*((wxRegion*) reg));
-}
-	
-EWXWEXPORT(void, wxGrid_CalcColLabelsExposed)(void* _obj, void* reg)
-{
-	((wxGrid*)_obj)->CalcColLabelsExposed(*((wxRegion*) reg));
-}
-	
-EWXWEXPORT(void, wxGrid_CalcCellsExposed)(void* _obj, void* reg)
-{
-	((wxGrid*)_obj)->CalcCellsExposed(*((wxRegion*)reg));
-}
-	
-EWXWEXPORT(void,wxGrid_NewCalcCellsExposed)(void* _obj, void* reg, void* arr)
-{
-#if wxVERSION_NUMBER >= 2400
-	*((wxGridCellCoordsArray*)arr) = ((wxGrid*)_obj)->CalcCellsExposed(*((wxRegion*)reg));
-#endif
-}
-	
-EWXWEXPORT(void, wxGrid_ProcessRowLabelMouseEvent)(void* _obj, void* event)
-{
-	((wxGrid*)_obj)->ProcessRowLabelMouseEvent(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void, wxGrid_ProcessColLabelMouseEvent)(void* _obj, void* event)
-{
-	((wxGrid*)_obj)->ProcessColLabelMouseEvent(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(void, wxGrid_ProcessCornerLabelMouseEvent)(void* _obj, void* event)
-{
-	((wxGrid*)_obj)->ProcessCornerLabelMouseEvent(*((wxMouseEvent*) event));
-}
-	
-EWXWEXPORT(void, wxGrid_ProcessGridCellMouseEvent)(void* _obj, void* event)
-{
-	((wxGrid*)_obj)->ProcessGridCellMouseEvent(*((wxMouseEvent*)event));
-}
-	
-EWXWEXPORT(int, wxGrid_ProcessTableMessage)(void* _obj, void* evt)
-{
-	return (int)((wxGrid*)_obj)->ProcessTableMessage(*((wxGridTableMessage*)evt));
-}
-	
-EWXWEXPORT(void, wxGrid_DoEndDragResizeRow)(void* _obj)
-{
-	((wxGrid*)_obj)->DoEndDragResizeRow();
-}
-	
-EWXWEXPORT(void, wxGrid_DoEndDragResizeCol)(void* _obj)
-{
-	((wxGrid*)_obj)->DoEndDragResizeCol();
-}
-	
-EWXWEXPORT(void*, wxGrid_GetTable)(void* _obj)
-{
-	return (void*)((wxGrid*)_obj)->GetTable();
-}
-	
-EWXWEXPORT(int, wxGrid_SetTable)(void* _obj, void* table, int takeOwnership, int selmode)
-{
-	return (int)((wxGrid*)_obj)->SetTable((wxGridTableBase*)table, takeOwnership != 0, (wxGrid::wxGridSelectionModes) selmode);
-}
-	
-EWXWEXPORT(void, wxGrid_ClearGrid)(void* _obj)
-{
-	((wxGrid*)_obj)->ClearGrid();
-}
-	
-EWXWEXPORT(int, wxGrid_InsertRows)(void* _obj, int pos, int numRows, int updateLabels)
-{
-	return (int)((wxGrid*)_obj)->InsertRows(pos, numRows, updateLabels != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_AppendRows)(void* _obj, int numRows, int updateLabels)
-{
-	return (int)((wxGrid*)_obj)->AppendRows(numRows, updateLabels != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_DeleteRows)(void* _obj, int pos, int numRows, int updateLabels)
-{
-	return (int)((wxGrid*)_obj)->DeleteRows(pos, numRows, updateLabels != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_InsertCols)(void* _obj, int pos, int numCols, int updateLabels)
-{
-	return (int)((wxGrid*)_obj)->InsertCols(pos, numCols, updateLabels != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_AppendCols)(void* _obj, int numCols, int updateLabels )
-{
-	return (int)((wxGrid*)_obj)->AppendCols( numCols, updateLabels);
-}
-	
-EWXWEXPORT(int, wxGrid_DeleteCols)(void* _obj, int pos, int numCols, int updateLabels)
-{
-	return (int)((wxGrid*)_obj)->DeleteCols(pos, numCols, updateLabels != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_DrawGridCellArea)(void* _obj, void* dc)
-{
-#if wxVERSION_NUMBER >= 2400
-	wxGridCellCoordsArray arr;
-	((wxGrid*)_obj)->DrawGridCellArea(*((wxDC*) dc), arr);
-#else
-	((wxGrid*)_obj)->DrawGridCellArea(*((wxDC*) dc));
-#endif
-}
-	
-EWXWEXPORT(void,wxGrid_NewDrawGridCellArea)(void* _obj, void* dc, void* arr)
-{
-#if wxVERSION_NUMBER >= 2400
-	((wxGrid*)_obj)->DrawGridCellArea(*((wxDC*) dc), *((wxGridCellCoordsArray*)arr));
-#endif
-}
-	
-EWXWEXPORT(void, wxGrid_DrawGridSpace)(void* _obj, void* dc)
-{
-	((wxGrid*)_obj)->DrawGridSpace(*((wxDC*) dc));
-}
-	
-EWXWEXPORT(void, wxGrid_DrawCellBorder)(void* _obj, void* dc, int _row, int _col)
-{
-	((wxGrid*)_obj)->DrawCellBorder(*((wxDC*) dc), wxGridCellCoords(_row, _col));
-}
-	
-EWXWEXPORT(void, wxGrid_DrawAllGridLines)(void* _obj, void* dc, void* reg)
-{
-	((wxGrid*)_obj)->DrawAllGridLines(*((wxDC*) dc), *((wxRegion*) reg));
-}
-	
-EWXWEXPORT(void, wxGrid_DrawCell)(void* _obj, void* dc, int _row, int _col)
-{
-	((wxGrid*)_obj)->DrawCell(*((wxDC*) dc), wxGridCellCoords(_row, _col));
-}
-	
-EWXWEXPORT(void, wxGrid_DrawHighlight)(void* _obj, void* dc)
-{
-#if wxVERSION_NUMBER >= 2400
-	wxGridCellCoordsArray arr;
-	((wxGrid*)_obj)->DrawHighlight(*((wxDC*) dc), arr);
-#else
-	((wxGrid*)_obj)->DrawHighlight(*((wxDC*) dc));
-#endif
-}
-	
-EWXWEXPORT(void, wxGrid_NewDrawHighlight)(void* _obj, void* dc, void* arr)
-{
-#if wxVERSION_NUMBER >= 2400
-	((wxGrid*)_obj)->DrawHighlight(*((wxDC*) dc), *((wxGridCellCoordsArray*)arr));
-#endif
-}
-	
-EWXWEXPORT(void, wxGrid_DrawCellHighlight)(void* _obj, void* dc, void* attr)
-{
-	((wxGrid*)_obj)->DrawCellHighlight(*((wxDC*) dc), (const wxGridCellAttr*) attr);
-}
-	
-EWXWEXPORT(void, wxGrid_DrawRowLabels)(void* _obj, void* dc)
-{
-#if wxVERSION_NUMBER >= 2400
-	wxArrayInt arr;
-	((wxGrid*)_obj)->DrawRowLabels(*((wxDC*) dc), arr);
-#else
-	((wxGrid*)_obj)->DrawRowLabels(*((wxDC*) dc));
-#endif
-}
-	
-EWXWEXPORT(void, wxGrid_DrawRowLabel)(void* _obj, void* dc, int row)
-{
-	((wxGrid*)_obj)->DrawRowLabel(*((wxDC*) dc), row);
-}
-	
-EWXWEXPORT(void, wxGrid_DrawColLabels)(void* _obj, void* dc)
-{
-#if wxVERSION_NUMBER >= 2400
-	wxArrayInt arr;
-	((wxGrid*)_obj)->DrawColLabels(*((wxDC*) dc), arr);
-#else
-	((wxGrid*)_obj)->DrawColLabels(*((wxDC*) dc));
-#endif
-}
-	
-EWXWEXPORT(void, wxGrid_DrawColLabel)(void* _obj, void* dc, int col)
-{
-	((wxGrid*)_obj)->DrawColLabel(*((wxDC*) dc), col);
-}
-	
-EWXWEXPORT(void, wxGrid_DrawTextRectangle)(void* _obj, void* dc, void* txt, int x, int y, int w, int h, int horizontalAlignment, int verticalAlignment)
-{
-	((wxGrid*)_obj)->DrawTextRectangle(*((wxDC*) dc), (wxChar*)txt, wxRect(x, y, w, h), horizontalAlignment, verticalAlignment);
-}
-	
-EWXWEXPORT(int, wxGrid_StringToLines)(void* _obj,  void* value, void* lines)
-{
-	int result = 0;
-	wxArrayString arr;
-	
-	((wxGrid*)_obj)->StringToLines((wxChar*)value, arr);
-	
-	result = arr.GetCount();
-	
-	if (lines)
-	{
-		for (int i = 0; i < result; i++)
-			((const wxChar**)lines)[i] = wxStrdup (arr[i].c_str());
-	}
-	return result;
-}
-	
-EWXWEXPORT(void, wxGrid_GetTextBoxSize)(void* _obj, void* dc, int count, void* lines, void* width, void* height)
-{
-	wxArrayString arr;
-
-	for (int i = 0; i < count; i++)
-		arr[i] = ((wxChar**)lines)[i];
-
-	((wxGrid*)_obj)->GetTextBoxSize(*((wxDC*) dc), arr, (long*)width, (long*)height);
-}
-	
-EWXWEXPORT(void, wxGrid_BeginBatch)(void* _obj)
-{
-	((wxGrid*)_obj)->BeginBatch();
-}
-	
-EWXWEXPORT(void, wxGrid_EndBatch)(void* _obj)
-{
-	((wxGrid*)_obj)->EndBatch();
-}
-	
-EWXWEXPORT(int, wxGrid_GetBatchCount)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetBatchCount();
-}
-	
-EWXWEXPORT(int, wxGrid_IsEditable)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->IsEditable();
-}
-	
-EWXWEXPORT(void, wxGrid_EnableEditing)(void* _obj, int edit)
-{
-	((wxGrid*)_obj)->EnableEditing(edit != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_EnableCellEditControl)(void* _obj, int enable)
-{
-	((wxGrid*)_obj)->EnableCellEditControl(enable != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_DisableCellEditControl)(void* _obj)
-{
-	((wxGrid*)_obj)->DisableCellEditControl();
-}
-	
-EWXWEXPORT(int, wxGrid_CanEnableCellControl)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->CanEnableCellControl();
-}
-	
-EWXWEXPORT(int, wxGrid_IsCellEditControlEnabled)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->IsCellEditControlEnabled();
-}
-	
-EWXWEXPORT(int, wxGrid_IsCellEditControlShown)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->IsCellEditControlShown();
-}
-	
-EWXWEXPORT(int, wxGrid_IsCurrentCellReadOnly)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->IsCurrentCellReadOnly();
-}
-	
-EWXWEXPORT(void, wxGrid_ShowCellEditControl)(void* _obj)
-{
-	((wxGrid*)_obj)->ShowCellEditControl();
-}
-	
-EWXWEXPORT(void, wxGrid_HideCellEditControl)(void* _obj)
-{
-	((wxGrid*)_obj)->HideCellEditControl();
-}
-	
-EWXWEXPORT(void, wxGrid_SaveEditControlValue)(void* _obj)
-{
-	((wxGrid*)_obj)->SaveEditControlValue();
-}
-	
-EWXWEXPORT(void, wxGrid_XYToCell)(void* _obj, int x, int y, int* r, int* c)
-{
-	wxGridCellCoords cds;
-	((wxGrid*)_obj)->XYToCell(x, y, cds);
-	*r = cds.GetRow();
-	*c = cds.GetCol();
-}
-	
-EWXWEXPORT(int, wxGrid_YToRow)(void* _obj, int y)
-{
-	return ((wxGrid*)_obj)->YToRow(y);
-}
-	
-EWXWEXPORT(int, wxGrid_XToCol)(void* _obj, int x)
-{
-	return ((wxGrid*)_obj)->XToCol(x);
-}
-	
-EWXWEXPORT(int, wxGrid_YToEdgeOfRow)(void* _obj, int y)
-{
-	return ((wxGrid*)_obj)->YToEdgeOfRow(y);
-}
-	
-EWXWEXPORT(int, wxGrid_XToEdgeOfCol)(void* _obj, int x)
-{
-	return ((wxGrid*)_obj)->XToEdgeOfCol(x);
-}
-	
-EWXWEXPORT(void, wxGrid_CellToRect)(void* _obj, int row, int col, int* x, int* y, int* w, int* h)
-{
-	wxRect rct = ((wxGrid*)_obj)->CellToRect(row, col);
-	*x = rct.x;
-	*y = rct.y;
-	*w = rct.width;
-	*h = rct.height;
-}
-	
-EWXWEXPORT(int, wxGrid_GetGridCursorRow)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetGridCursorRow();
-}
-	
-EWXWEXPORT(int, wxGrid_GetGridCursorCol)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetGridCursorCol();
-}
-	
-EWXWEXPORT(int, wxGrid_IsVisible)(void* _obj,  int row, int col, int wholeCellVisible)
-{
-	return (int)((wxGrid*)_obj)->IsVisible(row, col, wholeCellVisible != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_MakeCellVisible)(void* _obj, int row, int col)
-{
-	((wxGrid*)_obj)->MakeCellVisible(row, col);
-}
-	
-EWXWEXPORT(void, wxGrid_SetGridCursor)(void* _obj, int row, int col)
-{
-	((wxGrid*)_obj)->SetGridCursor(row, col);
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorUp)(void* _obj, int expandSelection)
-{
-	return (int)((wxGrid*)_obj)->MoveCursorUp(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorDown)(void* _obj, int expandSelection )
-{
-	return (int)((wxGrid*)_obj)->MoveCursorDown(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorLeft)(void* _obj, int expandSelection)
-{
-	return (int)((wxGrid*)_obj)->MoveCursorLeft(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorRight)(void* _obj, int expandSelection)
-{
-	return (int)((wxGrid*)_obj)->MoveCursorRight(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_MovePageDown)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->MovePageDown();
-}
-	
-EWXWEXPORT(int, wxGrid_MovePageUp)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->MovePageUp();
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorUpBlock)(void* _obj, int expandSelection)
-{
-	return (int)((wxGrid*)_obj)->MoveCursorUpBlock(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorDownBlock)(void* _obj, int expandSelection)
-{
-	return (int)((wxGrid*)_obj)->MoveCursorDownBlock(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorLeftBlock)(void* _obj, int expandSelection)
-{
-	return (int)((wxGrid*)_obj)->MoveCursorLeftBlock(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_MoveCursorRightBlock)(void* _obj, int expandSelection)
-{
-	return (int)((wxGrid*)_obj)->MoveCursorRightBlock(expandSelection != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_GetDefaultRowLabelSize)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetDefaultRowLabelSize();
-}
-	
-EWXWEXPORT(int, wxGrid_GetRowLabelSize)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetRowLabelSize();
-}
-	
-EWXWEXPORT(int, wxGrid_GetDefaultColLabelSize)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetDefaultColLabelSize();
-}
-	
-EWXWEXPORT(int, wxGrid_GetColLabelSize)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetColLabelSize();
-}
-	
-EWXWEXPORT(void, wxGrid_GetLabelBackgroundColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetLabelBackgroundColour();
-}
-	
-EWXWEXPORT(void, wxGrid_GetLabelTextColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetLabelTextColour();
-}
-	
-EWXWEXPORT(void, wxGrid_GetLabelFont)(void* _obj, void* font)
-{
-	*((wxFont*)font) = ((wxGrid*)_obj)->GetLabelFont();
-}
-	
-EWXWEXPORT(void, wxGrid_GetRowLabelAlignment)(void* _obj, void* horiz, void* vert)
-{
-	((wxGrid*)_obj)->GetRowLabelAlignment((int*)horiz, (int*)vert);
-}
-	
-EWXWEXPORT(void, wxGrid_GetColLabelAlignment)(void* _obj, void* horiz, void* vert)
-{
-	((wxGrid*)_obj)->GetColLabelAlignment((int*)horiz, (int*)vert);
-}
-	
-EWXWEXPORT(int, wxGrid_GetRowLabelValue)(void* _obj, int row, void* _buf)
-{
-	wxString result =((wxGrid*)_obj)->GetRowLabelValue(row);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxGrid_GetColLabelValue)(void* _obj, int col, void* _buf)
-{
-	wxString result =((wxGrid*)_obj)->GetColLabelValue(col);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxGrid_GetGridLineColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetGridLineColour();
-}
-	
-EWXWEXPORT(void, wxGrid_GetCellHighlightColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetCellHighlightColour();
-}
-	
-EWXWEXPORT(void, wxGrid_SetRowLabelSize)(void* _obj, int width)
-{
-	((wxGrid*)_obj)->SetRowLabelSize(width);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColLabelSize)(void* _obj, int height)
-{
-	((wxGrid*)_obj)->SetColLabelSize(height);
-}
-	
-EWXWEXPORT(void, wxGrid_SetLabelBackgroundColour)(void* _obj, void* colour)
-{
-	((wxGrid*)_obj)->SetLabelBackgroundColour(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxGrid_SetLabelTextColour)(void* _obj, void* colour)
-{
-	((wxGrid*)_obj)->SetLabelTextColour(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxGrid_SetLabelFont)(void* _obj, void* font)
-{
-	((wxGrid*)_obj)->SetLabelFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(void, wxGrid_SetRowLabelAlignment)(void* _obj, int horiz, int vert)
-{
-	((wxGrid*)_obj)->SetRowLabelAlignment(horiz, vert);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColLabelAlignment)(void* _obj, int horiz, int vert)
-{
-	((wxGrid*)_obj)->SetColLabelAlignment(horiz, vert);
-}
-	
-EWXWEXPORT(void, wxGrid_SetRowLabelValue)(void* _obj, int row, void* label)
-{
-	((wxGrid*)_obj)->SetRowLabelValue(row, (wxChar*)label);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColLabelValue)(void* _obj, int col, void* label)
-{
-	((wxGrid*)_obj)->SetColLabelValue(col, (wxChar*)label);
-}
-	
-EWXWEXPORT(void, wxGrid_SetGridLineColour)(void* _obj, void* col)
-{
-	((wxGrid*)_obj)->SetGridLineColour(*((wxColour*) col));
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellHighlightColour)(void* _obj, void* col)
-{
-	((wxGrid*)_obj)->SetCellHighlightColour(*((wxColour*) col));
-}
-	
-EWXWEXPORT(void, wxGrid_EnableDragRowSize)(void* _obj, int enable)
-{
-	((wxGrid*)_obj)->EnableDragRowSize(enable != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_DisableDragRowSize)(void* _obj)
-{
-	((wxGrid*)_obj)->DisableDragRowSize();
-}
-	
-EWXWEXPORT(int, wxGrid_CanDragRowSize)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->CanDragRowSize();
-}
-	
-EWXWEXPORT(void, wxGrid_EnableDragColSize)(void* _obj, int enable)
-{
-	((wxGrid*)_obj)->EnableDragColSize(enable != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_DisableDragColSize)(void* _obj)
-{
-	((wxGrid*)_obj)->DisableDragColSize();
-}
-	
-EWXWEXPORT(int, wxGrid_CanDragColSize)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->CanDragColSize();
-}
-	
-EWXWEXPORT(void, wxGrid_EnableDragGridSize)(void* _obj, int enable)
-{
-	((wxGrid*)_obj)->EnableDragGridSize(enable != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_DisableDragGridSize)(void* _obj)
-{
-	((wxGrid*)_obj)->DisableDragGridSize();
-}
-	
-EWXWEXPORT(int, wxGrid_CanDragGridSize)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->CanDragGridSize();
-}
-	
-EWXWEXPORT(void, wxGrid_SetRowAttr)(void* _obj, int row, void* attr)
-{
-	((wxGrid*)_obj)->SetRowAttr(row, (wxGridCellAttr*) attr);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColAttr)(void* _obj, int col, void* attr)
-{
-	((wxGrid*)_obj)->SetColAttr(col, (wxGridCellAttr*) attr);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColFormatBool)(void* _obj, int col)
-{
-	((wxGrid*)_obj)->SetColFormatBool(col);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColFormatNumber)(void* _obj, int col)
-{
-	((wxGrid*)_obj)->SetColFormatNumber(col);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColFormatFloat)(void* _obj, int col, int width, int precision)
-{
-	((wxGrid*)_obj)->SetColFormatFloat(col, width, precision);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColFormatCustom)(void* _obj, int col, void* typeName)
-{
-	((wxGrid*)_obj)->SetColFormatCustom(col, (wxChar*)typeName);
-}
-	
-EWXWEXPORT(void, wxGrid_EnableGridLines)(void* _obj, int enable)
-{
-	((wxGrid*)_obj)->EnableGridLines(enable != 0);
-}
-	
-EWXWEXPORT(int, wxGrid_GridLinesEnabled)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->GridLinesEnabled();
-}
-	
-EWXWEXPORT(int, wxGrid_GetDefaultRowSize)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetDefaultRowSize();
-}
-	
-EWXWEXPORT(int, wxGrid_GetRowSize)(void* _obj, int row)
-{
-	return ((wxGrid*)_obj)->GetRowSize(row);
-}
-	
-EWXWEXPORT(int, wxGrid_GetDefaultColSize)(void* _obj)
-{
-	return ((wxGrid*)_obj)->GetDefaultColSize();
-}
-	
-EWXWEXPORT(int, wxGrid_GetColSize)(void* _obj, int col)
-{
-	return ((wxGrid*)_obj)->GetColSize(col);
-}
-	
-EWXWEXPORT(void, wxGrid_GetDefaultCellBackgroundColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetDefaultCellBackgroundColour();
-}
-	
-EWXWEXPORT(void, wxGrid_GetCellBackgroundColour)(void* _obj, int row, int col, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetCellBackgroundColour(row, col);
-}
-	
-EWXWEXPORT(void, wxGrid_GetDefaultCellTextColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetDefaultCellTextColour();
-}
-	
-EWXWEXPORT(void, wxGrid_GetCellTextColour)(void* _obj, int row, int col, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetCellTextColour(row, col);
-}
-	
-EWXWEXPORT(void, wxGrid_GetDefaultCellFont)(void* _obj, void* font)
-{
-	*((wxFont*)font) = ((wxGrid*)_obj)->GetDefaultCellFont();
-}
-	
-EWXWEXPORT(void, wxGrid_GetCellFont)(void* _obj, int row, int col, void* font)
-{
-	*((wxFont*)font) = ((wxGrid*)_obj)->GetCellFont(row, col);
-}
-	
-EWXWEXPORT(void, wxGrid_GetDefaultCellAlignment)(void* _obj, void* horiz, void* vert)
-{
-	((wxGrid*)_obj)->GetDefaultCellAlignment((int*)horiz, (int*)vert);
-}
-	
-EWXWEXPORT(void, wxGrid_GetCellAlignment)(void* _obj,  int row, int col, void* horiz, void* vert)
-{
-	((wxGrid*)_obj)->GetCellAlignment(row, col, (int*)horiz, (int*)vert);
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultRowSize)(void* _obj, int height, int resizeExistingRows)
-{
-	((wxGrid*)_obj)->SetDefaultRowSize(height, resizeExistingRows != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_SetRowSize)(void* _obj,  int row, int height)
-{
-	((wxGrid*)_obj)->SetRowSize(row, height);
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultColSize)(void* _obj, int width, int resizeExistingCols)
-{
-	((wxGrid*)_obj)->SetDefaultColSize(width, resizeExistingCols != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_SetColSize)(void* _obj, int col, int width)
-{
-	((wxGrid*)_obj)->SetColSize(col, width);
-}
-	
-EWXWEXPORT(void, wxGrid_AutoSizeColumn)(void* _obj, int col, int setAsMin)
-{
-	((wxGrid*)_obj)->AutoSizeColumn(col, setAsMin != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_AutoSizeRow)(void* _obj, int row, int setAsMin)
-{
-	((wxGrid*)_obj)->AutoSizeRow(row, setAsMin != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_AutoSizeColumns)(void* _obj, int setAsMin)
-{
-	((wxGrid*)_obj)->AutoSizeColumns(setAsMin != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_AutoSizeRows)(void* _obj, int setAsMin)
-{
-	((wxGrid*)_obj)->AutoSizeRows(setAsMin != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_AutoSize)(void* _obj)
-{
-	((wxGrid*)_obj)->AutoSize();
-}
-	
-EWXWEXPORT(void, wxGrid_SetColMinimalWidth)(void* _obj, int col, int width)
-{
-	((wxGrid*)_obj)->SetColMinimalWidth(col, width);
-}
-	
-EWXWEXPORT(void, wxGrid_SetRowMinimalHeight)(void* _obj, int row, int width)
-{
-	((wxGrid*)_obj)->SetRowMinimalHeight(row, width);
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultCellBackgroundColour)(void* _obj, void* colour)
-{
-	((wxGrid*)_obj)->SetDefaultCellBackgroundColour(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellBackgroundColour)(void* _obj, int row, int col, void* colour)
-{
-	((wxGrid*)_obj)->SetCellBackgroundColour(row, col, *((wxColour*) colour));
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultCellTextColour)(void* _obj, void* colour)
-{
-	((wxGrid*)_obj)->SetDefaultCellTextColour(*((wxColour*)colour));
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellTextColour)(void* _obj, int row, int col, void* colour)
-{
-	((wxGrid*)_obj)->SetCellTextColour(row, col, *((wxColour*) colour));
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultCellFont)(void* _obj, void* font)
-{
-	((wxGrid*)_obj)->SetDefaultCellFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellFont)(void* _obj,  int row, int col, void* font)
-{
-	((wxGrid*)_obj)->SetCellFont(row, col, *((wxFont*)font) );
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultCellAlignment)(void* _obj, int horiz, int vert)
-{
-	((wxGrid*)_obj)->SetDefaultCellAlignment(horiz, vert);
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellAlignment)(void* _obj,  int row, int col, int horiz, int vert)
-{
-	((wxGrid*)_obj)->SetCellAlignment(row, col, horiz, vert);
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultRenderer)(void* _obj, void* renderer)
-{
-	((wxGrid*)_obj)->SetDefaultRenderer((wxGridCellRenderer*) renderer);
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellRenderer)(void* _obj, int row, int col, void* renderer)
-{
-	((wxGrid*)_obj)->SetCellRenderer(row, col, (wxGridCellRenderer*)renderer);
-}
-	
-EWXWEXPORT(void*, wxGrid_GetDefaultRenderer)(void* _obj)
-{
-	return (void*)((wxGrid*)_obj)->GetDefaultRenderer();
-}
-	
-EWXWEXPORT(void*, wxGrid_GetCellRenderer)(void* _obj, int row, int col)
-{
-	return (void*)((wxGrid*)_obj)->GetCellRenderer(row, col);
-}
-	
-EWXWEXPORT(void, wxGrid_SetDefaultEditor)(void* _obj, void* editor)
-{
-	((wxGrid*)_obj)->SetDefaultEditor((wxGridCellEditor*)editor);
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellEditor)(void* _obj, int row, int col, void* editor)
-{
-	((wxGrid*)_obj)->SetCellEditor(row, col, (wxGridCellEditor*)editor);
-}
-	
-EWXWEXPORT(void*, wxGrid_GetDefaultEditor)(void* _obj)
-{
-	return (void*)((wxGrid*)_obj)->GetDefaultEditor();
-}
-	
-EWXWEXPORT(void*, wxGrid_GetCellEditor)(void* _obj, int row, int col)
-{
-	return (void*)((wxGrid*)_obj)->GetCellEditor(row, col);
-}
-	
-EWXWEXPORT(int, wxGrid_GetCellValue)(void* _obj, int row, int col, void* _buf)
-{
-	wxString result =((wxGrid*)_obj)->GetCellValue(row, col);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxGrid_SetCellValue)(void* _obj,  int row, int col, void* s)
-{
-	((wxGrid*)_obj)->SetCellValue(row, col, (wxChar*) s);
-}
-	
-EWXWEXPORT(int, wxGrid_IsReadOnly)(void* _obj, int row, int col)
-{
-	return (int)((wxGrid*)_obj)->IsReadOnly(row, col);
-}
-	
-EWXWEXPORT(void, wxGrid_SetReadOnly)(void* _obj, int row, int col, int isReadOnly)
-{
-	((wxGrid*)_obj)->SetReadOnly(row, col, isReadOnly != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_SelectRow)(void* _obj, int row, int addToSelected)
-{
-	((wxGrid*)_obj)->SelectRow(row, addToSelected != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_SelectCol)(void* _obj, int col, int addToSelected)
-{
-	((wxGrid*)_obj)->SelectCol(col, addToSelected != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_SelectBlock)(void* _obj,  int topRow, int leftCol, int bottomRow, int rightCol, int addToSelected)
-{
-	((wxGrid*)_obj)->SelectBlock(topRow, leftCol, bottomRow, rightCol, addToSelected != 0);
-}
-	
-EWXWEXPORT(void, wxGrid_SelectAll)(void* _obj)
-{
-	((wxGrid*)_obj)->SelectAll();
-}
-	
-EWXWEXPORT(int, wxGrid_IsSelection)(void* _obj)
-{
-	return (int)((wxGrid*)_obj)->IsSelection();
-}
-	
-EWXWEXPORT(void, wxGrid_ClearSelection)(void* _obj)
-{
-	((wxGrid*)_obj)->ClearSelection();
-}
-	
-EWXWEXPORT(int, wxGrid_IsInSelection)(void* _obj, int row, int col )
-{
-	return (int)((wxGrid*)_obj)->IsInSelection(row, col );
-}
-	
-EWXWEXPORT(void, wxGrid_BlockToDeviceRect)(void* _obj, int top, int left, int bottom, int right, int* x, int* y, int* w, int* h)
-{
-	wxRect rct = ((wxGrid*)_obj)->BlockToDeviceRect(wxGridCellCoords(top, left), wxGridCellCoords(bottom, right));
-	*x = rct.x;
-	*y = rct.y;
-	*w = rct.width;
-	*h = rct.height;
-}
-	
-EWXWEXPORT(void, wxGrid_GetSelectionBackground)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetSelectionBackground();
-}
-	
-EWXWEXPORT(void, wxGrid_GetSelectionForeground)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxGrid*)_obj)->GetSelectionForeground();
-}
-	
-EWXWEXPORT(void, wxGrid_SetSelectionBackground)(void* _obj, void* c)
-{
-	((wxGrid*)_obj)->SetSelectionBackground(*((wxColour*) c));
-}
-	
-EWXWEXPORT(void, wxGrid_SetSelectionForeground)(void* _obj, void* c)
-{
-	((wxGrid*)_obj)->SetSelectionForeground(*((wxColour*) c));
-}
-	
-EWXWEXPORT(void, wxGrid_RegisterDataType)(void* _obj, void* typeName, void* renderer, void* editor)
-{
-	((wxGrid*)_obj)->RegisterDataType((wxChar*) typeName, (wxGridCellRenderer*) renderer, (wxGridCellEditor*) editor);
-}
-	
-EWXWEXPORT(void*, wxGrid_GetDefaultEditorForCell)(void* _obj, int row, int col)
-{
-	return (void*)((wxGrid*)_obj)->GetDefaultEditorForCell(row, col);
-}
-	
-EWXWEXPORT(void*, wxGrid_GetDefaultRendererForCell)(void* _obj, int row, int col)
-{
-	return (void*)((wxGrid*)_obj)->GetDefaultRendererForCell(row, col);
-}
-	
-EWXWEXPORT(void*, wxGrid_GetDefaultEditorForType)(void* _obj, void* typeName)
-{
-	return (void*)((wxGrid*)_obj)->GetDefaultEditorForType((wxChar*) typeName);
-}
-	
-EWXWEXPORT(void*, wxGrid_GetDefaultRendererForType)(void* _obj, void* typeName)
-{
-	return (void*)((wxGrid*)_obj)->GetDefaultRendererForType((wxChar*) typeName);
-}
-	
-EWXWEXPORT(void, wxGrid_SetMargins)(void* _obj, int extraWidth, int extraHeight)
-{
-	((wxGrid*)_obj)->SetMargins(extraWidth, extraHeight);
-}
-
-EWXWEXPORT(void,wxGrid_GetSelectedCells)(void* _obj, void* _arr)
-{
-	*((wxGridCellCoordsArray*)_arr) = ((wxGrid*)_obj)->GetSelectedCells();
-}
-	
-EWXWEXPORT(void,wxGrid_GetSelectionBlockTopLeft)(void* _obj, void* _arr)
-{
-	*((wxGridCellCoordsArray*)_arr) = ((wxGrid*)_obj)->GetSelectionBlockTopLeft();
-}
-	
-EWXWEXPORT(void,wxGrid_GetSelectionBlockBottomRight)(void* _obj, void* _arr)
-{
-	*((wxGridCellCoordsArray*)_arr) = ((wxGrid*)_obj)->GetSelectionBlockBottomRight();
-}
-	
-EWXWEXPORT(int,wxGrid_GetSelectedRows)(void* _obj, void* _arr)
-{
-	wxArrayInt arr = ((wxGrid*)_obj)->GetSelectedRows();
-	if (_arr)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((int*)_arr)[i] = arr.Item(i);
-	}
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(int,wxGrid_GetSelectedCols)(void* _obj, void* _arr)
-{
-	wxArrayInt arr = ((wxGrid*)_obj)->GetSelectedCols();
-	if (_arr)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((int*)_arr)[i] = arr.Item(i);
-	}
-	return arr.GetCount();
-}
-	
-
-
-EWXWEXPORT(void*,ELJGridTable_Create)(void* _obj,
-                                      void* _EifGetNumberRows,
-                                      void* _EifGetNumberCols,
-                                      void* _EifGetValue,
-                                      void* _EifSetValue,
-                                      void* _EifIsEmptyCell,
-                                      void* _EifClear,
-                                      void* _EifInsertRows,
-                                      void* _EifAppendRows,
-                                      void* _EifDeleteRows,
-                                      void* _EifInsertCols,
-                                      void* _EifAppendCols,
-                                      void* _EifDeleteCols,
-                                      void* _EifSetRowLabelValue,
-                                      void* _EifSetColLabelValue,
-                                      void* _EifGetRowLabelValue,
-                                      void* _EifGetColLabelValue)
-{
-	return (void*)new ELJGridTable (_obj,
-	                                _EifGetNumberRows,
-	                                _EifGetNumberCols,
-	                                _EifGetValue,
-	                                _EifSetValue,
-	                                _EifIsEmptyCell,
-	                                _EifClear,
-	                                _EifInsertRows,
-	                                _EifAppendRows,
-	                                _EifDeleteRows,
-	                                _EifInsertCols,
-	                                _EifAppendCols,
-	                                _EifDeleteCols,
-	                                _EifSetRowLabelValue,
-	                                _EifSetColLabelValue,
-	                                _EifGetRowLabelValue,
-	                                _EifGetColLabelValue);
-}
-	
-EWXWEXPORT(void,ELJGridTable_Delete)(void* _obj)
-{
-	delete (ELJGridTable*)_obj;
-}
-
-EWXWEXPORT(void*,ELJGridTable_GetView)(void* _obj)
-{
-	return (void*)((ELJGridTable*)_obj)->GetView();
-}
-
-EWXWEXPORT(void,ELJGridTable_SendTableMessage)(void* _obj, int id, int val1, int val2)
-{
-	wxGridTableMessage msg((ELJGridTable*)_obj, id, val1, val2);
-	((ELJGridTable*)_obj)->GetView()->ProcessTableMessage(msg);
-}
-
-EWXWEXPORT(int,wxGridEvent_GetRow)(void* _obj)
-{
-	return ((wxGridEvent*)_obj)->GetRow();
-}
-	
-EWXWEXPORT(int,wxGridEvent_GetCol)(void* _obj)
-{
-	return ((wxGridEvent*)_obj)->GetCol();
-}
-	
-EWXWEXPORT(void,wxGridEvent_GetPosition)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pt = ((wxGridEvent*)_obj)->GetPosition();
-	*((int*)_x) = pt.x;
-	*((int*)_y) = pt.y;
-}
-	
-EWXWEXPORT(int,wxGridEvent_Selecting)(void* _obj)
-{
-	return (int)((wxGridEvent*)_obj)->Selecting();
-}
-	
-EWXWEXPORT(int,wxGridEvent_ControlDown)(void* _obj)
-{
-	return  (int)((wxGridEvent*)_obj)->ControlDown();
-}
-	
-EWXWEXPORT(int,wxGridEvent_MetaDown)(void* _obj)
-{
-	return (int)((wxGridEvent*)_obj)->MetaDown();
-}
-	
-EWXWEXPORT(int,wxGridEvent_ShiftDown)(void* _obj)
-{
-	return (int)((wxGridEvent*)_obj)->ShiftDown();
-}
-	
-EWXWEXPORT(int,wxGridEvent_AltDown)(void* _obj)
-{
-	return (int)((wxGridEvent*)_obj)->AltDown();
-}
-	
-
-EWXWEXPORT(int,wxGridSizeEvent_GetRowOrCol)(void* _obj)
-{
-	return ((wxGridSizeEvent*)_obj)->GetRowOrCol();
-}
-	
-EWXWEXPORT(void,wxGridSizeEvent_GetPosition)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pt = ((wxGridSizeEvent*)_obj)->GetPosition();
-	*((int*)_x) = pt.x;
-	*((int*)_y) = pt.y;
-}
-	
-EWXWEXPORT(int,wxGridSizeEvent_ControlDown)(void* _obj)
-{
-	return (int)((wxGridSizeEvent*)_obj)->ControlDown();
-}
-	
-EWXWEXPORT(int,wxGridSizeEvent_MetaDown)(void* _obj)
-{
-	return (int)((wxGridSizeEvent*)_obj)->MetaDown();
-}
-	
-EWXWEXPORT(int,wxGridSizeEvent_ShiftDown)(void* _obj)
-{
-	return (int)((wxGridSizeEvent*)_obj)->ShiftDown();
-}
-	
-EWXWEXPORT(int,wxGridSizeEvent_AltDown)(void* _obj)
-{
-	return (int)((wxGridSizeEvent*)_obj)->AltDown();
-}
-	
-
-EWXWEXPORT(void,wxGridRangeSelectEvent_GetTopLeftCoords)(void* _obj, void* _c, void* _r)
-{
-	wxGridCellCoords crd = ((wxGridRangeSelectEvent*)_obj)->GetTopLeftCoords();
-	*((int*)_c) = crd.GetRow();
-	*((int*)_r) = crd.GetCol();
-}
-	
-EWXWEXPORT(void,wxGridRangeSelectEvent_GetBottomRightCoords)(void* _obj, void* _c, void* _r)
-{
-	wxGridCellCoords crd = ((wxGridRangeSelectEvent*)_obj)->GetBottomRightCoords();
-	*((int*)_c) = crd.GetRow();
-	*((int*)_r) = crd.GetCol();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_GetTopRow)(void* _obj)
-{
-	return ((wxGridRangeSelectEvent*)_obj)->GetTopRow();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_GetBottomRow)(void* _obj)
-{
-	return ((wxGridRangeSelectEvent*)_obj)->GetBottomRow();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_GetLeftCol)(void* _obj)
-{
-	return ((wxGridRangeSelectEvent*)_obj)->GetLeftCol();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_GetRightCol)(void* _obj)
-{
-	return ((wxGridRangeSelectEvent*)_obj)->GetRightCol();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_Selecting)(void* _obj)
-{
-	return (int)((wxGridRangeSelectEvent*)_obj)->Selecting();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_ControlDown)(void* _obj)
-{
-	return (int)((wxGridRangeSelectEvent*)_obj)->ControlDown();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_MetaDown)(void* _obj)
-{
-	return (int)((wxGridRangeSelectEvent*)_obj)->MetaDown();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_ShiftDown)(void* _obj)
-{
-	return (int)((wxGridRangeSelectEvent*)_obj)->ShiftDown();
-}
-	
-EWXWEXPORT(int,wxGridRangeSelectEvent_AltDown)(void* _obj)
-{
-	return (int)((wxGridRangeSelectEvent*)_obj)->AltDown();
-}
-	
-
-EWXWEXPORT(int,wxGridEditorCreatedEvent_GetRow)(void* _obj)
-{
-	return ((wxGridEditorCreatedEvent*)_obj)->GetRow();
-}
-	
-EWXWEXPORT(int,wxGridEditorCreatedEvent_GetCol)(void* _obj)
-{
-	return ((wxGridEditorCreatedEvent*)_obj)->GetCol();
-}
-	
-EWXWEXPORT(void*,wxGridEditorCreatedEvent_GetControl)(void* _obj)
-{
-	return (void*)((wxGridEditorCreatedEvent*)_obj)->GetControl();
-}
-	
-EWXWEXPORT(void,wxGridEditorCreatedEvent_SetRow)(void* _obj, int row)
-{
-	((wxGridEditorCreatedEvent*)_obj)->SetRow(row);
-}
-	
-EWXWEXPORT(void,wxGridEditorCreatedEvent_SetCol)(void* _obj, int col)
-{
-	((wxGridEditorCreatedEvent*)_obj)->SetCol(col);
-}
-	
-EWXWEXPORT(void,wxGridEditorCreatedEvent_SetControl)(void* _obj, void* ctrl)
-{
-	((wxGridEditorCreatedEvent*)_obj)->SetControl((wxControl*)ctrl);
-}
-	
-
-} 
diff --git a/wxc/src/ewxw/eljgrid.h b/wxc/src/ewxw/eljgrid.h
deleted file mode 100644
--- a/wxc/src/ewxw/eljgrid.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef __ELJGRID_H
-#define __ELJGRID_H
-
-#include "wx/grid.h"
-
-extern "C"
-{
-typedef int   _cdecl (*TGridGetInt)(void* _obj);
-typedef int   _cdecl (*TGridIsEmpty)(void* _obj, int row, int col);
-typedef void* _cdecl (*TGridGetValue)(void* _obj, int row, int col);
-typedef void  _cdecl (*TGridSetValue)(void* _obj, int row, int col, void* val);
-typedef void  _cdecl (*TGridClear)(void* _obj);
-typedef int   _cdecl (*TGridModify)(void* _obj, int pos, int num);
-typedef int   _cdecl (*TGridMultiModify)(void* _obj, int num);
-typedef void  _cdecl (*TGridSetLabel)(void* _obj, int idx, void* val);
-typedef void* _cdecl (*TGridGetLabel)(void* _obj, int idx);
-}
-
-class ELJGridTable : public wxGridTableBase
-{
-	private:
-		void* EiffelObject;
-		TGridGetInt EifGetNumberRows;
-		TGridGetInt EifGetNumberCols;
-		TGridGetValue EifGetValue;
-		TGridSetValue EifSetValue;
-		TGridIsEmpty EifIsEmptyCell;
-		TGridClear EifClear;
-		TGridModify EifInsertRows;
-		TGridMultiModify EifAppendRows;
-		TGridModify EifDeleteRows;
-		TGridModify EifInsertCols;
-		TGridMultiModify EifAppendCols;
-		TGridModify EifDeleteCols;
-		TGridSetLabel EifSetRowLabelValue;
-		TGridSetLabel EifSetColLabelValue;
-		TGridGetLabel EifGetRowLabelValue;
-		TGridGetLabel EifGetColLabelValue;
-	public:
-		ELJGridTable (void* _obj,
-		              void* _EifGetNumberRows,
-		              void* _EifGetNumberCols,
-		              void* _EifGetValue,
-		              void* _EifSetValue,
-		              void* _EifIsEmptyCell,
-		              void* _EifClear,
-		              void* _EifInsertRows,
-		              void* _EifAppendRows,
-		              void* _EifDeleteRows,
-		              void* _EifInsertCols,
-		              void* _EifAppendCols,
-		              void* _EifDeleteCols,
-		              void* _EifSetRowLabelValue,
-		              void* _EifSetColLabelValue,
-		              void* _EifGetRowLabelValue,
-		              void* _EifGetColLabelValue): wxGridTableBase()
-		{
-			EiffelObject = _obj;
-			EifGetNumberRows = (TGridGetInt)_EifGetNumberRows;
-			EifGetNumberCols = (TGridGetInt)_EifGetNumberCols;
-			EifGetValue = (TGridGetValue)_EifGetValue;
-			EifSetValue = (TGridSetValue)_EifSetValue;
-			EifIsEmptyCell = (TGridIsEmpty)_EifIsEmptyCell;
-			EifClear = (TGridClear)_EifClear;
-			EifInsertRows = (TGridModify)_EifInsertRows;
-			EifAppendRows = (TGridMultiModify)_EifAppendRows;
-			EifDeleteRows = (TGridModify)_EifDeleteRows;
-			EifInsertCols = (TGridModify)_EifInsertCols;
-			EifAppendCols = (TGridMultiModify)_EifAppendCols;
-			EifDeleteCols = (TGridModify)_EifDeleteCols;
-			EifSetRowLabelValue = (TGridSetLabel)_EifSetRowLabelValue;
-			EifSetColLabelValue = (TGridSetLabel)_EifSetColLabelValue;
-			EifGetRowLabelValue = (TGridGetLabel)_EifGetRowLabelValue;
-			EifGetColLabelValue = (TGridGetLabel)_EifGetColLabelValue;
-		};
-		
-		int GetNumberRows() {return EifGetNumberRows(EiffelObject);};
-		int GetNumberCols() {return EifGetNumberCols(EiffelObject);};
-		wxString GetValue(int row, int col) {return (wxChar*)EifGetValue(EiffelObject, row, col);};
-		void SetValue(int row, int col, const wxString& s) {EifSetValue(EiffelObject, row, col, (void*)s.c_str());};
-		bool IsEmptyCell(int row, int col) {return EifIsEmptyCell(EiffelObject, row, col) != 0;};
-
-		void Clear() {EifClear(EiffelObject);};
-		bool InsertRows(size_t pos, size_t numRows) {return EifInsertRows(EiffelObject, (int)pos, (int)numRows) != 0;};
-		bool AppendRows(size_t numRows) {return EifAppendRows(EiffelObject, (int)numRows) != 0;};
-		bool DeleteRows(size_t pos, size_t numRows) {return EifDeleteRows(EiffelObject, (int)pos, (int)numRows) != 0;};
-		bool InsertCols(size_t pos, size_t numCols) {return EifInsertCols(EiffelObject, (int)pos, (int)numCols) != 0;};
-		bool AppendCols(size_t numCols) {return EifAppendCols(EiffelObject, (int)numCols) != 0;};
-		bool DeleteCols(size_t pos, size_t numCols) {return EifDeleteCols(EiffelObject, (int)pos, (int)numCols) != 0;};
-
-		void SetRowLabelValue(int row, const wxString& s) {EifSetRowLabelValue(EiffelObject, row, (void*)s.c_str());};
-		void SetColLabelValue(int col, const wxString& s) {EifSetColLabelValue(EiffelObject, col, (void*)s.c_str());};
-		wxString GetRowLabelValue(int row) {return (wxChar*)EifGetRowLabelValue(EiffelObject, row);};
-		wxString GetColLabelValue(int col) {return (wxChar*)EifGetColLabelValue(EiffelObject, col);};
-};
-
-#endif
diff --git a/wxc/src/ewxw/eljhelpcontroller.cpp b/wxc/src/ewxw/eljhelpcontroller.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljhelpcontroller.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-#include "wrapper.h"
-#include "wx/fs_zip.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxHtmlHelpController_Create)(int _style)
-{
-	wxGetApp().InitZipFileSystem();
-	wxGetApp().InitImageHandlers();
-	return (void*) new wxHtmlHelpController(_style);
-}
-
-EWXWEXPORT(void, wxHtmlHelpController_Delete)(void* _obj)
-{
-	delete (wxHtmlHelpController*)_obj;
-}
-
-EWXWEXPORT(void, wxHtmlHelpController_SetTitleFormat)(void* _obj, void* format)
-{
-	((wxHtmlHelpController*)_obj)->SetTitleFormat((wxChar*)format);
-}
-	
-EWXWEXPORT(void, wxHtmlHelpController_SetTempDir)(void* _obj, void* path)
-{
-	((wxHtmlHelpController*)_obj)->SetTempDir((wxChar*)path);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_AddBook)(void* _obj, void* book, int show_wait_msg)
-{
-	return (int)((wxHtmlHelpController*)_obj)->AddBook((wxChar*) book, show_wait_msg != 0);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_Display)(void* _obj, void* x)
-{
-	return (int)((wxHtmlHelpController*)_obj)->Display((wxChar*)x);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_DisplayNumber)(void* _obj, int id)
-{
-	return (int)((wxHtmlHelpController*)_obj)->Display(id);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_DisplayContents)(void* _obj)
-{
-	return (int)((wxHtmlHelpController*)_obj)->DisplayContents();
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_DisplayIndex)(void* _obj)
-{
-	return (int)((wxHtmlHelpController*)_obj)->DisplayIndex();
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_KeywordSearch)(void* _obj, void* keyword)
-{
-	return (int)((wxHtmlHelpController*)_obj)->KeywordSearch((wxChar*) keyword);
-}
-	
-EWXWEXPORT(void*, wxHtmlHelpController_GetFrame)(void* _obj)
-{
-	return (void*)((wxHtmlHelpController*)_obj)->GetFrame();
-}
-	
-EWXWEXPORT(void, wxHtmlHelpController_UseConfig)(void* _obj, void* config, void* rootpath)
-{
-	((wxHtmlHelpController*)_obj)->UseConfig((wxConfigBase*)config, (wxChar*)rootpath);
-}
-	
-EWXWEXPORT(void, wxHtmlHelpController_ReadCustomization)(void* _obj, void* cfg, void* path)
-{
-	((wxHtmlHelpController*)_obj)->ReadCustomization((wxConfigBase*)cfg, (wxChar*)path);
-}
-	
-EWXWEXPORT(void, wxHtmlHelpController_WriteCustomization)(void* _obj, void* cfg, void* path)
-{
-	((wxHtmlHelpController*)_obj)->WriteCustomization((wxConfigBase*)cfg, (wxChar*)path);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_Initialize)(void* _obj, void* file)
-{
-	return (int)((wxHtmlHelpController*)_obj)->Initialize((wxChar*)file);
-}
-	
-EWXWEXPORT(void, wxHtmlHelpController_SetViewer)(void* _obj, void* viewer, int flags)
-{
-	((wxHtmlHelpController*)_obj)->SetViewer((wxChar*)viewer, (long)flags);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_LoadFile)(void* _obj, void* file)
-{
-	return (int)((wxHtmlHelpController*)_obj)->LoadFile((wxChar*) file);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_DisplaySectionNumber)(void* _obj, int sectionNo)
-{
-	return (int)((wxHtmlHelpController*)_obj)->DisplaySection(sectionNo);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_DisplaySection)(void* _obj, void* section)
-{
-	return (int)((wxHtmlHelpController*)_obj)->DisplaySection((wxChar*)section);
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_DisplayBlock)(void* _obj, int blockNo)
-{
-	return (int)((wxHtmlHelpController*)_obj)->DisplayBlock((long)blockNo);
-}
-	
-EWXWEXPORT(void, wxHtmlHelpController_SetFrameParameters)(void* _obj, void* title, int width, int height, int pos_x, int pos_y, int newFrameEachTime)
-{
-	((wxHtmlHelpController*)_obj)->SetFrameParameters((wxChar*) title, wxSize(width, height), wxPoint(pos_x, pos_y), newFrameEachTime != 0);
-}
-	
-EWXWEXPORT(void*, wxHtmlHelpController_GetFrameParameters)(void* _obj, void* title, int* width, int* height, int* pos_x, int* pos_y, int* newFrameEachTime)
-{
-	void* result;
-	wxPoint pos;
-	wxSize size;
-
-	result = (void*)((wxHtmlHelpController*)_obj)->GetFrameParameters(&size, &pos, (bool*)newFrameEachTime);
-	
-	*height = size.y;
-	*width  = size.x;
-	*pos_x  = pos.x;
-	*pos_y  = pos.y;
-	
-	return result;
-}
-	
-EWXWEXPORT(int, wxHtmlHelpController_Quit)(void* _obj)
-{
-	return (int)((wxHtmlHelpController*)_obj)->Quit();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljicnbndl.cpp b/wxc/src/ewxw/eljicnbndl.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljicnbndl.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-#include "wx/artprov.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxIconBundle_CreateDefault)()
-{
-	return (void*)new wxIconBundle();
-}
-	
-EWXWEXPORT(void*,wxIconBundle_CreateFromFile)(void* file, int type)
-{
-	return (void*)new wxIconBundle((wxChar*)file, (long)type);
-}
-	
-EWXWEXPORT(void*,wxIconBundle_CreateFromIcon)(void* icon)
-{
-	return (void*) new wxIconBundle(*((wxIcon*)icon));
-}
-	
-EWXWEXPORT(void,wxIconBundle_Assign)(void* _obj, void* _ref)
-{
-	*((wxIconBundle*)_ref) = *((wxIconBundle*)_obj);
-}
-	
-EWXWEXPORT(void,wxIconBundle_Delete)(void* _obj)
-{
-	delete (wxIconBundle*)_obj;
-}
-	
-EWXWEXPORT(void,wxIconBundle_AddIconFromFile)(void* _obj, void* file, int type)
-{
-	((wxIconBundle*)_obj)->AddIcon((wxChar*)file, (long)type);
-}
-	
-EWXWEXPORT(void,wxIconBundle_AddIcon)(void* _obj, void* icon)
-{
-	((wxIconBundle*)_obj)->AddIcon(*((wxIcon*)icon));
-}
-	
-EWXWEXPORT(void,wxIconBundle_GetIcon)(void* _obj, int w, int h, void* _ref)
-{
-	*((wxIcon*)_ref) = ((wxIconBundle*)_obj)->GetIcon(wxSize(w, h));
-}
-
-}
-#endif
diff --git a/wxc/src/ewxw/eljicon.cpp b/wxc/src/ewxw/eljicon.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljicon.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxIcon_CreateDefault)()
-{
-	return (void*) new wxIcon();
-}
-
-EWXWEXPORT(void, wxIcon_Delete)(void* _obj)
-{
-	delete (wxIcon*)_obj;
-}
-
-EWXWEXPORT(void*, wxIcon_FromRaw)(void* data, int width, int height)
-{
-#ifdef __WIN32__
-	return (void*) new wxIcon((const wxChar*) data, wxBITMAP_TYPE_ICO, width, height);
-#else
-	return (void*) new wxIcon((const wxChar*) data, wxBITMAP_TYPE_ANY, width, height);
-#endif
-}
-
-EWXWEXPORT(void*, wxIcon_FromXPM)(void* data)
-{
-	return (void*) new wxIcon((const wxChar*) data);
-}
-
-EWXWEXPORT(void*, wxIcon_CreateLoad) (void* name, long type, int width, int height)
-{
-	return (void*) new wxIcon((wxChar*)name, (wxBitmapType)type, width, height);
-}
-
-EWXWEXPORT(int, wxIcon_Load)(void* _obj, void* name, long type, int width, int height)
-{
-#ifdef __WIN32__
-	return (int)((wxIcon*)_obj)->LoadFile((wxChar*)name, (wxBitmapType)type, width, height);
-#else
-	return (int)((wxIcon*)_obj)->LoadFile((wxChar*)name, (wxBitmapType)type);
-#endif
-}
-
-EWXWEXPORT(void, wxIcon_CopyFromBitmap)(void* _obj, void* bmp)
-{
-#ifdef __WIN32__
-	((wxIcon*)_obj)->CopyFromBitmap(*((wxBitmap*)bmp));
-#endif
-}
-
-EWXWEXPORT(int, wxIcon_Ok)(void* _obj)
-{
-	return (int)((wxIcon*)_obj)->Ok();
-}
-
-EWXWEXPORT(int, wxIcon_GetDepth)(void* _obj)
-{
-	return (int)((wxIcon*)_obj)->GetDepth();
-}
-
-EWXWEXPORT(int, wxIcon_GetWidth)(void* _obj)
-{
-	return (int)((wxIcon*)_obj)->GetWidth();
-}
-
-EWXWEXPORT(int, wxIcon_GetHeight)(void* _obj)
-{
-	return (int)((wxIcon*)_obj)->GetHeight();
-}
-
-EWXWEXPORT(void, wxIcon_Assign)(void* _obj, void* other)
-{
-	*((wxIcon*)_obj) = *((wxIcon*)other);
-}
-
-EWXWEXPORT(int, wxIcon_IsEqual)(void* _obj, void* other)
-{
-#if (wxVERSION_NUMBER <= 2800)
-	return (int)(*((wxIcon*)_obj) == *((wxIcon*)other));
-#else
-	wxIcon* icon1 = (wxIcon *)_obj;
-	wxIcon* icon2 = (wxIcon *)other;
-	wxBitmap bmp1;
-	wxBitmap bmp2;
-	bmp1.CopyFromIcon(*icon1);
-	bmp2.CopyFromIcon(*icon2);
-	wxImage image1 = (wxImage)bmp1.ConvertToImage();
-	wxImage image2 = (wxImage)bmp2.ConvertToImage();
-	wxImage* img1 = &image1;
-	wxImage* img2 = &image2;
-	if( (icon1->GetWidth() == icon2->GetWidth()) &&
-		(icon1->GetHeight() == icon2->GetHeight()) &&
-		(icon1->GetDepth() == icon2->GetDepth())){
-		bool equal = true;
-		for(int sx=0;sx<(icon1->GetWidth());sx++){
-			for(int sy=0;sy<(icon1->GetHeight());sy++){
-				equal = equal &&
-					(img1->GetRed(sx,sy)==img2->GetRed(sx,sy) &&
-					img1->GetGreen(sx,sy)==img2->GetGreen(sx,sy) &&
-					img1->GetBlue(sx,sy)==img2->GetBlue(sx,sy) &&
-					img1->GetAlpha(sx,sy)==img2->GetAlpha(sx,sy));
-			}
-		}
-		return (int)equal;
-	} else {
-		return 0;
-	}
-#endif
-}
-
-}
diff --git a/wxc/src/ewxw/eljimage.cpp b/wxc/src/ewxw/eljimage.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljimage.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxImage_CreateDefault)()
-{
-	return (void*) new wxImage();
-}
-
-EWXWEXPORT(void*, wxImage_CreateSized)(int width, int height)
-{
-	return (void*) new wxImage(width, height);
-}
-
-EWXWEXPORT(void*, wxImage_CreateFromData)(int width, int height, void* data)
-{
-	return (void*) new wxImage(width, height, (unsigned char*)data, true);
-}
-
-EWXWEXPORT(void*, wxImage_CreateFromFile)(void* name)
-{
-	return (void*) new wxImage((wxChar*)name);
-}
-
-EWXWEXPORT(void*, wxImage_CreateFromBitmap)(void* bitmap)
-{
-	return (void*) new wxImage(((wxBitmap*)bitmap)->ConvertToImage());
-}
-
-EWXWEXPORT(void, wxImage_ConvertToBitmap)(void* _obj, void* bitmap)
-{
-	wxBitmap tmp(*((wxImage*)_obj));
-	*((wxBitmap*)bitmap) = tmp;
-}
-	
-EWXWEXPORT(void, wxImage_Initialize)(void* _obj, int width, int height)
-{
-	((wxImage*)_obj)->Create(width, height);
-}
-	
-EWXWEXPORT(void, wxImage_InitializeFromData)(void* _obj, int width, int height, void* data)
-{
-	((wxImage*)_obj)->Create(width, height, (unsigned char*)data, true);
-}
-	
-EWXWEXPORT(void, wxImage_Destroy)(void* _obj)
-{
-	((wxImage*)_obj)->Destroy();
-}
-	
-EWXWEXPORT(void, wxImage_GetSubImage)(void* _obj, int x, int y, int w, int h, void* image)
-{
-	*((wxImage*)image) = ((wxImage*)_obj)->GetSubImage(wxRect(x, y, w, h));
-}
-	
-EWXWEXPORT(void, wxImage_Paste)(void* _obj, void* image, int x, int y)
-{
-	((wxImage*)_obj)->Paste(*((wxImage*)image), x, y);
-}
-	
-EWXWEXPORT(void, wxImage_Scale)(void* _obj, int width, int height, void* image)
-{
-	*((wxImage*)image) = ((wxImage*)_obj)->Scale(width, height);
-}
-	
-EWXWEXPORT(void, wxImage_Rescale)(void* _obj, int width, int height)
-{
-	((wxImage*)_obj)->Rescale(width, height);
-}
-	
-EWXWEXPORT(void, wxImage_Rotate)(void* _obj, double angle, int c_x, int c_y, int interpolating, void* offset_after_rotation, void* image)
-{
-	*((wxImage*)image) = ((wxImage*)_obj)->Rotate(angle, wxPoint(c_x, c_y), interpolating != 0, (wxPoint*)offset_after_rotation);
-}
-	
-EWXWEXPORT(void, wxImage_Rotate90)(void* _obj, int clockwise, void* image)
-{
-	*((wxImage*)image) = ((wxImage*)_obj)->Rotate90(clockwise != 0);
-}
-	
-EWXWEXPORT(void, wxImage_Mirror)(void* _obj, int horizontally, void* image)
-{
-	*((wxImage*)image) = ((wxImage*)_obj)->Mirror(horizontally != 0);
-}
-	
-EWXWEXPORT(void, wxImage_Replace)(void* _obj, char r1, char g1, char b1, char r2, char g2, char b2)
-{
-	((wxImage*)_obj)->Replace(r1, g1, b1, r2, g2, b2);
-}
-	
-EWXWEXPORT(void, wxImage_SetRGB)(void* _obj, int x, int y, char r, char g, char b)
-{
-	((wxImage*)_obj)->SetRGB(x, y, r, g, b);
-}
-	
-EWXWEXPORT(char, wxImage_GetRed)(void* _obj, int x, int y)
-{
-	return ((wxImage*)_obj)->GetRed(x, y);
-}
-	
-EWXWEXPORT(char, wxImage_GetGreen)(void* _obj, int x, int y)
-{
-	return ((wxImage*)_obj)->GetGreen(x, y);
-}
-	
-EWXWEXPORT(char, wxImage_GetBlue)(void* _obj, int x, int y)
-{
-	return ((wxImage*)_obj)->GetBlue(x, y);
-}
-	
-EWXWEXPORT(int, wxImage_CanRead)(void* name)
-{
-	return (int)wxImage::CanRead((wxChar*)name);
-}
-	
-EWXWEXPORT(int, wxImage_LoadFile)(void* _obj, void* name, int type)
-{
-	return (int)((wxImage*)_obj)->LoadFile((wxChar*)name, (long)type);
-}
-	
-EWXWEXPORT(int, wxImage_SaveFile)(void* _obj, void* name, int type)
-{
-	return (int)((wxImage*)_obj)->SaveFile((wxChar*)name, (long)type);
-}
-	
-EWXWEXPORT(int, wxImage_Ok)(void* _obj)
-{
-	return (int)((wxImage*)_obj)->Ok();
-}
-	
-EWXWEXPORT(int, wxImage_GetWidth)(void* _obj)
-{
-	return ((wxImage*)_obj)->GetWidth();
-}
-	
-EWXWEXPORT(int, wxImage_GetHeight)(void* _obj)
-{
-	return ((wxImage*)_obj)->GetHeight();
-}
-	
-EWXWEXPORT(void*, wxImage_GetData)(void* _obj)
-{
-	return (void*)((wxImage*)_obj)->GetData();
-}
-	
-EWXWEXPORT(void, wxImage_SetData)(void* _obj, void* data)
-{
-	((wxImage*)_obj)->SetData((unsigned char*)data);
-}
-	
-EWXWEXPORT(void, wxImage_SetDataAndSize)(void* _obj, char *data, int new_width, int new_height)
-{
-	((wxImage*)_obj)->SetData((unsigned char*)data, new_width, new_height);
-}
-	
-EWXWEXPORT(void, wxImage_SetMaskColour)(void* _obj, char r, char g, char b)
-{
-	((wxImage*)_obj)->SetMaskColour(r, g, b);
-}
-	
-EWXWEXPORT(char, wxImage_GetMaskRed)(void* _obj)
-{
-	return ((wxImage*)_obj)->GetMaskRed();
-}
-	
-EWXWEXPORT(char, wxImage_GetMaskGreen)(void* _obj)
-{
-	return ((wxImage*)_obj)->GetMaskGreen();
-}
-	
-EWXWEXPORT(char, wxImage_GetMaskBlue)(void* _obj)
-{
-	return ((wxImage*)_obj)->GetMaskBlue();
-}
-	
-EWXWEXPORT(void, wxImage_SetMask)(void* _obj, int mask)
-{
-	((wxImage*)_obj)->SetMask(mask != 0);
-}
-	
-EWXWEXPORT(int, wxImage_HasMask)(void* _obj)
-{
-	return (int)((wxImage*)_obj)->HasMask();
-}
-	
-EWXWEXPORT(int, wxImage_CountColours)(void* _obj, int stopafter)
-{
-	return ((wxImage*)_obj)->CountColours((long)stopafter);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljimagelist.cpp b/wxc/src/ewxw/eljimagelist.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljimagelist.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxImageList_Create)(int width, int height, int mask, int initialCount)
-{
-	return (void*) new wxImageList(width, height, mask != 0, initialCount);
-}
-	
-EWXWEXPORT(void, wxImageList_Delete)(void* _obj)
-{
-	delete (wxImageList*)_obj;
-}
-
-EWXWEXPORT(int, wxImageList_GetImageCount)(void* _obj)
-{
-	return ((wxImageList*)_obj)->GetImageCount();
-}
-	
-EWXWEXPORT(void, wxImageList_GetSize)(void* _obj, int index, int* width, int* height)
-{
-	bool success = ((wxImageList*)_obj)->GetSize(index, *((int*)width), *((int*)height));
-        if (!success) {
-          *width = -1;
-          *height = -1;
-        };
-}
-	
-EWXWEXPORT(int, wxImageList_AddBitmap)(void* _obj, void* bitmap, void* mask)
-{
-	return ((wxImageList*)_obj)->Add(*((wxBitmap*)bitmap), *((wxBitmap*)mask));
-}
-	
-EWXWEXPORT(int, wxImageList_AddMasked)(void* _obj, void* bitmap, void* maskColour)
-{
-	return ((wxImageList*)_obj)->Add(*((wxBitmap*)bitmap), *((wxColour*)maskColour));
-}
-	
-EWXWEXPORT(int, wxImageList_AddIcon)(void* _obj, void* icon)
-{
-	return ((wxImageList*)_obj)->Add(*((wxIcon*)icon));
-}
-	
-EWXWEXPORT(int, wxImageList_Replace)(void* _obj, int index, void* bitmap, void* mask)
-{
-#ifdef __WIN32__
-	return (int)((wxImageList*)_obj)->Replace(index, *((wxBitmap*)bitmap), *((wxBitmap*)mask));
-#else
-	return (int)((wxImageList*)_obj)->Replace(index, *((wxBitmap*)bitmap));
-#endif
-}
-	
-EWXWEXPORT(int, wxImageList_ReplaceIcon)(void* _obj, int index, void* icon)
-{
-	return (int)((wxImageList*)_obj)->Replace(index, *((wxIcon*)icon));
-}
-	
-EWXWEXPORT(int, wxImageList_Remove)(void* _obj, int index)
-{
-	return (int)((wxImageList*)_obj)->Remove(index);
-}
-	
-EWXWEXPORT(int, wxImageList_RemoveAll)(void* _obj)
-{
-	return (int)((wxImageList*)_obj)->RemoveAll();
-}
-	
-EWXWEXPORT(int, wxImageList_Draw)(void* _obj, int index, void* dc, int x, int y, int flags, int solidBackground)
-{
-	return (int)((wxImageList*)_obj)->Draw(index, *((wxDC*)dc), x, y, flags, solidBackground != 0);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljipc.cpp b/wxc/src/ewxw/eljipc.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljipc.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, ELJConnection_CreateDefault)()
-{
-	return new ELJConnection();
-}
-
-EWXWEXPORT(void*, ELJConnection_Create)(void* buffer, int size)
-{
-	return new ELJConnection((wxChar*)buffer, size);
-}
-
-EWXWEXPORT(void, ELJConnection_Delete)(void* _obj)
-{
-	delete (ELJConnection*)_obj;
-}
-
-EWXWEXPORT(int, ELJConnection_Execute)(void* _obj, void* data, int size, int format)
-{
-	return (int)((ELJConnection*)_obj)->Execute((wxChar*)data, size, (wxIPCFormat)format);
-}
-	
-EWXWEXPORT(void*, ELJConnection_Request)(void* _obj, void* item, void* size, int format)
-{
-	return (void*)((ELJConnection*)_obj)->Request((wxChar*)item, (int*)size, (wxIPCFormat)format);
-}
-	
-EWXWEXPORT(int, ELJConnection_Poke)(void* _obj, void* item, void* data, int size, int format)
-{
-	return (int)((ELJConnection*)_obj)->Poke((wxChar*)item, (wxChar*)data, size, (wxIPCFormat)format);
-}
-	
-EWXWEXPORT(int, ELJConnection_StartAdvise)(void* _obj, void* item)
-{
-	return (int)((ELJConnection*)_obj)->StartAdvise((wxChar*)item);
-}
-	
-EWXWEXPORT(int, ELJConnection_StopAdvise)(void* _obj, void* item)
-{
-	return (int)((ELJConnection*)_obj)->StopAdvise((wxChar*)item);
-}
-	
-EWXWEXPORT(int, ELJConnection_Advise)(void* _obj, void* item, void* data, int size, int format)
-{
-	return (int)((ELJConnection*)_obj)->Advise((wxChar*)item, (wxChar*)data, size, (wxIPCFormat)format);
-}
-	
-EWXWEXPORT(int, ELJConnection_Disconnect)(void* _obj)
-{
-	return (int)((ELJConnection*)_obj)->Disconnect();
-}
-	
-EWXWEXPORT(void, ELJConnection_Compress)(void* _obj, int on)
-{
-	((ELJConnection*)_obj)->Compress(on != 0);
-}
-	
-EWXWEXPORT(void, ELJConnection_SetOnAdvise)(void* _obj, void* _fnc)
-{
-	((ELJConnection*)_obj)->SetOnAdvise(_fnc);
-}
-	
-EWXWEXPORT(void, ELJConnection_SetOnExecute)(void* _obj, void* _fnc)
-{
-	((ELJConnection*)_obj)->SetOnExecute(_fnc);
-}
-	
-EWXWEXPORT(void, ELJConnection_SetOnRequest)(void* _obj, void* _fnc)
-{
-	((ELJConnection*)_obj)->SetOnRequest(_fnc);
-}
-	
-EWXWEXPORT(void, ELJConnection_SetOnPoke)(void* _obj, void* _fnc)
-{
-	((ELJConnection*)_obj)->SetOnPoke(_fnc);
-}
-	
-EWXWEXPORT(void, ELJConnection_SetOnStartAdvise)(void* _obj, void* _fnc)
-{
-	((ELJConnection*)_obj)->SetOnStartAdvise(_fnc);
-}
-	
-EWXWEXPORT(void, ELJConnection_SetOnStopAdvise)(void* _obj, void* _fnc)
-{
-	((ELJConnection*)_obj)->SetOnStopAdvise(_fnc);
-}
-
-EWXWEXPORT(void, ELJConnection_SetOnDisconnect)(void* _obj, void* _fnc)
-{
-	((ELJConnection*)_obj)->SetOnDisconnect(_fnc);
-}
-
-EWXWEXPORT(void*, ELJServer_Create)(void* _eobj, void* _cnct)
-{
-	return new ELJServer(_eobj, _cnct);
-}
-
-EWXWEXPORT(void, ELJServer_Delete)(void* _obj)
-{
-	delete (ELJServer*)_obj;
-}
-
-EWXWEXPORT(int, ELJServer_Initialize)(void* _obj, void* name)
-{
-	return ((ELJServer*)_obj)->Create((wxChar*)name);
-}
-	
-EWXWEXPORT(void*, ELJClient_Create)(void* _eobj, void* _cnct)
-{
-	return new ELJClient(_eobj, _cnct);
-}
-
-EWXWEXPORT(void, ELJClient_Delete)(void* _obj)
-{
-	delete (ELJClient*)_obj;
-}
-
-EWXWEXPORT(void, ELJClient_MakeConnection)(void* _obj, void* host, void* server, void* topic)
-{
-	((ELJClient*)_obj)->MakeConnection((wxChar*)host, (wxChar*)server, (wxChar*)topic);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljjoystick.cpp b/wxc/src/ewxw/eljjoystick.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljjoystick.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-#include "wrapper.h"
-#include "wx/joystick.h"
-
-extern "C"
-{
-
-#if wxUSE_JOYSTICK
-
-EWXWEXPORT(void*,wxJoystick_Create)(int joystick)
-{
-	return (void*)new wxJoystick(joystick);
-}
-
-EWXWEXPORT(void,wxJoystick_Delete)(void* _obj)
-{
-	delete (wxJoystick*)_obj;
-}
-
-EWXWEXPORT(void,wxJoystick_GetPosition)(void* _obj, void* _x, void* _y)
-{
-	wxPoint pt = ((wxJoystick*)_obj)->GetPosition();
-	*((int*)_x) = pt.x;
-	*((int*)_y) = pt.y;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetZPosition)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetZPosition();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetButtonState)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetButtonState();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPOVPosition)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetPOVPosition();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPOVCTSPosition)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetPOVCTSPosition();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetRudderPosition)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetRudderPosition();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetUPosition)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetUPosition();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetVPosition)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetVPosition();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetMovementThreshold)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetMovementThreshold();
-}
-	
-EWXWEXPORT(void,wxJoystick_SetMovementThreshold)(void* _obj, int threshold)
-{
-	((wxJoystick*)_obj)->SetMovementThreshold(threshold);
-}
-	
-EWXWEXPORT(int,wxJoystick_IsOk)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->IsOk();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetNumberJoysticks)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetNumberJoysticks();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetManufacturerId)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetManufacturerId();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetProductId)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetProductId();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetProductName)(void* _obj, void* _buf)
-{
-	wxString res = ((wxJoystick*)_obj)->GetProductName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int,wxJoystick_GetXMin)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetXMin();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetYMin)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetYMin();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetZMin)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetZMin();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetXMax)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetXMax();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetYMax)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetYMax();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetZMax)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetZMax();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetNumberButtons)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetNumberButtons();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetNumberAxes)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetNumberAxes();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetMaxButtons)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetMaxButtons();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetMaxAxes)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetMaxAxes();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPollingMin)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetPollingMin();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPollingMax)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetPollingMax();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetRudderMin)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetRudderMin();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetRudderMax)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetRudderMax();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetUMin)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetUMin();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetUMax)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetUMax();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetVMin)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetVMin();
-}
-	
-EWXWEXPORT(int,wxJoystick_GetVMax)(void* _obj)
-{
-	return ((wxJoystick*)_obj)->GetVMax();
-}
-	
-EWXWEXPORT(int,wxJoystick_HasRudder)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->HasRudder();
-}
-	
-EWXWEXPORT(int,wxJoystick_HasZ)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->HasZ();
-}
-	
-EWXWEXPORT(int,wxJoystick_HasU)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->HasU();
-}
-	
-EWXWEXPORT(int,wxJoystick_HasV)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->HasV();
-}
-	
-EWXWEXPORT(int,wxJoystick_HasPOV)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->HasPOV();
-}
-	
-EWXWEXPORT(int,wxJoystick_HasPOV4Dir)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->HasPOV4Dir();
-}
-	
-EWXWEXPORT(int,wxJoystick_HasPOVCTS)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->HasPOVCTS();
-}
-	
-EWXWEXPORT(int,wxJoystick_SetCapture)(void* _obj, void* win, int pollingFreq)
-{
-	return (int)((wxJoystick*)_obj)->SetCapture((wxWindow*)win, pollingFreq);
-}
-	
-EWXWEXPORT(int,wxJoystick_ReleaseCapture)(void* _obj)
-{
-	return (int)((wxJoystick*)_obj)->ReleaseCapture();
-}
-
-#else
-
-EWXWEXPORT(void*,wxJoystick_Create)(int joystick)
-{
-	return NULL;
-}
-
-EWXWEXPORT(void,wxJoystick_Delete)(void* _obj)
-{
-}
-
-EWXWEXPORT(void,wxJoystick_GetPosition)(void* _obj, void* _x, void* _y)
-{
-}
-	
-EWXWEXPORT(int,wxJoystick_GetZPosition)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetButtonState)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPOVPosition)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPOVCTSPosition)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetRudderPosition)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetUPosition)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetVPosition)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetMovementThreshold)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(void,wxJoystick_SetMovementThreshold)(void* _obj, int threshold)
-{
-}
-	
-EWXWEXPORT(int,wxJoystick_IsOk)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetNumberJoysticks)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetManufacturerId)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetProductId)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetProductName)(void* _obj, void* _buf)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetXMin)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetYMin)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetZMin)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetXMax)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetYMax)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetZMax)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetNumberButtons)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetNumberAxes)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetMaxButtons)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetMaxAxes)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPollingMin)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetPollingMax)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetRudderMin)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetRudderMax)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetUMin)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetUMax)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetVMin)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_GetVMax)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_HasRudder)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_HasZ)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_HasU)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_HasV)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_HasPOV)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_HasPOV4Dir)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_HasPOVCTS)(void* _obj)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_SetCapture)(void* _obj, void* win, int pollingFreq)
-{
-	return 0;
-}
-	
-EWXWEXPORT(int,wxJoystick_ReleaseCapture)(void* _obj)
-{
-	return 0;
-}
-
-#endif
-	
-}
diff --git a/wxc/src/ewxw/eljlayoutconstraints.cpp b/wxc/src/ewxw/eljlayoutconstraints.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljlayoutconstraints.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxLayoutConstraints_left)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->left);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_top)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->top);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_right)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->right);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_bottom)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->bottom);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_width)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->width);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_height)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->height);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_centreX)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->centreX);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_centreY)(void* _obj)
-{
-	return (void*)(&((wxLayoutConstraints*)_obj)->centreY);
-}
-	
-EWXWEXPORT(void*, wxLayoutConstraints_Create)()
-{
-	return (void*) new wxLayoutConstraints();
-}
-
-EWXWEXPORT(void, wxIndividualLayoutConstraint_Set)(void* _obj, int rel, void* otherW, int otherE, int val, int marg)
-{
-	((wxIndividualLayoutConstraint*)_obj)->Set((wxRelationship)rel, (wxWindowBase*) otherW, (wxEdge)otherE, val, marg);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_LeftOf)(void* _obj, void* sibling, int marg)
-{
-	((wxIndividualLayoutConstraint*)_obj)->LeftOf((wxWindowBase*) sibling, (wxEdge)marg);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_RightOf)(void* _obj, void* sibling, int marg)
-{
-	((wxIndividualLayoutConstraint*)_obj)->RightOf((wxWindowBase*)sibling, (wxEdge)marg);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_Above)(void* _obj, void* sibling, int marg)
-{
-	((wxIndividualLayoutConstraint*)_obj)->Above((wxWindowBase*)sibling, marg);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_Below)(void* _obj, void* sibling, int marg)
-{
-	((wxIndividualLayoutConstraint*)_obj)->Below((wxWindowBase*)sibling, marg);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_SameAs)(void* _obj, void* otherW, int edge, int marg)
-{
-	((wxIndividualLayoutConstraint*)_obj)->SameAs((wxWindowBase*)otherW, (wxEdge)edge, (wxEdge)marg);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_PercentOf)(void* _obj, void* otherW, int wh, int per)
-{
-	((wxIndividualLayoutConstraint*)_obj)->PercentOf((wxWindowBase*)otherW, (wxEdge)wh, per);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_Absolute)(void* _obj, int val)
-{
-	((wxIndividualLayoutConstraint*)_obj)->Absolute(val);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_Unconstrained)(void* _obj)
-{
-	((wxIndividualLayoutConstraint*)_obj)->Unconstrained();
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_AsIs)(void* _obj)
-{
-	((wxIndividualLayoutConstraint*)_obj)->AsIs();
-}
-	
-EWXWEXPORT(void*, wxIndividualLayoutConstraint_GetOtherWindow)(void* _obj)
-{
-	return (void*)((wxIndividualLayoutConstraint*)_obj)->GetOtherWindow();
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetMyEdge)(void* _obj)
-{
-	return (int)((wxIndividualLayoutConstraint*)_obj)->GetMyEdge();
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_SetEdge)(void* _obj, int which)
-{
-	((wxIndividualLayoutConstraint*)_obj)->SetEdge((wxEdge)which);
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_SetValue)(void* _obj, int v)
-{
-	((wxIndividualLayoutConstraint*)_obj)->SetValue(v);
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetMargin)(void* _obj)
-{
-	return ((wxIndividualLayoutConstraint*)_obj)->GetMargin();
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_SetMargin)(void* _obj, int m)
-{
-	((wxIndividualLayoutConstraint*)_obj)->SetMargin(m);
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetValue)(void* _obj)
-{
-	return ((wxIndividualLayoutConstraint*)_obj)->GetValue();
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetPercent)(void* _obj)
-{
-	return ((wxIndividualLayoutConstraint*)_obj)->GetPercent();
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetOtherEdge)(void* _obj)
-{
-	return ((wxIndividualLayoutConstraint*)_obj)->GetOtherEdge();
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetDone)(void* _obj)
-{
-	return (int)((wxIndividualLayoutConstraint*)_obj)->GetDone();
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_SetDone)(void* _obj, int d)
-{
-	((wxIndividualLayoutConstraint*)_obj)->SetDone(d != 0);
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetRelationship)(void* _obj)
-{
-	return ((wxIndividualLayoutConstraint*)_obj)->GetRelationship();
-}
-	
-EWXWEXPORT(void, wxIndividualLayoutConstraint_SetRelationship)(void* _obj, int r)
-{
-	((wxIndividualLayoutConstraint*)_obj)->SetRelationship((wxRelationship)r);
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_ResetIfWin)(void* _obj, void* otherW)
-{
-	return (int)((wxIndividualLayoutConstraint*)_obj)->ResetIfWin((wxWindowBase*)otherW);
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_SatisfyConstraint)(void* _obj, void* constraints, void* win)
-{
-	return (int)((wxIndividualLayoutConstraint*)_obj)->SatisfyConstraint((wxLayoutConstraints*)constraints, (wxWindowBase*)win);
-}
-	
-EWXWEXPORT(int, wxIndividualLayoutConstraint_GetEdge)(void* _obj, int which, void* thisWin, void* other)
-{
-	return ((wxIndividualLayoutConstraint*)_obj)->GetEdge((wxEdge)which, (wxWindowBase*) thisWin, (wxWindowBase*) other);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljlistbox.cpp b/wxc/src/ewxw/eljlistbox.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljlistbox.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxListBox_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _stl)
-{
-	wxListBox* result = new wxListBox ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), 0, NULL, _stl, wxDefaultValidator);
-
-	for (int i = 0; i < _n; i++)
-		result->Append(((wxChar**)_str)[i]);
-
-	return (void*) result;
-}
-
-EWXWEXPORT(void, wxListBox_Clear)(void* _obj)
-{
-	((wxListBox*)_obj)->Clear();
-}
-	
-EWXWEXPORT(void, wxListBox_Delete)(void* _obj, int n)
-{
-	((wxListBox*)_obj)->Delete(n);
-}
-	
-EWXWEXPORT(int, wxListBox_GetCount)(void* _obj)
-{
-	return ((wxListBox*)_obj)->GetCount();
-}
-	
-EWXWEXPORT(int, wxListBox_GetString)(void* _obj, int n, void* _buf)
-{
-	wxString result = ((wxListBox*)_obj)->GetString(n);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxListBox_SetString)(void* _obj, int n, wxChar* s)
-{
-	((wxListBox*)_obj)->SetString(n, s);
-}
-	
-EWXWEXPORT(int, wxListBox_FindString)(void* _obj, wxChar* s)
-{
-	return ((wxListBox*)_obj)->FindString(s);
-}
-	
-EWXWEXPORT(int, wxListBox_IsSelected)(void* _obj, int n)
-{
-	return (int)((wxListBox*)_obj)->IsSelected(n);
-}
-	
-EWXWEXPORT(void, wxListBox_SetSelection)(void* _obj, int n, int select)
-{
-	((wxListBox*)_obj)->SetSelection(n, select != 0);
-}
-	
-EWXWEXPORT(int, wxListBox_GetSelection)(void* _obj)
-{
-	return ((wxListBox*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(int, wxListBox_GetSelections)(void* _obj, int* aSelections, int allocated)
-{
-	wxArrayInt sel;
-	int result = ((wxListBox*)_obj)->GetSelections(sel);
-	
-	if (allocated < result) return -result;
-	
-	for (int i = 0; i < result; i++) aSelections[i] = sel[i];
-	return result;
-}
-	
-EWXWEXPORT(void, wxListBox_Append)(void* _obj, wxChar* item)
-{
-	((wxListBox*)_obj)->Append(item);
-}
-	
-EWXWEXPORT(void, wxListBox_AppendData)(void* _obj, wxChar* item, void* _data)
-{
-	((wxListBox*)_obj)->Append(item, _data);
-}
-	
-EWXWEXPORT(void, wxListBox_InsertItems)(void* _obj, void* items, int pos, int count)
-{
-	wxArrayString array;
-	
-	for (int i = 0; i< count; i++)
-		array[i] = ((wxChar**)items)[i];
-	
-	((wxListBox*)_obj)->InsertItems(array, pos);
-}
-	
-EWXWEXPORT(void, wxListBox_SetFirstItem)(void* _obj, int n)
-{
-	((wxListBox*)_obj)->SetFirstItem(n);
-}
-	
-EWXWEXPORT(void, wxListBox_SetClientData)(void* _obj, int n, void* clientData)
-{
-	((wxListBox*)_obj)->SetClientData(n, clientData);
-}
-	
-EWXWEXPORT(void*, wxListBox_GetClientData)(void* _obj, int n)
-{
-	return (void*)((wxListBox*)_obj)->GetClientData(n);
-}
-	
-EWXWEXPORT(void, wxListBox_SetStringSelection)(void* _obj, wxChar* str, int sel)
-{
-	((wxListBox*)_obj)->SetStringSelection(str, sel != 0);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljlistctrl.cpp b/wxc/src/ewxw/eljlistctrl.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljlistctrl.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-typedef int _cdecl (*EiffelSortFunc) (void* obj, int data1, int data2);
-
-typedef struct _EiffelSort
-{
-	void*          obj;
-	EiffelSortFunc fnc;
-}EiffelSort;
-
-int wxCALLBACK ListCmp (long item1, long item2, long sortData)
-{
-	return ((EiffelSort*)sortData)->fnc (((EiffelSort*)sortData)->obj, (int)item1, (int)item2);
-}
-
-EWXWEXPORT(void*, wxListItem_Create)()
-{
-	return (void*) new wxListItem();
-}
-
-EWXWEXPORT(void, wxListItem_Delete)(void* _obj)
-{
-	delete (wxListItem*)_obj;
-}
-EWXWEXPORT(void, wxListItem_Clear)(void* _obj)
-{
-	((wxListItem*)_obj)->Clear();
-}
-	
-EWXWEXPORT(void, wxListItem_ClearAttributes)(void* _obj)
-{
-	((wxListItem*)_obj)->ClearAttributes();
-}
-	
-EWXWEXPORT(void, wxListItem_SetMask)(void* _obj, int mask)
-{
-	((wxListItem*)_obj)->SetMask((long)mask);
-}
-	
-EWXWEXPORT(void, wxListItem_SetId)(void* _obj, int id)
-{
-	((wxListItem*)_obj)->SetId((long)id);
-}
-	
-EWXWEXPORT(void, wxListItem_SetColumn)(void* _obj, int col)
-{
-	((wxListItem*)_obj)->SetColumn(col);
-}
-	
-EWXWEXPORT(void, wxListItem_SetState)(void* _obj, int state)
-{
-	((wxListItem*)_obj)->SetState((long)state);
-}
-	
-EWXWEXPORT(void, wxListItem_SetStateMask)(void* _obj, int stateMask)
-{
-	((wxListItem*)_obj)->SetStateMask((long)stateMask);
-}
-	
-EWXWEXPORT(void, wxListItem_SetText)(void* _obj, void* text)
-{
-	((wxListItem*)_obj)->SetText((wxChar*)text);
-}
-	
-EWXWEXPORT(void, wxListItem_SetImage)(void* _obj, int image)
-{
-	((wxListItem*)_obj)->SetImage(image);
-}
-	
-EWXWEXPORT(void, wxListItem_SetData)(void* _obj, int data)
-{
-	((wxListItem*)_obj)->SetData((long)data);
-}
-	
-EWXWEXPORT(void, wxListItem_SetDataPointer)(void* _obj, void *data)
-{
-	((wxListItem*)_obj)->SetData(data);
-}
-	
-EWXWEXPORT(void, wxListItem_SetWidth)(void* _obj, int width)
-{
-	((wxListItem*)_obj)->SetWidth(width);
-}
-	
-EWXWEXPORT(void, wxListItem_SetAlign)(void* _obj, int align)
-{
-	((wxListItem*)_obj)->SetAlign((wxListColumnFormat)align);
-}
-	
-EWXWEXPORT(void, wxListItem_SetTextColour)(void* _obj, void* colText)
-{
-	((wxListItem*)_obj)->SetTextColour(*((wxColour*)colText));
-}
-	
-EWXWEXPORT(void, wxListItem_SetBackgroundColour)(void* _obj, void* colBack)
-{
-	((wxListItem*)_obj)->SetBackgroundColour(*((wxColour*)colBack));
-}
-	
-EWXWEXPORT(void, wxListItem_SetFont)(void* _obj, void* font)
-{
-	((wxListItem*)_obj)->SetFont(*((wxFont*)font));
-}
-	
-EWXWEXPORT(int, wxListItem_GetMask)(void* _obj)
-{
-	return (int)((wxListItem*)_obj)->GetMask();
-}
-	
-EWXWEXPORT(int, wxListItem_GetId)(void* _obj)
-{
-	return (int)((wxListItem*)_obj)->GetId();
-}
-	
-EWXWEXPORT(int, wxListItem_GetColumn)(void* _obj)
-{
-	return ((wxListItem*)_obj)->GetColumn();
-}
-	
-EWXWEXPORT(int, wxListItem_GetState)(void* _obj)
-{
-	return (int)((wxListItem*)_obj)->GetState();
-}
-	
-EWXWEXPORT(int, wxListItem_GetText)(void* _obj, void* _buf)
-{
-	wxString result = ((wxListItem*)_obj)->GetText();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxListItem_GetImage)(void* _obj)
-{
-	return ((wxListItem*)_obj)->GetImage();
-}
-	
-EWXWEXPORT(int, wxListItem_GetData)(void* _obj)
-{
-	return (int)((wxListItem*)_obj)->GetData();
-}
-	
-EWXWEXPORT(int, wxListItem_GetWidth)(void* _obj)
-{
-	return ((wxListItem*)_obj)->GetWidth();
-}
-	
-EWXWEXPORT(int, wxListItem_GetAlign)(void* _obj)
-{
-	return (int)((wxListItem*)_obj)->GetAlign();
-}
-	
-EWXWEXPORT(void*, wxListItem_GetAttributes)(void* _obj)
-{
-	return (void*)((wxListItem*)_obj)->GetAttributes();
-}
-	
-EWXWEXPORT(int, wxListItem_HasAttributes)(void* _obj)
-{
-	return (int)((wxListItem*)_obj)->HasAttributes();
-}
-	
-EWXWEXPORT(void, wxListItem_GetTextColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxListItem*)_obj)->GetTextColour();
-}
-	
-EWXWEXPORT(void, wxListItem_GetBackgroundColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxListItem*)_obj)->GetBackgroundColour();
-}
-	
-EWXWEXPORT(void, wxListItem_GetFont)(void* _obj, void* _ref)
-{
-	*((wxFont*)_ref) = ((wxListItem*)_obj)->GetFont();
-}
-	
-EWXWEXPORT(void*, wxListCtrl_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxListCtrl ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(int, wxListCtrl_SetForegroundColour)(void* _obj, void* col)
-{
-	return (int)((wxListCtrl*)_obj)->SetForegroundColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetBackgroundColour)(void* _obj, void* col)
-{
-	return (int)((wxListCtrl*)_obj)->SetBackgroundColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetColumn)(void* _obj, int col, void* item)
-{
-	return (int)((wxListCtrl*)_obj)->GetColumn(col, *((wxListItem*)item));
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetColumn)(void* _obj, int col, void* item)
-{
-	return (int)((wxListCtrl*)_obj)->SetColumn(col, *((wxListItem*)item));
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetColumnWidth)(void* _obj, int col)
-{
-	return ((wxListCtrl*)_obj)->GetColumnWidth(col);
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetColumnWidth)(void* _obj, int col, int width)
-{
-	return (int)((wxListCtrl*)_obj)->SetColumnWidth(col, width);
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetCountPerPage)(void* _obj)
-{
-	return ((wxListCtrl*)_obj)->GetCountPerPage();
-}
-	
-EWXWEXPORT(void*, wxListCtrl_GetEditControl)(void* _obj)
-{
-#ifdef __WIN32__
-	return (void*)((wxListCtrl*)_obj)->GetEditControl();
-#else
-	return NULL;
-#endif
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetItem)(void* _obj, void* info)
-{
-	return (int)((wxListCtrl*)_obj)->GetItem(*((wxListItem*)info));
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetItemFromInfo)(void* _obj, void* info)
-{
-	return (int)((wxListCtrl*)_obj)->SetItem(*((wxListItem*)info));
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetItem)(void* _obj, int index, int col, void* label, int imageId)
-{
-	return (int)((wxListCtrl*)_obj)->SetItem((long)index, col, (wxChar*)label, imageId);
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetItemState)(void* _obj, int item, int stateMask)
-{
-	return ((wxListCtrl*)_obj)->GetItemState((long)item, (long)stateMask);
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetItemState)(void* _obj, int item, int state, int stateMask)
-{
-	return (int)((wxListCtrl*)_obj)->SetItemState((long)item, (long)state, (long)stateMask);
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetItemImage)(void* _obj, int item, int image, int selImage)
-{
-	return (int)((wxListCtrl*)_obj)->SetItemImage((long)item, image, selImage);
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetItemText)(void* _obj, int item, void* buf)
-{
-	wxString res = ((wxListCtrl*)_obj)->GetItemText((long)item);
-        return copyStrToBuf(buf, res);
-}
-	
-EWXWEXPORT(void, wxListCtrl_SetItemText)(void* _obj, int item, void* str)
-{
-	((wxListCtrl*)_obj)->SetItemText((long)item, (wxChar*)str);
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetItemData)(void* _obj, int item)
-{
-	return (int)((wxListCtrl*)_obj)->GetItemData((long)item);
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetItemData)(void* _obj, int item, int data)
-{
-	return (int)((wxListCtrl*)_obj)->SetItemData((long)item, (long)data);
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetItemRect)(void* _obj, int item, int code, void* x, void* y, void* w, void* h)
-{
-	wxRect rct;
-	int result = (int)((wxListCtrl*)_obj)->GetItemRect((long)item, rct, code);
-	if (result)
-	{
-		*((int*)x) = rct.x;
-		*((int*)y) = rct.y;
-		*((int*)w) = rct.width;
-		*((int*)h) = rct.height;
-	} 
-	return result;
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetItemPosition)(void* _obj, int item, void* x, void* y)
-{
-	wxPoint pos;
-	int result = (int)((wxListCtrl*)_obj)->GetItemPosition((long)item, pos);
-	*((int*)x) = pos.x;
-	*((int*)y) = pos.y;
-
-	return result;
-}
-	
-EWXWEXPORT(int, wxListCtrl_SetItemPosition)(void* _obj, int item, int x, int y)
-{
-	wxPoint pos;
-	int result = (int)((wxListCtrl*)_obj)->SetItemPosition((long)item, pos);
-	*((int*)x) = pos.x;
-	*((int*)y) = pos.y;
-
-	return result;
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetItemCount)(void* _obj)
-{
-	return ((wxListCtrl*)_obj)->GetItemCount();
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetColumnCount)(void* _obj)
-{
-	return ((wxListCtrl*)_obj)->GetColumnCount();
-}
-	
-EWXWEXPORT(void, wxListCtrl_GetItemSpacing)(void* _obj, int isSmall, int* h, int* w)
-{
-#if (wxVERSION_NUMBER <= 2600)
-	int x = ((wxListCtrl*)_obj)->GetItemSpacing(isSmall != 0);
-        *h = x;
-        *w = x;
-#else
-	wxSize res = ((wxListCtrl*)_obj)->GetItemSpacing();
-	*h = res.GetHeight();
-	*w = res.GetWidth();
-#endif
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetSelectedItemCount)(void* _obj)
-{
-	return ((wxListCtrl*)_obj)->GetSelectedItemCount();
-}
-	
-EWXWEXPORT(void, wxListCtrl_GetTextColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxListCtrl*)_obj)->GetTextColour();
-}
-	
-EWXWEXPORT(void, wxListCtrl_SetTextColour)(void* _obj, void* col)
-{
-	((wxListCtrl*)_obj)->SetTextColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetTopItem)(void* _obj)
-{
-	return (int)((wxListCtrl*)_obj)->GetTopItem();
-}
-	
-EWXWEXPORT(void, wxListCtrl_SetSingleStyle)(void* _obj, int style, int add)
-{
-	((wxListCtrl*)_obj)->SetSingleStyle((long)style, add != 0);
-}
-	
-EWXWEXPORT(void, wxListCtrl_SetWindowStyleFlag)(void* _obj, int style)
-{
-	((wxListCtrl*)_obj)->SetWindowStyleFlag((long)style);
-}
-	
-EWXWEXPORT(int, wxListCtrl_GetNextItem)(void* _obj, int item, int geometry, int state)
-{
-	return ((wxListCtrl*)_obj)->GetNextItem((long)item, geometry, state);
-}
-	
-EWXWEXPORT(void*, wxListCtrl_GetImageList)(void* _obj, int which)
-{
-	return (void*)((wxListCtrl*)_obj)->GetImageList(which);
-}
-	
-EWXWEXPORT(void, wxListCtrl_SetImageList)(void* _obj, void* imageList, int which)
-{
-	((wxListCtrl*)_obj)->SetImageList((wxImageList*)imageList, which);
-}
-	
-EWXWEXPORT(int, wxListCtrl_Arrange)(void* _obj, int flag)
-{
-	return (int)((wxListCtrl*)_obj)->Arrange(flag);
-}
-	
-EWXWEXPORT(int, wxListCtrl_DeleteItem)(void* _obj, int item)
-{
-	return (int)((wxListCtrl*)_obj)->DeleteItem((long)item);
-}
-	
-EWXWEXPORT(int, wxListCtrl_DeleteAllItems)(void* _obj)
-{
-	return (int)((wxListCtrl*)_obj)->DeleteAllItems();
-}
-	
-EWXWEXPORT(int, wxListCtrl_DeleteColumn)(void* _obj, int col)
-{
-	return (int)((wxListCtrl*)_obj)->DeleteColumn(col);
-}
-	
-EWXWEXPORT(int, wxListCtrl_DeleteAllColumns)(void* _obj)
-{
-	return (int)((wxListCtrl*)_obj)->DeleteAllColumns();
-}
-	
-EWXWEXPORT(void, wxListCtrl_ClearAll)(void* _obj)
-{
-	((wxListCtrl*)_obj)->ClearAll();
-}
-	
-EWXWEXPORT(void, wxListCtrl_EditLabel)(void* _obj, int item)
-{
-	((wxListCtrl*)_obj)->EditLabel((long)item);
-}
-	
-EWXWEXPORT(int, wxListCtrl_EndEditLabel)(void* _obj, int cancel)
-{
-#ifdef __WIN32__
-	return (int)((wxListCtrl*)_obj)->EndEditLabel(cancel != 0);
-#else
-	return 0;
-#endif
-}
-	
-EWXWEXPORT(int, wxListCtrl_EnsureVisible)(void* _obj, int item)
-{
-	return (int)((wxListCtrl*)_obj)->EnsureVisible((long)item);
-}
-	
-EWXWEXPORT(int, wxListCtrl_FindItem)(void* _obj, int start, void* str, int partial)
-{
-	return (long)((wxListCtrl*)_obj)->FindItem((long)start, (wxChar*) str, partial != 0);
-}
-	
-EWXWEXPORT(int, wxListCtrl_FindItemByData)(void* _obj, int start, int data)
-{
-	return (int)((wxListCtrl*)_obj)->FindItem((long)start, (long)data);
-}
-	
-EWXWEXPORT(int, wxListCtrl_FindItemByPosition)(void* _obj, int start, int x, int y, int direction)
-{
-	return (int)((wxListCtrl*)_obj)->FindItem((long)start, wxPoint(x, y), direction);
-}
-	
-EWXWEXPORT(int, wxListCtrl_HitTest)(void* _obj, int x, int y, void* flags)
-{
-	return ((wxListCtrl*)_obj)->HitTest(wxPoint(x, y), *((int*)flags));
-}
-	
-EWXWEXPORT(int, wxListCtrl_InsertItem)(void* _obj, void* info)
-{
-	return (int)((wxListCtrl*)_obj)->InsertItem(*((wxListItem*)info));
-}
-	
-EWXWEXPORT(int, wxListCtrl_InsertItemWithData)(void* _obj, int index, void* label)
-{
-	return (int)((wxListCtrl*)_obj)->InsertItem((long)index, (wxChar*)label);
-}
-	
-EWXWEXPORT(int, wxListCtrl_InsertItemWithImage)(void* _obj, int index, int imageIndex)
-{
-	return (int)((wxListCtrl*)_obj)->InsertItem((long)index, imageIndex);
-}
-	
-EWXWEXPORT(int, wxListCtrl_InsertItemWithLabel)(void* _obj, int index, void* label, int imageIndex)
-{
-	return (int)((wxListCtrl*)_obj)->InsertItem((long)index, (wxChar*)label, imageIndex);
-}
-	
-EWXWEXPORT(int, wxListCtrl_InsertColumnFromInfo)(void* _obj, int col, void* info)
-{
-	return (int)((wxListCtrl*)_obj)->InsertColumn((long)col, *((wxListItem*)info));
-}
-	
-EWXWEXPORT(int, wxListCtrl_InsertColumn)(void* _obj, int col, void* heading, int format, int width)
-{
-	return (int)((wxListCtrl*)_obj)->InsertColumn((long)col, (wxChar*) heading, format, width);
-}
-	
-EWXWEXPORT(int, wxListCtrl_ScrollList)(void* _obj, int dx, int dy)
-{
-	return (int)((wxListCtrl*)_obj)->ScrollList(dx, dy);
-}
-	
-EWXWEXPORT(int, wxListCtrl_SortItems)(void* _obj, void* fnc, void* obj)
-{
-	EiffelSort srt = {obj, (EiffelSortFunc)fnc};
-	return (int)((wxListCtrl*)_obj)->SortItems(ListCmp, (long)&srt);
-}
-	
-EWXWEXPORT(void, wxListCtrl_UpdateStyle)(void* _obj)
-{
-#ifdef __WIN32__
-	((wxListCtrl*)_obj)->UpdateStyle();
-#endif
-}
-	
-}
diff --git a/wxc/src/ewxw/eljlocale.cpp b/wxc/src/ewxw/eljlocale.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljlocale.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "wrapper.h"
-#include "wx/intl.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxLocale_Create)(int _lang, int _flags)
-{
-	return (void*)new wxLocale(_lang, _flags);
-}
-
-EWXWEXPORT(void,wxLocale_Delete)(void* _obj)
-{
-	delete (wxLocale*)_obj;
-}
-
-EWXWEXPORT(int,wxLocale_IsOk)(void* _obj)
-{
-	return (int)((wxLocale*)_obj)->IsOk();
-}
-	
-EWXWEXPORT(void*,wxLocale_GetLocale)(void* _obj)
-{
-	return (void*)((wxLocale*)_obj)->GetLocale();
-}
-	
-EWXWEXPORT(void,wxLocale_AddCatalogLookupPathPrefix)(void* _obj, void* prefix)
-{
-	((wxLocale*)_obj)->AddCatalogLookupPathPrefix((const wxChar*)prefix);
-}
-	
-EWXWEXPORT(int,wxLocale_AddCatalog)(void* _obj, void* szDomain)
-{
-	return (int)((wxLocale*)_obj)->AddCatalog((const wxChar*)szDomain);
-}
-	
-EWXWEXPORT(int,wxLocale_IsLoaded)(void* _obj, void* szDomain)
-{
-	return (int)((wxLocale*)_obj)->IsLoaded((const wxChar*)szDomain);
-}
-	
-EWXWEXPORT(void*,wxLocale_GetString)(void* _obj, void* szOrigString, void* szDomain)
-{
-	return (void*)((wxLocale*)_obj)->GetString((const wxChar*)szOrigString, (const wxChar*)szDomain);
-}
-	
-EWXWEXPORT(int,wxLocale_GetName)(void* _obj, void* _ref)
-{
-	wxString res = ((wxLocale*)_obj)->GetName();
-	return copyStrToBuf(_ref, res);
-}
-	
-
-EWXWEXPORT(void*,wxGetELJLocale)()
-{
-	return (void*)wxGetLocale();
-}
-	
-EWXWEXPORT(void*,wxGetELJTranslation)(void* sz)
-{
-	return (void*)wxGetTranslation((const wxChar*)sz);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljlog.cpp b/wxc/src/ewxw/eljlog.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljlog.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-#include "wrapper.h"
-#include "wx/log.h"
-
-extern "C"
-{
-
-typedef void (*TLogFunc) (void*, int, void*, int);
-
-}
-
-class ELJLog : public wxLog
-{
-	private:
-		TLogFunc func;
-		void*    EiffelObject;
-		
-    protected:
-		virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t)
-		{
-			func (EiffelObject, (int)level, (void*)szString, (int)t);
-		}
-
-	public:
-		ELJLog (void* _obj, void* _fnc) : wxLog()
-		{
-			func = (TLogFunc)_fnc;
-			EiffelObject = _obj;
-		}
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*,ELJLog_Create)(void* _obj, void* _fnc)
-{
-	return (void*) new ELJLog(_obj, _fnc);
-}
-
-EWXWEXPORT(void,ELJLog_Delete)(void* _obj)
-{
-	delete (ELJLog*)_obj;
-}
-
-EWXWEXPORT(int,ELJLog_IsEnabled)(void* _obj)
-{
-	return (int)((ELJLog*)_obj)->IsEnabled();
-}
-	
-EWXWEXPORT(int,ELJLog_EnableLogging)(void* _obj, int doIt)
-{
-	return (int)((ELJLog*)_obj)->EnableLogging(doIt != 0);
-}
-	
-EWXWEXPORT(void,ELJLog_OnLog)(void* _obj, int level, void* szString, int t)
-{
-	((ELJLog*)_obj)->OnLog((wxLogLevel)level, (const wxChar*)szString, (time_t)t);
-}
-	
-EWXWEXPORT(void,ELJLog_Flush)(void* _obj)
-{
-	((ELJLog*)_obj)->Flush();
-}
-	
-EWXWEXPORT(int,ELJLog_HasPendingMessages)(void* _obj)
-{
-	return (int)((ELJLog*)_obj)->HasPendingMessages();
-}
-	
-EWXWEXPORT(void,ELJLog_FlushActive)(void* _obj)
-{
-	((ELJLog*)_obj)->FlushActive();
-}
-	
-EWXWEXPORT(void*,ELJLog_GetActiveTarget)()
-{
-	return (void*)ELJLog::GetActiveTarget();
-}
-	
-EWXWEXPORT(void*,ELJLog_SetActiveTarget)(void* pLogger)
-{
-	return (void*)ELJLog::SetActiveTarget((wxLog*)pLogger);
-}
-	
-EWXWEXPORT(void,ELJLog_Suspend)(void* _obj)
-{
-	((ELJLog*)_obj)->Suspend();
-}
-	
-EWXWEXPORT(void,ELJLog_Resume)(void* _obj)
-{
-	((ELJLog*)_obj)->Resume();
-}
-	
-EWXWEXPORT(void,ELJLog_SetVerbose)(void* _obj, int bVerbose)
-{
-	((ELJLog*)_obj)->SetVerbose(bVerbose != 0);
-}
-	
-EWXWEXPORT(void,ELJLog_DontCreateOnDemand)(void* _obj)
-{
-	((ELJLog*)_obj)->DontCreateOnDemand();
-}
-	
-EWXWEXPORT(void,ELJLog_SetTraceMask)(void* _obj, int ulMask)
-{
-	((ELJLog*)_obj)->SetTraceMask((wxTraceMask)ulMask);
-}
-	
-EWXWEXPORT(void,ELJLog_AddTraceMask)(void* _obj, void* str)
-{
-	((ELJLog*)_obj)->AddTraceMask((const wxChar*)str);
-}
-	
-EWXWEXPORT(void,ELJLog_RemoveTraceMask)(void* _obj, void* str)
-{
-	((ELJLog*)_obj)->RemoveTraceMask((const wxChar*)str);
-}
-	
-EWXWEXPORT(void,ELJLog_SetTimestamp)(void* _obj, void* ts)
-{
-	((ELJLog*)_obj)->SetTimestamp((const wxChar*)ts);
-}
-	
-EWXWEXPORT(int,ELJLog_GetVerbose)(void* _obj)
-{
-	return (int)((ELJLog*)_obj)->GetVerbose();
-}
-	
-EWXWEXPORT(int,ELJLog_GetTraceMask)(void* _obj)
-{
-	return (int)((ELJLog*)_obj)->GetTraceMask();
-}
-	
-EWXWEXPORT(int,ELJLog_IsAllowedTraceMask)(void* _obj, void* mask)
-{
-	return (int)((ELJLog*)_obj)->IsAllowedTraceMask((const wxChar*)mask);
-}
-	
-EWXWEXPORT(void*,ELJLog_GetTimestamp)(void* _obj)
-{
-	return (void*)((ELJLog*)_obj)->GetTimestamp();
-}
-
-EWXWEXPORT(int,ELJSysErrorCode)()
-{
-	return (int)wxSysErrorCode();
-}
-
-EWXWEXPORT(void*,ELJSysErrorMsg)(int nErrCode)
-{
-	return (void*)wxSysErrorMsg((unsigned long)nErrCode);
-}
-
-EWXWEXPORT(void,LogErrorMsg)(void* _msg)
-{
-	wxLogError((wxChar*)_msg);
-}
-
-EWXWEXPORT(void,LogFatalErrorMsg)(void* _msg)
-{
-	wxLogFatalError((wxChar*)_msg);
-}
-
-EWXWEXPORT(void,LogWarningMsg)(void* _msg)
-{
-	wxLogWarning((wxChar*)_msg);
-}
-
-EWXWEXPORT(void,LogMessageMsg)(void* _msg)
-{
-	wxLogMessage((wxChar*)_msg);
-}
-
-
-EWXWEXPORT(void*,wxLogChain_Create)(void* logger)
-{
-	return new wxLogChain ((wxLog*)logger);
-}
-
-EWXWEXPORT(void,wxLogChain_Delete)(void* _obj)
-{
-	delete (wxLogChain*)_obj;
-}
-
-EWXWEXPORT(void,wxLogChain_SetLog)(void* _obj, void* logger)
-{
-	((wxLogChain*)_obj)->SetLog((wxLog*)logger);
-}
-	
-EWXWEXPORT(void,wxLogChain_PassMessages)(void* _obj, int bDoPass)
-{
-	((wxLogChain*)_obj)->PassMessages(bDoPass != 0);
-}
-	
-EWXWEXPORT(int,wxLogChain_IsPassingMessages)(void* _obj)
-{
-	return (int)((wxLogChain*)_obj)->IsPassingMessages();
-}
-	
-EWXWEXPORT(void*,wxLogChain_GetOldLog)(void* _obj)
-{
-	return (void*)((wxLogChain*)_obj)->GetOldLog();
-}
-	
-
-}
diff --git a/wxc/src/ewxw/eljmask.cpp b/wxc/src/ewxw/eljmask.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljmask.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxMask_Create) (void* bitmap)
-{
-	return (void*) new wxMask (*(wxBitmap*)bitmap);
-}
-
-EWXWEXPORT(void*, wxMask_CreateColoured) (void* bitmap, void* colour)
-{
-	return (void*) new wxMask (*(wxBitmap*)bitmap, *(wxColour*)colour);
-}
-
-}
diff --git a/wxc/src/ewxw/eljmdi.cpp b/wxc/src/ewxw/eljmdi.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljmdi.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxMDIParentFrame_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxMDIParentFrame ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void*, wxMDIParentFrame_GetActiveChild)(void* _obj)
-{
-	return (void*)((wxMDIParentFrame*)_obj)->GetActiveChild();
-}
-	
-EWXWEXPORT(void*, wxMDIParentFrame_GetClientWindow)(void* _obj)
-{
-	return (void*)((wxMDIParentFrame*)_obj)->GetClientWindow();
-}
-	
-EWXWEXPORT(void*, wxMDIParentFrame_OnCreateClient)(void* _obj)
-{
-	return (void*)((wxMDIParentFrame*)_obj)->OnCreateClient();
-}
-	
-EWXWEXPORT(void*, wxMDIParentFrame_GetWindowMenu)(void* _obj)
-{
-#ifdef __WIN32__
-	return (void*)((wxMDIParentFrame*)_obj)->GetWindowMenu();
-#else
-	return NULL;
-#endif
-}
-	
-EWXWEXPORT(void, wxMDIParentFrame_SetWindowMenu)(void* _obj, void* menu)
-{
-#ifdef __WIN32__
-	((wxMDIParentFrame*)_obj)->SetWindowMenu((wxMenu*) menu);
-#endif
-}
-	
-EWXWEXPORT(void, wxMDIParentFrame_Cascade)(void* _obj)
-{
-	((wxMDIParentFrame*)_obj)->Cascade();
-}
-	
-EWXWEXPORT(void, wxMDIParentFrame_Tile)(void* _obj)
-{
-	((wxMDIParentFrame*)_obj)->Tile();
-}
-	
-EWXWEXPORT(void, wxMDIParentFrame_ArrangeIcons)(void* _obj)
-{
-	((wxMDIParentFrame*)_obj)->ArrangeIcons();
-}
-	
-EWXWEXPORT(void, wxMDIParentFrame_ActivateNext)(void* _obj)
-{
-	((wxMDIParentFrame*)_obj)->ActivateNext();
-}
-	
-EWXWEXPORT(void, wxMDIParentFrame_ActivatePrevious)(void* _obj)
-{
-	((wxMDIParentFrame*)_obj)->ActivatePrevious();
-}
-	
-EWXWEXPORT(void*, wxMDIChildFrame_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxMDIChildFrame ((wxMDIParentFrame *)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void, wxMDIChildFrame_Activate)(void* _obj)
-{
-	((wxMDIChildFrame*)_obj)->Activate();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljmenu.cpp b/wxc/src/ewxw/eljmenu.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljmenu.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxMenu_Create)(wxChar* title, long style)
-{
-	return (void*) new wxMenu(title, style);
-}
-	
-EWXWEXPORT(void, wxMenu_DeletePointer)(void* _obj)
-{
-	delete (wxMenu*)_obj;
-}
-	
-EWXWEXPORT(void, wxMenu_AppendSeparator)(void* _obj)
-{
-	((wxMenu*)_obj)->AppendSeparator();
-}
-	
-EWXWEXPORT(void, wxMenu_Append)(void* _obj, int id, wxChar* text, wxChar* help, int isCheckable)
-{
-	((wxMenu*)_obj)->Append(id, text, help, isCheckable != 0);
-}
-	
-EWXWEXPORT(void, wxMenu_AppendSub)(void* _obj, int id, wxChar* text, void* submenu, wxChar* help)
-{
-	((wxMenu*)_obj)->Append(id, text, (wxMenu*) submenu, help);
-}
-	
-EWXWEXPORT(void, wxMenu_AppendItem)(void* _obj, void* _itm)
-{
-	((wxMenu*)_obj)->Append((wxMenuItem*)_itm);
-}
-	
-EWXWEXPORT(void, wxMenu_Break)(void* _obj)
-{
-	((wxMenu*)_obj)->Break();
-}
-	
-EWXWEXPORT(void, wxMenu_Insert)(void* _obj, size_t pos, int id, wxChar* text, wxChar* help, int isCheckable)
-{
-	((wxMenu*)_obj)->Insert(pos, id, text, help, isCheckable != 0);
-}
-	
-EWXWEXPORT(void, wxMenu_InsertSub)(void* _obj, size_t pos, int id, wxChar* text, void* submenu, wxChar* help)
-{
-	((wxMenu*)_obj)->Insert(pos, id, text, (wxMenu*) submenu, help);
-}
-	
-EWXWEXPORT(void, wxMenu_InsertItem)(void* _obj, int pos, void* _itm)
-{
-	((wxMenu*)_obj)->Insert((size_t)pos, (wxMenuItem*)_itm);
-}
-	
-EWXWEXPORT(void, wxMenu_Prepend)(void* _obj, int id, wxChar* text, wxChar* help, int isCheckable)
-{
-	((wxMenu*)_obj)->Prepend(id, text, help, isCheckable!= 0);
-}
-	
-EWXWEXPORT(void, wxMenu_PrependSub)(void* _obj, int id, wxChar* text, void* submenu, wxChar* help)
-{
-	((wxMenu*)_obj)->Prepend(id, text, (wxMenu*) submenu, help);
-}
-	
-EWXWEXPORT(void, wxMenu_PrependItem)(void* _obj, void* _itm)
-{
-	((wxMenu*)_obj)->Prepend((wxMenuItem*)_itm);
-}
-	
-EWXWEXPORT(void, wxMenu_RemoveByItem)(void* _obj, void* item)
-{
-	((wxMenu*)_obj)->Remove((wxMenuItem*) item);
-}
-	
-EWXWEXPORT(void, wxMenu_RemoveById)(void* _obj, int id, void* _itm)
-{
-	*((void**)_itm) = (void*)((wxMenu*)_obj)->Remove(id);
-}
-	
-EWXWEXPORT(void, wxMenu_DeleteById)(void* _obj, int id)
-{
-	((wxMenu*)_obj)->Delete(id);
-}
-	
-EWXWEXPORT(void, wxMenu_DeleteByItem)(void* _obj, void* _itm)
-{
-	((wxMenu*)_obj)->Delete((wxMenuItem*)_itm);
-}
-	
-EWXWEXPORT(void, wxMenu_DestroyById)(void* _obj, int id)
-{
-	((wxMenu*)_obj)->Destroy(id);
-}
-	
-EWXWEXPORT(void, wxMenu_DestroyByItem)(void* _obj, void* _itm)
-{
-	((wxMenu*)_obj)->Destroy((wxMenuItem*)_itm);
-}
-	
-EWXWEXPORT(size_t, wxMenu_GetMenuItemCount)(void* _obj)
-{
-	return ((wxMenu*)_obj)->GetMenuItemCount();
-}
-	
-EWXWEXPORT(int, wxMenu_GetMenuItems)(void* _obj, void* _lst)
-{
-	if (_lst)
-	{
-		for (unsigned int i = 0; i < ((wxMenu*)_obj)->GetMenuItems().GetCount(); i++)
-			((void**)_lst)[i] = ((wxMenu*)_obj)->GetMenuItems().Item(i)->GetData();
-	}
-	return ((wxMenu*)_obj)->GetMenuItems().GetCount();
-}
-	
-EWXWEXPORT(int, wxMenu_FindItemByLabel)(void* _obj, wxChar* itemString)
-{
-	return ((wxMenu*)_obj)->FindItem(itemString);
-}
-	
-EWXWEXPORT(void*, wxMenu_FindItem)(void* _obj, int id, void* menu)
-{
-	return (void*)((wxMenu*)_obj)->FindItem(id, (wxMenu**) menu);
-}
-	
-EWXWEXPORT(void, wxMenu_Enable)(void* _obj, int id, int enable)
-{
-	((wxMenu*)_obj)->Enable(id, enable != 0);
-}
-	
-EWXWEXPORT(int, wxMenu_IsEnabled)(void* _obj, int id)
-{
-	return (int)((wxMenu*)_obj)->IsEnabled(id);
-}
-	
-EWXWEXPORT(void, wxMenu_Check)(void* _obj, int id, int check)
-{
-	((wxMenu*)_obj)->Check(id, check != 0);
-}
-	
-EWXWEXPORT(int, wxMenu_IsChecked)(void* _obj, int id)
-{
-	return (int)((wxMenu*)_obj)->IsChecked(id);
-}
-	
-EWXWEXPORT(void, wxMenu_SetLabel)(void* _obj, int id, wxChar* label)
-{
-	((wxMenu*)_obj)->SetLabel(id, label);
-}
-	
-EWXWEXPORT(int, wxMenu_GetLabel)(void* _obj, int id, void* _buf)
-{
-	wxString result = ((wxMenu*)_obj)->GetLabel(id);
-	return copyStrToBuf(_buf, result); 
-}
-	
-EWXWEXPORT(void, wxMenu_SetHelpString)(void* _obj, int id, wxChar* helpString)
-{
-	((wxMenu*)_obj)->SetHelpString(id, helpString);
-}
-	
-EWXWEXPORT(int, wxMenu_GetHelpString)(void* _obj, int id, void* _buf)
-{
-	wxString result = ((wxMenu*)_obj)->GetHelpString(id);
-	return copyStrToBuf(_buf, result); 
-}
-	
-EWXWEXPORT(void, wxMenu_SetTitle)(void* _obj, wxChar* title)
-{
-	((wxMenu*)_obj)->SetTitle(title);
-}
-	
-EWXWEXPORT(int, wxMenu_GetTitle)(void* _obj, void* _buf)
-{
-	wxString result = ((wxMenu*)_obj)->GetTitle();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxMenu_SetClientData)(void* _obj, void* clientData)
-{
-	((wxMenu*)_obj)->SetClientData(clientData);
-}
-	
-EWXWEXPORT(void*, wxMenu_GetClientData)(void* _obj)
-{
-	return (void*)((wxMenu*)_obj)->GetClientData();
-}
-	
-EWXWEXPORT(void, wxMenu_SetEventHandler)(void* _obj, void* handler)
-{
-	((wxMenu*)_obj)->SetEventHandler((wxEvtHandler*) handler);
-}
-	
-EWXWEXPORT(void, wxMenu_SetInvokingWindow)(void* _obj, void* win)
-{
-	((wxMenu*)_obj)->SetInvokingWindow((wxWindow*) win);
-}
-	
-EWXWEXPORT(void*, wxMenu_GetInvokingWindow)(void* _obj)
-{
-	return (void*)((wxMenu*)_obj)->GetInvokingWindow();
-}
-	
-EWXWEXPORT(int, wxMenu_GetStyle)(void* _obj)
-{
-	return ((wxMenu*)_obj)->GetStyle();
-}
-	
-EWXWEXPORT(void, wxMenu_UpdateUI)(void* _obj, void* source)
-{
-	((wxMenu*)_obj)->UpdateUI((wxEvtHandler*) source);
-}
-	
-EWXWEXPORT(int, wxMenu_IsAttached)(void* _obj)
-{
-	return (int)((wxMenu*)_obj)->IsAttached();
-}
-	
-EWXWEXPORT(void, wxMenu_SetParent)(void* _obj, void* parent)
-{
-	((wxMenu*)_obj)->SetParent((wxMenu*) parent);
-}
-	
-EWXWEXPORT(void*, wxMenu_GetParent)(void* _obj)
-{
-	return (void*)((wxMenu*)_obj)->GetParent();
-}
-	
-
-EWXWEXPORT(void*, wxMenuItem_Create)()
-{
-	return (void*) new wxMenuItem();
-}
-	
-EWXWEXPORT(void, wxMenuItem_Delete)(void* _obj)
-{
-	delete (wxMenuItem*)_obj;
-}
-
-EWXWEXPORT(void*, wxMenuItem_GetMenu)(void* _obj)
-{
-	return (void*)((wxMenuItem*)_obj)->GetMenu();
-}
-	
-EWXWEXPORT(void, wxMenuItem_SetId)(void* _obj, int id)
-{
-	((wxMenuItem*)_obj)->SetId(id);
-}
-	
-EWXWEXPORT(int, wxMenuItem_GetId)(void* _obj)
-{
-	return ((wxMenuItem*)_obj)->GetId();
-}
-	
-EWXWEXPORT(int, wxMenuItem_IsSeparator)(void* _obj)
-{
-	return (int)((wxMenuItem*)_obj)->IsSeparator();
-}
-	
-EWXWEXPORT(void, wxMenuItem_SetText)(void* _obj, void* str)
-{
-	((wxMenuItem*)_obj)->SetText((wxChar*) str);
-}
-	
-EWXWEXPORT(int, wxMenuItem_GetLabel)(void* _obj, void* _buf)
-{
-	wxString result = ((wxMenuItem*)_obj)->GetLabel();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxMenuItem_GetText)(void* _obj, void* _buf)
-{
-	wxString result = ((wxMenuItem*)_obj)->GetText();
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(int, wxMenuItem_GetLabelFromText)(void* text, void* _buf)
-{
-	wxString result = wxMenuItem::GetLabelFromText((wxChar*) text);
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(void, wxMenuItem_SetCheckable)(void* _obj, int checkable)
-{
-	((wxMenuItem*)_obj)->SetCheckable(checkable != 0);
-}
-	
-EWXWEXPORT(int, wxMenuItem_IsCheckable)(void* _obj)
-{
-	return (int)((wxMenuItem*)_obj)->IsCheckable();
-}
-	
-EWXWEXPORT(int, wxMenuItem_IsSubMenu)(void* _obj)
-{
-	return (int)((wxMenuItem*)_obj)->IsSubMenu();
-}
-	
-EWXWEXPORT(void, wxMenuItem_SetSubMenu)(void* _obj, void* menu)
-{
-	((wxMenuItem*)_obj)->SetSubMenu((wxMenu*)menu);
-}
-	
-EWXWEXPORT(void*, wxMenuItem_GetSubMenu)(void* _obj)
-{
-	return (void*)((wxMenuItem*)_obj)->GetSubMenu();
-}
-	
-EWXWEXPORT(void, wxMenuItem_Enable)(void* _obj, int enable)
-{
-	((wxMenuItem*)_obj)->Enable(enable != 0);
-}
-	
-EWXWEXPORT(int, wxMenuItem_IsEnabled)(void* _obj)
-{
-	return (int)((wxMenuItem*)_obj)->IsEnabled();
-}
-	
-EWXWEXPORT(void, wxMenuItem_Check)(void* _obj, int check)
-{
-	((wxMenuItem*)_obj)->Check(check != 0);
-}
-	
-EWXWEXPORT(int, wxMenuItem_IsChecked)(void* _obj)
-{
-	return (int)((wxMenuItem*)_obj)->IsChecked();
-}
-	
-EWXWEXPORT(void, wxMenuItem_SetHelp)(void* _obj, void* str)
-{
-	((wxMenuItem*)_obj)->SetHelp((wxChar*)str);
-}
-	
-EWXWEXPORT(int, wxMenuItem_GetHelp)(void* _obj, void* _buf)
-{
-	wxString result = ((wxMenuItem*)_obj)->GetHelp();
-	return copyStrToBuf(_buf, result);
-}
-
-}
diff --git a/wxc/src/ewxw/eljmenubar.cpp b/wxc/src/ewxw/eljmenubar.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljmenubar.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxMenuBar_Create)(int _style)
-{
-	return new wxMenuBar(_style);
-}
-	
-EWXWEXPORT(void, wxMenuBar_DeletePointer)(void* _obj)
-{
-	delete (wxMenuBar*)_obj;
-}
-	
-EWXWEXPORT(int, wxMenuBar_Append)(void* _obj, void* menu, wxChar* title)
-{
-	return (int)((wxMenuBar*)_obj)->Append((wxMenu*) menu, title);
-}
-	
-EWXWEXPORT(int, wxMenuBar_Insert)(void* _obj, int pos, void* menu, wxChar* title)
-{
-	return (int)((wxMenuBar*)_obj)->Insert((size_t) pos, (wxMenu*) menu, title);
-}
-	
-EWXWEXPORT(int, wxMenuBar_GetMenuCount)(void* _obj)
-{
-	return (int)((wxMenuBar*)_obj)->GetMenuCount();
-}
-	
-EWXWEXPORT(void*, wxMenuBar_GetMenu)(void* _obj, int pos)
-{
-	return (void*)((wxMenuBar*)_obj)->GetMenu((size_t) pos);
-}
-	
-EWXWEXPORT(void*, wxMenuBar_Replace)(void* _obj, int pos, void* menu, wxChar* title)
-{
-	return (void*)((wxMenuBar*)_obj)->Replace((size_t) pos, (wxMenu*) menu, title);
-}
-	
-EWXWEXPORT(void*, wxMenuBar_Remove)(void* _obj, int pos)
-{
-	return (void*)((wxMenuBar*)_obj)->Remove((size_t) pos);
-}
-	
-EWXWEXPORT(void, wxMenuBar_EnableTop)(void* _obj, int pos, int enable)
-{
-	((wxMenuBar*)_obj)->EnableTop((size_t) pos, enable != 0);
-}
-	
-EWXWEXPORT(void, wxMenuBar_SetLabelTop)(void* _obj, int pos, wxChar* label)
-{
-	((wxMenuBar*)_obj)->SetLabelTop((size_t) pos, label);
-}
-	
-EWXWEXPORT(int, wxMenuBar_GetLabelTop)(void* _obj, int pos, void* _buf)
-{
-	wxString result = ((wxMenuBar*)_obj)->GetLabelTop((size_t) pos);
-	return copyStrToBuf(_buf, result); 
-}
-	
-EWXWEXPORT(int, wxMenuBar_FindMenuItem)(void* _obj, wxChar* menuString, wxChar* itemString)
-{
-	return ((wxMenuBar*)_obj)->FindMenuItem(menuString, itemString);
-}
-	
-EWXWEXPORT(void*, wxMenuBar_FindItem)(void* _obj, int id, void *menu)
-{
-	return (void*)((wxMenuBar*)_obj)->FindItem(id, (wxMenu**) menu);
-}
-	
-EWXWEXPORT(int, wxMenuBar_FindMenu)(void* _obj, wxChar* title)
-{
-	return ((wxMenuBar*)_obj)->FindMenu(title);
-}
-	
-EWXWEXPORT(void, wxMenuBar_EnableItem)(void* _obj, int id, int enable)
-{
-	((wxMenuBar*)_obj)->Enable(id, enable != 0);
-}
-	
-EWXWEXPORT(void, wxMenuBar_Check)(void* _obj, int id, int check)
-{
-	((wxMenuBar*)_obj)->Check(id, check != 0);
-}
-	
-EWXWEXPORT(int, wxMenuBar_IsChecked)(void* _obj, int id)
-{
-	return (int)((wxMenuBar*)_obj)->IsChecked(id);
-}
-	
-EWXWEXPORT(int, wxMenuBar_IsEnabled)(void* _obj, int id)
-{
-	return (int)((wxMenuBar*)_obj)->IsEnabled(id);
-}
-	
-EWXWEXPORT(void, wxMenuBar_SetItemLabel)(void* _obj, int id, wxChar* label)
-{
-	((wxMenuBar*)_obj)->SetLabel(id, label);
-}
-	
-EWXWEXPORT(int, wxMenuBar_GetLabel)(void* _obj, int id, void* _buf)
-{
-	wxString result = ((wxMenuBar*)_obj)->GetLabel(id);
-	return copyStrToBuf(_buf, result); 
-}
-	
-EWXWEXPORT(void, wxMenuBar_SetHelpString)(void* _obj, int id, wxChar* helpString)
-{
-	((wxMenuBar*)_obj)->SetHelpString(id, helpString);
-}
-	
-EWXWEXPORT(int, wxMenuBar_GetHelpString)(void* _obj, int id, void* _buf)
-{
-	wxString result = ((wxMenuBar*)_obj)->GetHelpString(id);
-	return copyStrToBuf(_buf, result); 
-}
-	
-EWXWEXPORT(int, wxMenuBar_Enable)(void* _obj, int enable)
-{
-	return (int)((wxMenuBar*)_obj)->Enable(enable != 0);
-}
-	
-EWXWEXPORT(void, wxMenuBar_SetLabel)(void* _obj, wxChar* s)
-{
-	((wxMenuBar*)_obj)->SetLabel(s);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljmessagedialog.cpp b/wxc/src/ewxw/eljmessagedialog.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljmessagedialog.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxMessageDialog_Create)(void* _prt, void* _msg, void* _cap, int _stl)
-{
-	return (void*) new wxMessageDialog((wxWindow*)_prt, (wxChar*)_msg, (wxChar*)_cap, (long)_stl);
-}
-
-EWXWEXPORT(void, wxMessageDialog_Delete)(void* _obj)
-{
-	delete (wxMessageDialog*)_obj;
-}
-
-EWXWEXPORT(int, wxMessageDialog_ShowModal)(void* _obj)
-{
-	return ((wxMessageDialog*)_obj)->ShowModal();
-}
-
-}
diff --git a/wxc/src/ewxw/eljmime.cpp b/wxc/src/ewxw/eljmime.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljmime.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-#include "wrapper.h"
-#include "wx/mimetype.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxMimeTypesManager_Create) ()
-{
-	return (void*) wxTheMimeTypesManager;
-}
-
-EWXWEXPORT(void*, wxMimeTypesManager_GetFileTypeFromExtension) (void* _obj, void* _ext)
-{
-	return (void*)((wxMimeTypesManager*)_obj)->GetFileTypeFromExtension((const char*)_ext);
-}
-	
-EWXWEXPORT(void*, wxMimeTypesManager_GetFileTypeFromMimeType) (void* _obj, void* _name)
-{
-	return (void*)((wxMimeTypesManager*)_obj)->GetFileTypeFromMimeType((const char*)_name);
-}
-	
-EWXWEXPORT(int, wxMimeTypesManager_ReadMailcap) (void* _obj, void* _file, int _fb)
-{
-	return (int)((wxMimeTypesManager*)_obj)->ReadMailcap((const char*)_file, _fb != 0);
-}
-	
-EWXWEXPORT(int, wxMimeTypesManager_ReadMimeTypes) (void* _obj, void* _file)
-{
-	return (int)((wxMimeTypesManager*)_obj)->ReadMimeTypes((const char*)_file);
-}
-	
-EWXWEXPORT(int, wxMimeTypesManager_EnumAllFileTypes) (void* _obj, void* _lst)
-{
-	wxArrayString arr;
-	int result = (int)((wxMimeTypesManager*)_obj)->EnumAllFileTypes(arr);
-	
-	if (_lst)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)_lst)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	
-	return result;
-}
-	
-EWXWEXPORT(void, wxMimeTypesManager_AddFallbacks) (void* _obj, void* _types)
-{
-	((wxMimeTypesManager*)_obj)->AddFallbacks((const wxFileTypeInfo*)_types);
-}
-
-EWXWEXPORT(int, wxMimeTypesManager_IsOfType)(void* _obj, void* _type, void* _wildcard)
-{
-	return (int)((wxMimeTypesManager*)_obj)->IsOfType ((const char*)_type, (const char*)_wildcard);
-}
-	
-
-EWXWEXPORT(int, wxFileType_GetMimeType) (void* _obj, void* _buf)
-{
-	wxString result;
-	
-	if (((wxFileType*)_obj)->GetMimeType(&result) && _buf)
-		copyStrToBuf(_buf, result);
-	
-	return result.Length();
-}
-	
-EWXWEXPORT(int, wxFileType_GetMimeTypes) (void* _obj, void* _lst)
-{
-	wxArrayString arr;
-
-	if (((wxFileType*)_obj)->GetMimeTypes(arr) && _lst)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)_lst)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(int, wxFileType_GetExtensions) (void* _obj, void* _lst)
-{
-	wxArrayString arr;
-
-	if (((wxFileType*)_obj)->GetExtensions(arr) && _lst)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)_lst)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	
-	return arr.GetCount();
-}
-	
-EWXWEXPORT(int, wxFileType_GetIcon) (void* _obj, void *icon)
-{
-	return (int)((wxFileType*)_obj)->GetIcon((wxIcon*)icon);
-}
-	
-EWXWEXPORT(int, wxFileType_GetDescription) (void* _obj, void* _buf)
-{
-	wxString result;
-	
-	if (((wxFileType*)_obj)->GetDescription(&result) && _buf)
-		copyStrToBuf(_buf, result);
-	
-	return result.Length();
-}
-	
-EWXWEXPORT(int, wxFileType_GetOpenCommand) (void* _obj, void* _buf, void* _params)
-{
-	wxString result;
-	
-	if (((wxFileType*)_obj)->GetOpenCommand(&result, *((wxFileType::MessageParameters*)_params)) && _buf)
-		copyStrToBuf(_buf, result);
-
-	return result.Length();
-}
-	
-EWXWEXPORT(int, wxFileType_GetPrintCommand) (void* _obj, void* _buf, void* _params)
-{
-	wxString result;
-	
-	if (((wxFileType*)_obj)->GetPrintCommand(&result, *((wxFileType::MessageParameters*)_params)) && _buf)
-		copyStrToBuf(_buf, result);
-
-	return result.Length();
-}
-	
-EWXWEXPORT(int, wxFileType_ExpandCommand) (void* _obj, void* _cmd, void* _params, void* _buf)
-{
-	wxString result = ((wxFileType*)_obj)->ExpandCommand((const char*)_cmd, *((wxFileType::MessageParameters*)_params));
-	
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxFileType_Delete) (void* _obj)
-{
-	delete (wxFileType*)_obj;
-}
-
-
-class ELJMessageParameters : public wxFileType::MessageParameters
-{
-	private:
-		void* EiffelObject;
-		TGetText EiffelFunc;
-	public:
-		ELJMessageParameters(const wxString& filename, const wxString& mimetype, void* _object, void* _func)
-		: wxFileType::MessageParameters(filename, mimetype)
-	{
-		EiffelFunc = (TGetText)_func;
-		EiffelObject = _object;
-	}
-
-	virtual wxString GetParamValue(const wxString& name) const
-	{
-		if (EiffelObject)
-		{
-			void* res = EiffelFunc(EiffelObject, (void*)name.c_str());
-			if (res)
-				return (const wxChar*)res;
-			else
-				return wxFileType::MessageParameters::GetParamValue(name);
-		}
-		else
-			return wxFileType::MessageParameters::GetParamValue(name);
-   }
-};
-
-EWXWEXPORT(void*, wxMessageParameters_Create) (void* _file, void* _type, void* _object, void* _func)
-{
-	return (void*)new ELJMessageParameters((const wxChar*)_file, (const wxChar*)_type, _object, _func);
-}
-
-EWXWEXPORT(void, wxMessageParameters_Delete) (void* _obj)
-{
-	delete (ELJMessageParameters*)_obj;
-}
-
-}
diff --git a/wxc/src/ewxw/eljminiframe.cpp b/wxc/src/ewxw/eljminiframe.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljminiframe.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxMiniFrame_Create) (void* _prt, int _id, void* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxMiniFrame ((wxWindow*)_prt, _id, (wxChar*)_txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-}
diff --git a/wxc/src/ewxw/eljnotebook.cpp b/wxc/src/ewxw/eljnotebook.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljnotebook.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxNotebook_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxNotebook ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(int, wxNotebook_GetPageCount)(void* _obj)
-{
-	return ((wxNotebook*)_obj)->GetPageCount();
-}
-	
-EWXWEXPORT(int, wxNotebook_SetSelection)(void* _obj, int nPage)
-{
-	return ((wxNotebook*)_obj)->SetSelection(nPage);
-}
-	
-EWXWEXPORT(void, wxNotebook_AdvanceSelection)(void* _obj, int bForward)
-{
-	((wxNotebook*)_obj)->AdvanceSelection(bForward != 0);
-}
-	
-EWXWEXPORT(int, wxNotebook_GetSelection)(void* _obj)
-{
-	return ((wxNotebook*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(int, wxNotebook_SetPageText)(void* _obj, int nPage, void* strText)
-{
-	return (int)((wxNotebook*)_obj)->SetPageText(nPage, (wxChar*) strText);
-}
-	
-EWXWEXPORT(int, wxNotebook_GetPageText)(void* _obj, int nPage, void* _buf)
-{
-	wxString result = ((wxNotebook*)_obj)->GetPageText(nPage);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxNotebook_SetImageList)(void* _obj, void* imageList)
-{
-	((wxNotebook*)_obj)->SetImageList((wxImageList*) imageList);
-}
-	
-EWXWEXPORT(void*, wxNotebook_GetImageList)(void* _obj)
-{
-	return (void*)((wxNotebook*)_obj)->GetImageList();
-}
-	
-EWXWEXPORT(int, wxNotebook_GetPageImage)(void* _obj, int nPage)
-{
-	return ((wxNotebook*)_obj)->GetPageImage(nPage);
-}
-	
-EWXWEXPORT(int, wxNotebook_SetPageImage)(void* _obj, int nPage, int nImage)
-{
-	return (int)((wxNotebook*)_obj)->SetPageImage(nPage, nImage);
-}
-	
-EWXWEXPORT(int, wxNotebook_GetRowCount)(void* _obj)
-{
-	return ((wxNotebook*)_obj)->GetRowCount();
-}
-	
-EWXWEXPORT(void, wxNotebook_SetPageSize)(void* _obj, int _w, int _h)
-{
-	((wxNotebook*)_obj)->SetPageSize(wxSize(_w, _h));
-}
-	
-EWXWEXPORT(void, wxNotebook_SetPadding)(void* _obj, int _w, int _h)
-{
-	((wxNotebook*)_obj)->SetPadding(wxSize(_w, _h));
-}
-	
-EWXWEXPORT(int, wxNotebook_DeletePage)(void* _obj, int nPage)
-{
-	return (int)((wxNotebook*)_obj)->DeletePage(nPage);
-}
-	
-EWXWEXPORT(int, wxNotebook_RemovePage)(void* _obj, int nPage)
-{
-	return (int)((wxNotebook*)_obj)->RemovePage(nPage);
-}
-	
-EWXWEXPORT(int, wxNotebook_DeleteAllPages)(void* _obj)
-{
-	return (int)((wxNotebook*)_obj)->DeleteAllPages();
-}
-	
-EWXWEXPORT(int, wxNotebook_AddPage)(void* _obj, void* pPage, void* strText, int bSelect, int imageId)
-{
-	return (int)((wxNotebook*)_obj)->AddPage((wxNotebookPage*) pPage, (wxChar*) strText, bSelect != 0, imageId);
-}
-	
-EWXWEXPORT(int, wxNotebook_InsertPage)(void* _obj, int nPage, void* pPage, void* strText, int bSelect, int imageId)
-{
-	return (int)((wxNotebook*)_obj)->InsertPage(nPage, (wxNotebookPage*) pPage, (wxChar*) strText, bSelect != 0, imageId);
-}
-	
-EWXWEXPORT(void*, wxNotebook_GetPage)(void* _obj, int nPage)
-{
-	return (void*)((wxNotebook*)_obj)->GetPage(nPage);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljpalette.cpp b/wxc/src/ewxw/eljpalette.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljpalette.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxPalette_CreateDefault) ()
-{
-	return (void*) new wxPalette();
-}
-
-EWXWEXPORT(void*, wxPalette_CreateRGB) (int n, void* red, void* green, void* blue)
-{
-	return (void*) new wxPalette(n, (unsigned char*)red, (unsigned char*)green, (unsigned char*)blue);
-}
-
-EWXWEXPORT(void, wxPalette_Delete) (void* _obj)
-{
-	delete (wxPalette*)_obj;
-}
-
-EWXWEXPORT(int, wxPalette_GetPixel)(void* _obj, char red, char green, char blue)
-{
-	return ((wxPalette*)_obj)->GetPixel((unsigned char)red, (unsigned char)green, (unsigned char)blue);
-}
-	
-EWXWEXPORT(int, wxPalette_GetRGB)(void* _obj, int pixel, void* red, void* green, void* blue)
-{
-	return (int)((wxPalette*)_obj)->GetRGB(pixel, (unsigned char*)red, (unsigned char*)green, (unsigned char*)blue);
-}
-	
-EWXWEXPORT(int, wxPalette_Ok)(void* _obj)
-{
-	return (int)((wxPalette*)_obj)->Ok();
-}
-	
-EWXWEXPORT(void, wxPalette_Assign)(void* _obj, void* palette)
-{
-	*((wxPalette*)_obj) = *((wxPalette*)palette);
-}
-
-EWXWEXPORT(int, wxPalette_IsEqual)(void* _obj, void* palette)
-{
-#if (wxVERSION_NUMBER <= 2800)
-	return (int)(*((wxPalette*)_obj) == *((wxPalette*)palette));
-#else
-	wxPalette* pal1 = (wxPalette *)_obj;
-	wxPalette* pal2 = (wxPalette *)palette;
-	if (pal1->GetColoursCount() == pal2->GetColoursCount()){
-		bool equal = true;
-		unsigned char red1 = 0;
-		unsigned char red2 = 0;
-		unsigned char green1 = 0;
-		unsigned char green2 = 0;
-		unsigned char blue1 = 0;
-		unsigned char blue2 = 0;
-		for(int x = 0; x<(pal1->GetColoursCount()); x++){
-			pal1->GetRGB(x, &red1, &green1, &blue1);
-			pal2->GetRGB(x, &red2, &green2, &blue2);
-			equal = equal && (red1==red2 && green1==green2 && blue1==blue2); 
-		}
-		return (int)equal;
-	} else {
-		return 0;
-	}
-#endif
-}
-
-}
diff --git a/wxc/src/ewxw/eljpanel.cpp b/wxc/src/ewxw/eljpanel.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljpanel.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxPanel_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxPanel ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void, wxPanel_InitDialog)(void* _obj)
-{
-	((wxPanel*)_obj)->InitDialog();
-}
-	
-EWXWEXPORT(void*, wxPanel_GetDefaultItem)(void* _obj)
-{
-#if (wxVERSION_NUMBER <= 2800)
-	return (void*)((wxPanel*)_obj)->GetDefaultItem();
-#else
-	return (void*)((wxTopLevelWindow*)_obj)->GetDefaultItem();
-#endif
-}
-	
-EWXWEXPORT(void, wxPanel_SetDefaultItem)(void* _obj, void* btn)
-{
-#if (wxVERSION_NUMBER <= 2800)
-	((wxPanel*)_obj)->SetDefaultItem((wxButton*) btn);
-#else
-	((wxTopLevelWindow*)_obj)->SetDefaultItem((wxButton*) btn);
-#endif
-}
-	
-}
diff --git a/wxc/src/ewxw/eljpen.cpp b/wxc/src/ewxw/eljpen.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljpen.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxPen_CreateDefault) ()
-{
-	return new wxPen();
-}
-
-EWXWEXPORT(void*, wxPen_CreateFromColour) (void* col, int width, int style)
-{
-	return new wxPen(*((wxColour*)col), width, style);
-}
-
-EWXWEXPORT(void*, wxPen_CreateFromBitmap) (void* stipple, int width)
-{
-#ifdef __WIN32__
-	return new wxPen(*((wxBitmap*)stipple), width);
-#else
-	return NULL;
-#endif
-}
-
-EWXWEXPORT(void*, wxPen_CreateFromStock) (int id)
-{
-	switch (id)
-	{
-		case 0:
-			return (void*)wxRED_PEN;
-		case 1:
-			return (void*)wxCYAN_PEN;
-		case 2:
-			return (void*)wxGREEN_PEN;
-		case 3:
-			return (void*)wxBLACK_PEN;
-		case 4:
-			return (void*)wxWHITE_PEN;
-		case 5:
-			return (void*)wxTRANSPARENT_PEN;
-		case 6:
-			return (void*)wxBLACK_DASHED_PEN;
-		case 7:
-			return (void*)wxGREY_PEN;
-		case 8:
-			return (void*)wxMEDIUM_GREY_PEN;
-		case 9:
-			return (void*)wxLIGHT_GREY_PEN;
-	}
-	
-	return NULL;
-}
-
-EWXWEXPORT(void, wxPen_Delete)(void* _obj)
-{
-	delete (wxPen*)_obj;
-}
-
-EWXWEXPORT(void, wxPen_Assign)(void* _obj, void* pen)
-{
-	*((wxPen*)_obj) = *((wxPen*)pen);
-}
-	
-EWXWEXPORT(int, wxPen_IsEqual)(void* _obj, void* pen)
-{
-	return (int)(*((wxPen*)_obj) == *((wxPen*)pen));
-}
-	
-EWXWEXPORT(int, wxPen_Ok)(void* _obj)
-{
-	return (int)((wxPen*)_obj)->Ok();
-}
-	
-EWXWEXPORT(void, wxPen_SetColour)(void* _obj, void* col)
-{
-	((wxPen*)_obj)->SetColour(*((wxColour*)col));
-}
-	
-EWXWEXPORT(void, wxPen_SetColourSingle)(void* _obj, char r, char g, char b)
-{
-	((wxPen*)_obj)->SetColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
-}
-	
-EWXWEXPORT(void, wxPen_SetWidth)(void* _obj, int width)
-{
-	((wxPen*)_obj)->SetWidth(width);
-}
-	
-EWXWEXPORT(void, wxPen_SetStyle)(void* _obj, int style)
-{
-	((wxPen*)_obj)->SetStyle(style);
-}
-	
-EWXWEXPORT(void, wxPen_SetStipple)(void* _obj, void* stipple)
-{
-#ifdef __WIN32__
-	((wxPen*)_obj)->SetStipple(*((wxBitmap*)stipple));
-#endif
-}
-	
-EWXWEXPORT(void, wxPen_SetDashes)(void* _obj, int nb_dashes, void* dash)
-{
-	((wxPen*)_obj)->SetDashes(nb_dashes, (wxDash*)dash);
-}
-	
-EWXWEXPORT(void, wxPen_SetJoin)(void* _obj, int join)
-{
-	((wxPen*)_obj)->SetJoin(join);
-}
-	
-EWXWEXPORT(void, wxPen_SetCap)(void* _obj, int cap)
-{
-	((wxPen*)_obj)->SetCap(cap);
-}
-	
-EWXWEXPORT(void, wxPen_GetColour)(void* _obj, void* _ref)
-{
-	*((wxColour*)_ref) = ((wxPen*)_obj)->GetColour();
-}
-	
-EWXWEXPORT(int, wxPen_GetWidth)(void* _obj)
-{
-	return ((wxPen*)_obj)->GetWidth();
-}
-	
-EWXWEXPORT(int, wxPen_GetStyle)(void* _obj)
-{
-	return ((wxPen*)_obj)->GetStyle();
-}
-	
-EWXWEXPORT(int, wxPen_GetJoin)(void* _obj)
-{
-	return ((wxPen*)_obj)->GetJoin();
-}
-	
-EWXWEXPORT(int, wxPen_GetCap)(void* _obj)
-{
-	return ((wxPen*)_obj)->GetCap();
-}
-	
-EWXWEXPORT(int, wxPen_GetDashes)(void* _obj, void* ptr)
-{
-	return ((wxPen*)_obj)->GetDashes((wxDash**)ptr);
-}
-	
-EWXWEXPORT(void, wxPen_GetStipple)(void* _obj, void* _ref)
-{
-#ifdef __WIN32__
-	*((wxBitmap*)_ref) = *(((wxPen*)_obj)->GetStipple());
-#endif
-}
-	
-}
diff --git a/wxc/src/ewxw/eljplot.cpp b/wxc/src/ewxw/eljplot.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljplot.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-	#include "wx/plot/plot.h"
-#else
-	#include "wx/plot.h"
-#endif
-
-extern "C"
-{
-
-typedef int (*TGetPlotInt)(void* _obj);
-typedef double (*TGetPlotDouble)(void* _obj, int _x);
-
-}
-
-class ELJPlotCurve : public wxPlotCurve
-{
-	private:
-		void* EiffelObject;
-		TGetPlotInt EGetStartX;
-		TGetPlotInt EGetEndX;
-		TGetPlotDouble EGetY;
-	public:
-		ELJPlotCurve(void* _obj, void* _str, void* _end, void* _y, int offsetY, double startY, double endY) : wxPlotCurve(offsetY, startY, endY)
-		{
-			EiffelObject = _obj;
-			EGetStartX = (TGetPlotInt)_str;
-			EGetEndX = (TGetPlotInt)_end;
-			EGetY = (TGetPlotDouble)_y;
-		}
-    virtual wxInt32 GetStartX()
-	{ return (wxInt32)EGetStartX(EiffelObject); }
-
-    virtual wxInt32 GetEndX()
-	{ return (wxInt32)EGetEndX(EiffelObject); }
-
-    virtual double GetY(wxInt32 x)
-	{ return EGetY(EiffelObject, (int)x); }
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxPlotWindow_Create)(void* parent, int id, int x, int y, int w, int h, int flags)
-{
-    return (void*)new wxPlotWindow((wxWindow*)parent, (wxWindowID)id, wxPoint(x, y), wxSize(w, h), flags);
-}
-
-EWXWEXPORT(void,wxPlotWindow_Add)(void* _obj, void* curve)
-{
-	((wxPlotWindow*)_obj)->Add((wxPlotCurve*)curve);
-}
-	
-EWXWEXPORT(void,wxPlotWindow_Delete)(void* _obj, void* curve)
-{
-	((wxPlotWindow*)_obj)->Delete((wxPlotCurve*)curve);
-}
-	
-EWXWEXPORT(int,wxPlotWindow_GetCount)(void* _obj)
-{
-	return (int)((wxPlotWindow*)_obj)->GetCount();
-}
-	
-EWXWEXPORT(void*,wxPlotWindow_GetAt)(void* _obj, int n)
-{
-	return (void*)((wxPlotWindow*)_obj)->GetAt((size_t)n);
-}
-	
-EWXWEXPORT(void,wxPlotWindow_SetCurrent)(void* _obj, void*  current)
-{
-	((wxPlotWindow*)_obj)->SetCurrent((wxPlotCurve*)current);
-}
-	
-EWXWEXPORT(void*,wxPlotWindow_GetCurrent)(void* _obj)
-{
-	return (void*)((wxPlotWindow*)_obj)->GetCurrent();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_AddOnOff)(void* _obj, void* curve)
-{
-	((wxPlotWindow*)_obj)->Add((wxPlotOnOffCurve*)curve);
-}
-	
-EWXWEXPORT(void,wxPlotWindow_DeleteOnOff)(void* _obj, void* curve)
-{
-	((wxPlotWindow*)_obj)->Delete((wxPlotOnOffCurve*)curve);
-}
-	
-EWXWEXPORT(int,wxPlotWindow_GetOnOffCurveCount)(void* _obj)
-{
-	return (int)((wxPlotWindow*)_obj)->GetOnOffCurveCount();
-}
-	
-EWXWEXPORT(void*,wxPlotWindow_GetOnOffCurveAt)(void* _obj, int n)
-{
-	return (void*)((wxPlotWindow*)_obj)->GetOnOffCurveAt((size_t)n);
-}
-	
-EWXWEXPORT(void,wxPlotWindow_Move)(void* _obj, void* curve, int pixels_up)
-{
-	((wxPlotWindow*)_obj)->Move((wxPlotCurve*)curve, pixels_up);
-}
-	
-EWXWEXPORT(void,wxPlotWindow_Enlarge)(void* _obj, void* curve, double factor)
-{
-	((wxPlotWindow*)_obj)->Enlarge((wxPlotCurve*)curve, factor);
-}
-	
-EWXWEXPORT(void,wxPlotWindow_SetUnitsPerValue)(void* _obj, double upv)
-{
-	((wxPlotWindow*)_obj)->SetUnitsPerValue(upv);
-}
-	
-EWXWEXPORT(double,wxPlotWindow_GetUnitsPerValue)(void* _obj)
-{
-	return ((wxPlotWindow*)_obj)->GetUnitsPerValue();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_SetZoom)(void* _obj, double zoom)
-{
-	((wxPlotWindow*)_obj)->SetZoom(zoom);
-}
-	
-EWXWEXPORT(double,wxPlotWindow_GetZoom)(void* _obj)
-{
-	return ((wxPlotWindow*)_obj)->GetZoom();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_SetScrollOnThumbRelease)(void* _obj, int scrollOnThumbRelease)
-{
-	((wxPlotWindow*)_obj)->SetScrollOnThumbRelease(scrollOnThumbRelease != 0);
-}
-	
-EWXWEXPORT(int,wxPlotWindow_GetScrollOnThumbRelease)(void* _obj)
-{
-	return (int)((wxPlotWindow*)_obj)->GetScrollOnThumbRelease();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_SetEnlargeAroundWindowCentre)(void* _obj, int enlargeAroundWindowCentre)
-{
-	((wxPlotWindow*)_obj)->SetEnlargeAroundWindowCentre(enlargeAroundWindowCentre != 0);
-}
-	
-EWXWEXPORT(int,wxPlotWindow_GetEnlargeAroundWindowCentre)(void* _obj)
-{
-	return (int)((wxPlotWindow*)_obj)->GetEnlargeAroundWindowCentre();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_RedrawEverything)(void* _obj)
-{
-	((wxPlotWindow*)_obj)->RedrawEverything();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_RedrawXAxis)(void* _obj)
-{
-	((wxPlotWindow*)_obj)->RedrawXAxis();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_RedrawYAxis)(void* _obj)
-{
-	((wxPlotWindow*)_obj)->RedrawYAxis();
-}
-	
-EWXWEXPORT(void,wxPlotWindow_ResetScrollbar)(void* _obj)
-{
-	((wxPlotWindow*)_obj)->ResetScrollbar();
-}
-	
-
-EWXWEXPORT(void*,wxPlotOnOffCurve_Create)(int offsetY)
-{
-	return (void*)new wxPlotOnOffCurve(offsetY);
-}
-
-EWXWEXPORT(void,wxPlotOnOffCurve_Delete)(void* _obj)
-{
-	delete (wxPlotOnOffCurve*)_obj;
-}
-
-EWXWEXPORT(int,wxPlotOnOffCurve_GetStartX)(void* _obj)
-{
-	return (int)((wxPlotOnOffCurve*)_obj)->GetStartX();
-}
-	
-EWXWEXPORT(int,wxPlotOnOffCurve_GetEndX)(void* _obj)
-{
-	return (int)((wxPlotOnOffCurve*)_obj)->GetEndX();
-}
-	
-EWXWEXPORT(void,wxPlotOnOffCurve_SetOffsetY)(void* _obj, int offsetY)
-{
-	((wxPlotOnOffCurve*)_obj)->SetOffsetY(offsetY);
-}
-	
-EWXWEXPORT(int,wxPlotOnOffCurve_GetOffsetY)(void* _obj)
-{
-	return ((wxPlotOnOffCurve*)_obj)->GetOffsetY();
-}
-	
-EWXWEXPORT(void,wxPlotOnOffCurve_Add)(void* _obj, int on, int off, void* clientData)
-{
-	((wxPlotOnOffCurve*)_obj)->Add((wxInt32)on, (wxInt32)off, clientData);
-}
-	
-EWXWEXPORT(int,wxPlotOnOffCurve_GetCount)(void* _obj)
-{
-	return (int)((wxPlotOnOffCurve*)_obj)->GetCount();
-}
-	
-EWXWEXPORT(int,wxPlotOnOffCurve_GetOn)(void* _obj, int index)
-{
-	return (int)((wxPlotOnOffCurve*)_obj)->GetOn((size_t)index);
-}
-	
-EWXWEXPORT(int,wxPlotOnOffCurve_GetOff)(void* _obj, int index)
-{
-	return (int)((wxPlotOnOffCurve*)_obj)->GetOff((size_t)index);
-}
-	
-EWXWEXPORT(void*,wxPlotOnOffCurve_GetClientData)(void* _obj, int index)
-{
-	return (void*)((wxPlotOnOffCurve*)_obj)->GetClientData((size_t)index);
-}
-	
-EWXWEXPORT(void*,wxPlotOnOffCurve_GetAt)(void* _obj, int index)
-{
-	return (void*)((wxPlotOnOffCurve*)_obj)->GetAt((size_t)index);
-}
-	
-EWXWEXPORT(void,wxPlotOnOffCurve_DrawOnLine)(void* _obj, void* dc, int y, int start, int end, void* clientData)
-{
-	((wxPlotOnOffCurve*)_obj)->DrawOnLine(*((wxDC*)dc), (wxCoord)y, (wxCoord)start, (wxCoord)end, clientData);
-}
-	
-EWXWEXPORT(void,wxPlotOnOffCurve_DrawOffLine)(void* _obj, void* dc, int y, int start, int end)
-{
-	((wxPlotOnOffCurve*)_obj)->DrawOffLine(*((wxDC*)dc), (wxCoord)y, (wxCoord)start, (wxCoord)end);
-}
-	
-
-EWXWEXPORT(void*,ELJPlotCurve_Create)(void* _obj, void* _str, void* _end, void* _y, int offsetY, double startY, double endY)
-{
-	return (void*)new ELJPlotCurve(_obj, _str, _end, _y, offsetY, startY, endY);
-}
-
-EWXWEXPORT(void,ELJPlotCurve_Delete)(void* _obj)
-{
-	delete (ELJPlotCurve*)_obj;
-}
-
-EWXWEXPORT(void,ELJPlotCurve_SetStartY)(void* _obj, double startY)
-{
-	((ELJPlotCurve*)_obj)->SetStartY(startY);
-}
-	
-EWXWEXPORT(double,ELJPlotCurve_GetStartY)(void* _obj)
-{
-	return ((ELJPlotCurve*)_obj)->GetStartY();
-}
-	
-EWXWEXPORT(void,ELJPlotCurve_SetEndY)(void* _obj, double endY)
-{
-	((ELJPlotCurve*)_obj)->SetEndY(endY);
-}
-	
-EWXWEXPORT(double,ELJPlotCurve_GetEndY)(void* _obj)
-{
-	return ((ELJPlotCurve*)_obj)->GetEndY();
-}
-	
-EWXWEXPORT(void,ELJPlotCurve_SetOffsetY)(void* _obj, int offsetY)
-{
-	((ELJPlotCurve*)_obj)->SetOffsetY(offsetY);
-}
-	
-EWXWEXPORT(int,ELJPlotCurve_GetOffsetY)(void* _obj)
-{
-	return ((ELJPlotCurve*)_obj)->GetOffsetY();
-}
-	
-EWXWEXPORT(void,ELJPlotCurve_SetPenNormal)(void* _obj, void* pen)
-{
-	((ELJPlotCurve*)_obj)->SetPenNormal(*((wxPen*)pen));
-}
-	
-EWXWEXPORT(void,ELJPlotCurve_SetPenSelected)(void* _obj, void* pen)
-{
-	((ELJPlotCurve*)_obj)->SetPenSelected(*((wxPen*)pen));
-}
-	
-
-EWXWEXPORT(void*,wxPlotEvent_GetCurve)(void* _obj)
-{
-	return (void*)((wxPlotEvent*)_obj)->GetCurve();
-}
-	
-EWXWEXPORT(double,wxPlotEvent_GetZoom)(void* _obj)
-{
-	return ((wxPlotEvent*)_obj)->GetZoom();
-}
-	
-EWXWEXPORT(void,wxPlotEvent_SetZoom)(void* _obj, double zoom)
-{
-	((wxPlotEvent*)_obj)->SetZoom(zoom);
-}
-	
-EWXWEXPORT(int,wxPlotEvent_GetPosition)(void* _obj)
-{
-	return (int)((wxPlotEvent*)_obj)->GetPosition();
-}
-	
-EWXWEXPORT(void,wxPlotEvent_SetPosition)(void* _obj, int pos)
-{
-	((wxPlotEvent*)_obj)->SetPosition((wxInt32)pos);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljprintdlg.cpp b/wxc/src/ewxw/eljprintdlg.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljprintdlg.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxPrintDialog_Create) (void* parent, void* data)
-{
-    return (void*) new wxPrintDialog((wxWindow*)parent, (wxPrintDialogData*)data);
-}
-
-EWXWEXPORT(void, wxPrintDialog_GetPrintData)(void* _obj, void* _ref)
-{
-	*((wxPrintData*)_ref) = ((wxPrintDialog*)_obj)->GetPrintData();
-}
-
-	
-EWXWEXPORT(void*, wxPrintDialog_GetPrintDC)(void* _obj)
-{
-	return (void*)((wxPrintDialog*)_obj)->GetPrintDC();
-}
-	
-EWXWEXPORT(void*, wxPageSetupDialog_Create) (void* parent, void* data)
-{
-    return (void*) new wxPageSetupDialog((wxWindow*)parent, (wxPageSetupData*)data);
-}
-
-EWXWEXPORT(void, wxPageSetupDialog_GetPageSetupData)(void* _obj, void* _ref)
-{
-	*((wxPageSetupData*)_ref) = ((wxPageSetupDialog*)_obj)->GetPageSetupData();
-}
-	
-EWXWEXPORT(void*, wxPageSetupDialogData_Create)()
-{
-    return (void*) new wxPageSetupDialogData();
-}
-
-EWXWEXPORT(void*, wxPageSetupDialogData_CreateFromData)(void* printData)
-{
-    return (void*) new wxPageSetupDialogData(*((wxPrintData*)printData));
-}
-
-EWXWEXPORT(void, wxPageSetupDialogData_Delete)(void* _obj)
-{
-    delete (wxPageSetupDialogData*)_obj;
-}
-
-EWXWEXPORT(void, wxPageSetupDialogData_GetPaperSize)(void* _obj, void* w, void* h)
-{
-	wxSize tmp = ((wxPageSetupDialogData*)_obj)->GetPaperSize();
-	*(int*)w = tmp.x;
-	*(int*)h = tmp.y;
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetPaperId)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetPaperId();
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_GetMinMarginTopLeft)(void* _obj, void* x, void* y)
-{
-	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMinMarginTopLeft();
-	*(int*)x = tmp.x;
-	*(int*)y = tmp.y;
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_GetMinMarginBottomRight)(void* _obj, void* x, void* y)
-{
-	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMinMarginBottomRight();
-	*(int*)x = tmp.x;
-	*(int*)y = tmp.y;
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_GetMarginTopLeft)(void* _obj, void* x, void* y)
-{
-	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMarginTopLeft();
-	*(int*)x = tmp.x;
-	*(int*)y = tmp.y;
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_GetMarginBottomRight)(void* _obj, void* x, void* y)
-{
-	wxPoint tmp = ((wxPageSetupDialogData*)_obj)->GetMarginBottomRight();
-	*(int*)x = tmp.x;
-	*(int*)y = tmp.y;
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetDefaultMinMargins)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetDefaultMinMargins();
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetEnableMargins)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetEnableMargins();
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetEnableOrientation)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetEnableOrientation();
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetEnablePaper)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetEnablePaper();
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetEnablePrinter)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetEnablePrinter();
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetDefaultInfo)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetDefaultInfo();
-}
-	
-EWXWEXPORT(int, wxPageSetupDialogData_GetEnableHelp)(void* _obj)
-{
-	return (int)((wxPageSetupDialogData*)_obj)->GetEnableHelp();
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetPaperSize)(void* _obj, int w, int h)
-{
-	((wxPageSetupDialogData*)_obj)->SetPaperSize(wxSize(w, h));
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetPaperId)(void* _obj, void* id)
-{
-	((wxPageSetupDialogData*)_obj)->SetPaperId(*((wxPaperSize*)id));
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetPaperSizeId)(void* _obj, int id)
-{
-	((wxPageSetupDialogData*)_obj)->SetPaperSize((wxPaperSize)id);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetMinMarginTopLeft)(void* _obj, int x, int y)
-{
-	((wxPageSetupDialogData*)_obj)->SetMinMarginTopLeft(wxPoint(x, y));
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetMinMarginBottomRight)(void* _obj, int x, int y)
-{
-	((wxPageSetupDialogData*)_obj)->SetMinMarginBottomRight(wxPoint(x, y));
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetMarginTopLeft)(void* _obj, int x, int y)
-{
-	((wxPageSetupDialogData*)_obj)->SetMarginTopLeft(wxPoint(x, y));
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetMarginBottomRight)(void* _obj, int x, int y)
-{
-	((wxPageSetupDialogData*)_obj)->SetMarginBottomRight(wxPoint(x, y));
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetDefaultMinMargins)(void* _obj, int flag)
-{
-	((wxPageSetupDialogData*)_obj)->SetDefaultMinMargins(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetDefaultInfo)(void* _obj, int flag)
-{
-	((wxPageSetupDialogData*)_obj)->SetDefaultInfo(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_EnableMargins)(void* _obj, int flag)
-{
-	((wxPageSetupDialogData*)_obj)->EnableMargins(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_EnableOrientation)(void* _obj, int flag)
-{
-	((wxPageSetupDialogData*)_obj)->EnableOrientation(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_EnablePaper)(void* _obj, int flag)
-{
-	((wxPageSetupDialogData*)_obj)->EnablePaper(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_EnablePrinter)(void* _obj, int flag)
-{
-	((wxPageSetupDialogData*)_obj)->EnablePrinter(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_EnableHelp)(void* _obj, int flag)
-{
-	((wxPageSetupDialogData*)_obj)->EnableHelp(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_CalculateIdFromPaperSize)(void* _obj)
-{
-	((wxPageSetupDialogData*)_obj)->CalculateIdFromPaperSize();
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_CalculatePaperSizeFromId)(void* _obj)
-{
-	((wxPageSetupDialogData*)_obj)->CalculatePaperSizeFromId();
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_Assign)(void* _obj, void* data)
-{
-	*((wxPageSetupDialogData*)_obj) = *((wxPageSetupDialogData*)data);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_AssignData)(void* _obj, void* data)
-{
-	*((wxPageSetupDialogData*)_obj) = *((wxPrintData*)data);
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_GetPrintData)(void* _obj, void* _ref)
-{
-	*((wxPrintData*)_ref) = ((wxPageSetupDialogData*)_obj)->GetPrintData();
-}
-	
-EWXWEXPORT(void, wxPageSetupDialogData_SetPrintData)(void* _obj, void* printData)
-{
-	((wxPageSetupDialogData*)_obj)->SetPrintData(*((wxPrintData*)printData));
-}
-	
-}
diff --git a/wxc/src/ewxw/eljprinting.cpp b/wxc/src/ewxw/eljprinting.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljprinting.cpp
+++ /dev/null
@@ -1,820 +0,0 @@
-#include "wrapper.h"
-
-#if defined(wxUSE_POSTSCRIPT) && (wxUSE_POSTSCRIPT==0)
-# undef wxUSE_POSTSCRIPT
-#endif
-
-#ifdef wxUSE_POSTSCRIPT
-#include "wx/generic/prntdlgg.h"
-#endif
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxPrinter_Create)(void* data)
-{
-	return (void*) new wxPrinter((wxPrintDialogData*)data);
-}
-
-EWXWEXPORT(void, wxPrinter_Delete)(void* _obj)
-{
-	delete (wxPrinter*)_obj;
-}
-
-EWXWEXPORT(void*, wxPrinter_CreateAbortWindow)(void* _obj, void* parent, void* printout)
-{
-	return (void*)((wxPrinter*)_obj)->CreateAbortWindow((wxWindow*)parent, (wxPrintout*)printout);
-}
-	
-EWXWEXPORT(void, wxPrinter_ReportError)(void* _obj, void* parent, void* printout, void* message)
-{
-	((wxPrinter*)_obj)->ReportError((wxWindow*)parent, (wxPrintout*)printout, (wxChar*)message);
-}
-	
-EWXWEXPORT(void, wxPrinter_GetPrintDialogData)(void* _obj, void* _ref)
-{
-	*((wxPrintDialogData*)_ref) = ((wxPrinter*)_obj)->GetPrintDialogData();
-}
-	
-EWXWEXPORT(int, wxPrinter_GetAbort)(void* _obj)
-{
-	return (int)((wxPrinter*)_obj)->GetAbort();
-}
-	
-EWXWEXPORT(int, wxPrinter_GetLastError)(void* _obj)
-{
-	return ((wxPrinter*)_obj)->GetLastError();
-}
-	
-EWXWEXPORT(int, wxPrinter_Setup)(void* _obj, void* parent)
-{
-	return (int)((wxPrinter*)_obj)->Setup((wxWindow*)parent);
-}
-	
-EWXWEXPORT(int, wxPrinter_Print)(void* _obj, void* parent, void* printout, int prompt)
-{
-	return (int)((wxPrinter*)_obj)->Print((wxWindow*)parent, (wxPrintout*)printout, prompt != 0);
-}
-	
-EWXWEXPORT(void*, wxPrinter_PrintDialog)(void* _obj, void* parent)
-{
-	return (void*)((wxPrinter*)_obj)->PrintDialog((wxWindow*)parent);
-}
-	
-EWXWEXPORT(void*, ELJPrintout_Create)(void* title, void* _obj, void* _DoOnBeginDocument, void* _DoOnEndDocument, void* _DoOnBeginPrinting, void* _DoOnEndPrinting, void* _DoOnPreparePrinting, void* _DoOnPrintPage, void* _DoOnHasPage, void* DoOnPageInfo)
-{
-	return (void*) new ELJPrintout( title, _obj, _DoOnBeginDocument, _DoOnEndDocument, _DoOnBeginPrinting, _DoOnEndPrinting, _DoOnPreparePrinting, _DoOnPrintPage, _DoOnHasPage, DoOnPageInfo);
-}
-EWXWEXPORT(void, ELJPrintout_Delete)(void* _obj)
-{
-	delete (ELJPrintout*)_obj;
-}
-
-EWXWEXPORT(int, ELJPrintout_GetTitle)(void* _obj, void* _buf)
-{
-	wxString title = ((ELJPrintout*)_obj)->GetTitle();
-	if (_buf) wxStrncpy ((wxChar*)_buf, title.c_str(), title.Length());
-	return title.Length();
-}
-	
-EWXWEXPORT(void*, ELJPrintout_GetDC)(void* _obj)
-{
-	return (void*)((ELJPrintout*)_obj)->GetDC();
-}
-	
-EWXWEXPORT(void, ELJPrintout_SetDC)(void* _obj, void* dc)
-{
-	((ELJPrintout*)_obj)->SetDC((wxDC*)dc);
-}
-	
-EWXWEXPORT(void, ELJPrintout_SetPageSizePixels)(void* _obj, int w, int  h)
-{
-	((ELJPrintout*)_obj)->SetPageSizePixels(w, h);
-}
-	
-EWXWEXPORT(void, ELJPrintout_GetPageSizePixels)(void* _obj, void* w, void* h)
-{
-	((ELJPrintout*)_obj)->GetPageSizePixels((int*)w, (int*)h);
-}
-	
-EWXWEXPORT(void, ELJPrintout_SetPageSizeMM)(void* _obj, int w, int  h)
-{
-	((ELJPrintout*)_obj)->SetPageSizeMM(w, h);
-}
-	
-EWXWEXPORT(void, ELJPrintout_GetPageSizeMM)(void* _obj, void* w, void* h)
-{
-	((ELJPrintout*)_obj)->GetPageSizeMM((int*)w, (int*)h);
-}
-	
-EWXWEXPORT(void, ELJPrintout_SetPPIScreen)(void* _obj, int x, int y)
-{
-	((ELJPrintout*)_obj)->SetPPIScreen(x, y);
-}
-	
-EWXWEXPORT(void, ELJPrintout_GetPPIScreen)(void* _obj, void* x, void* y)
-{
-	((ELJPrintout*)_obj)->GetPPIScreen((int*)x, (int*)y);
-}
-	
-EWXWEXPORT(void, ELJPrintout_SetPPIPrinter)(void* _obj, int x, int y)
-{
-	((ELJPrintout*)_obj)->SetPPIPrinter(x, y);
-}
-	
-EWXWEXPORT(void, ELJPrintout_GetPPIPrinter)(void* _obj, void* x, void* y)
-{
-	((ELJPrintout*)_obj)->GetPPIPrinter((int*)x, (int*)y);
-}
-	
-EWXWEXPORT(int, ELJPrintout_IsPreview)(void* _obj)
-{
-	return (int)((ELJPrintout*)_obj)->IsPreview();
-}
-	
-EWXWEXPORT(void, ELJPrintout_SetIsPreview)(void* _obj, int p)
-{
-	((ELJPrintout*)_obj)->SetIsPreview(p != 0);
-}
-
-EWXWEXPORT(void*, wxPreviewCanvas_Create) (void* preview, void* parent, int x, int y, int w, int h, int style)
-{
-	return (void*) new wxPreviewCanvas(	(wxPrintPreviewBase*)preview,
-										(wxWindow*)parent,
-                    					wxPoint(x, y),
-                    					wxSize(w, h),
-                    					(long)style);
-}
-
-EWXWEXPORT(void*, ELJPreviewFrame_Create) (void* _obj, void* _init, void* _create_canvas, void* _create_toolbar, void* preview, void* parent, void* title,int x, int y,int w, int h, int style)
-{
-    return (void*) new ELJPreviewFrame(_obj, _init, _create_canvas, _create_toolbar, preview, parent, title, x, y, w, h, style);
-}
-
-EWXWEXPORT(void, ELJPreviewFrame_Initialize) (void* _obj)
-{
-	((ELJPreviewFrame*)_obj)->Initialize();
-}
-	
-EWXWEXPORT(void, ELJPreviewFrame_SetPreviewCanvas) (void* _obj, void* obj)
-{
-	((ELJPreviewFrame*)_obj)->SetPreviewCanvas (obj);
-}
-	
-EWXWEXPORT(void, ELJPreviewFrame_SetControlBar) (void* _obj, void* obj)
-{
-	((ELJPreviewFrame*)_obj)->SetControlBar (obj);
-}
-	
-EWXWEXPORT(void, ELJPreviewFrame_SetPrintPreview) (void* _obj, void* obj)
-{
-	((ELJPreviewFrame*)_obj)->SetPrintPreview (obj);
-}
-	
-EWXWEXPORT(void*, ELJPreviewFrame_GetPreviewCanvas) (void* _obj)
-{
-	return (void*)((ELJPreviewFrame*)_obj)->GetPreviewCanvas ();
-}
-	
-EWXWEXPORT(void*, ELJPreviewFrame_GetControlBar) (void* _obj)
-{
-	return (void*)((ELJPreviewFrame*)_obj)->GetControlBar ();
-}
-	
-EWXWEXPORT(void*, ELJPreviewFrame_GetPrintPreview) (void* _obj)
-{
-	return (void*)((ELJPreviewFrame*)_obj)->GetPrintPreview ();
-}
-	
-EWXWEXPORT(void*, ELJPreviewControlBar_Create) (void* preview, int buttons, void* parent, void* title,int x, int y,int w, int h, int style)
-{
-    return (void*) new wxPreviewControlBar((wxPrintPreviewBase*)preview, (long)buttons, (wxWindow*)parent, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-
-EWXWEXPORT(void*, wxPrintPreview_CreateFromDialogData) (void* printout, void* printoutForPrinting, void* data)
-{
-    return (void*) new wxPrintPreview((wxPrintout*)printout, (wxPrintout*)printoutForPrinting, (wxPrintDialogData*)data);
-}
-
-EWXWEXPORT(void*, wxPrintPreview_CreateFromData) (void* printout, void* printoutForPrinting, void* data)
-{
-    return (void*) new wxPrintPreview((wxPrintout*)printout, (wxPrintout*)printoutForPrinting, (wxPrintData*)data);
-}
-
-EWXWEXPORT(void, wxPrintPreview_Delete)(void* _obj)
-{
-	delete (wxPrintPreview*)_obj;
-}
-
-EWXWEXPORT(int, wxPrintPreview_SetCurrentPage)(void* _obj, int pageNum)
-{
-	return (int)((wxPrintPreview*)_obj)->SetCurrentPage(pageNum);
-}
-	
-EWXWEXPORT(int, wxPrintPreview_GetCurrentPage)(void* _obj)
-{
-	return ((wxPrintPreview*)_obj)->GetCurrentPage();
-}
-	
-EWXWEXPORT(void, wxPrintPreview_SetPrintout)(void* _obj, void* printout)
-{
-	((wxPrintPreview*)_obj)->SetPrintout((wxPrintout*)printout);
-}
-	
-EWXWEXPORT(void*, wxPrintPreview_GetPrintout)(void* _obj)
-{
-	return (void*)((wxPrintPreview*)_obj)->GetPrintout();
-}
-	
-EWXWEXPORT(void*, wxPrintPreview_GetPrintoutForPrinting)(void* _obj)
-{
-	return (void*)((wxPrintPreview*)_obj)->GetPrintoutForPrinting();
-}
-	
-EWXWEXPORT(void, wxPrintPreview_SetFrame)(void* _obj, void* frame)
-{
-	((wxPrintPreview*)_obj)->SetFrame((wxFrame*)frame);
-}
-	
-EWXWEXPORT(void, wxPrintPreview_SetCanvas)(void* _obj, void* canvas)
-{
-	((wxPrintPreview*)_obj)->SetCanvas((wxPreviewCanvas*)canvas);
-}
-	
-EWXWEXPORT(void*, wxPrintPreview_GetFrame)(void* _obj)
-{
-	return (void*)((wxPrintPreview*)_obj)->GetFrame();
-}
-	
-EWXWEXPORT(void*, wxPrintPreview_GetCanvas)(void* _obj)
-{
-	return (void*)((wxPrintPreview*)_obj)->GetCanvas();
-}
-	
-EWXWEXPORT(int, wxPrintPreview_PaintPage)(void* _obj, void* canvas, void* dc)
-{
-	return (int)((wxPrintPreview*)_obj)->PaintPage((wxPreviewCanvas*)canvas, *((wxDC*)dc));
-}
-	
-EWXWEXPORT(int, wxPrintPreview_DrawBlankPage)(void* _obj, void* canvas, void* dc)
-{
-	return (int)((wxPrintPreview*)_obj)->DrawBlankPage((wxPreviewCanvas*)canvas, *((wxDC*)dc));
-}
-	
-EWXWEXPORT(int, wxPrintPreview_RenderPage)(void* _obj, int pageNum)
-{
-	return (int)((wxPrintPreview*)_obj)->RenderPage(pageNum);
-}
-	
-EWXWEXPORT(void, wxPrintPreview_GetPrintDialogData)(void* _obj, void* _ref)
-{
-	*((wxPrintDialogData*)_ref) = ((wxPrintPreview*)_obj)->GetPrintDialogData();
-}
-	
-EWXWEXPORT(void, wxPrintPreview_SetZoom)(void* _obj, int percent)
-{
-	((wxPrintPreview*)_obj)->SetZoom(percent);
-}
-	
-EWXWEXPORT(int, wxPrintPreview_GetZoom)(void* _obj)
-{
-	return ((wxPrintPreview*)_obj)->GetZoom();
-}
-	
-EWXWEXPORT(int, wxPrintPreview_GetMaxPage)(void* _obj)
-{
-	return ((wxPrintPreview*)_obj)->GetMaxPage();
-}
-	
-EWXWEXPORT(int, wxPrintPreview_GetMinPage)(void* _obj)
-{
-	return ((wxPrintPreview*)_obj)->GetMinPage();
-}
-	
-EWXWEXPORT(int, wxPrintPreview_Ok)(void* _obj)
-{
-	return (int)((wxPrintPreview*)_obj)->Ok();
-}
-	
-EWXWEXPORT(void, wxPrintPreview_SetOk)(void* _obj, int ok)
-{
-	((wxPrintPreview*)_obj)->SetOk(ok != 0);
-}
-	
-EWXWEXPORT(int, wxPrintPreview_Print)(void* _obj, int interactive)
-{
-	return (int)((wxPrintPreview*)_obj)->Print(interactive != 0);
-}
-	
-EWXWEXPORT(void, wxPrintPreview_DetermineScaling)(void* _obj)
-{
-	((wxPrintPreview*)_obj)->DetermineScaling();
-}
-	
-EWXWEXPORT(void*, wxPrintData_Create)()
-{
-	return (void*) new wxPrintData();
-}
-
-EWXWEXPORT(void, wxPrintData_Delete)(void* _obj)
-{
-    delete (wxPrintData*)_obj;
-}
-
-EWXWEXPORT(void*, wxPostScriptPrintNativeData_Create)()
-{
-#ifdef wxUSE_POSTSCRIPT
-	return (void*) new wxPostScriptPrintNativeData();
-#else
-	return NULL;
-#endif
-}
-
-EWXWEXPORT(void, wxPostScriptPrintNativeData_Delete)(void* _obj)
-{
-#ifdef wxUSE_POSTSCRIPT
-    delete (wxPostScriptPrintNativeData*)_obj;
-#endif
-}
-
-EWXWEXPORT(int, wxPrintData_GetNoCopies)(void* _obj)
-{
-	return ((wxPrintData*)_obj)->GetNoCopies();
-}
-	
-EWXWEXPORT(int, wxPrintData_GetCollate)(void* _obj)
-{
-	return (int)((wxPrintData*)_obj)->GetCollate();
-}
-	
-EWXWEXPORT(int, wxPrintData_GetOrientation)(void* _obj)
-{
-	return ((wxPrintData*)_obj)->GetOrientation();
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPrinterName)(void* _obj, void* _ref)
-{
-	wxString tmp = ((wxPrintData*)_obj)->GetPrinterName();
-	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
-	return tmp.Length();
-}
-	
-EWXWEXPORT(int, wxPrintData_GetColour)(void* _obj)
-{
-	return (int)((wxPrintData*)_obj)->GetColour();
-}
-	
-EWXWEXPORT(int, wxPrintData_GetDuplex)(void* _obj)
-{
-	return (int)((wxPrintData*)_obj)->GetDuplex();
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPaperId)(void* _obj)
-{
-	return (int)((wxPrintData*)_obj)->GetPaperId();
-}
-	
-EWXWEXPORT(void, wxPrintData_GetPaperSize)(void* _obj, void* w, void* h)
-{
-	wxSize tmp = ((wxPrintData*)_obj)->GetPaperSize();
-	*((int*)w) = tmp.x;
-	*((int*)h) = tmp.y;
-}
-	
-EWXWEXPORT(int, wxPrintData_GetQuality)(void* _obj)
-{
-	return (int)((wxPrintData*)_obj)->GetQuality();
-}
-	
-EWXWEXPORT(void, wxPrintData_SetNoCopies)(void* _obj, int v)
-{
-	((wxPrintData*)_obj)->SetNoCopies(v);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetCollate)(void* _obj, int flag)
-{
-	((wxPrintData*)_obj)->SetCollate(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetOrientation)(void* _obj, int orient)
-{
-	((wxPrintData*)_obj)->SetOrientation(orient);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterName)(void* _obj, void* name)
-{
-	((wxPrintData*)_obj)->SetPrinterName((wxChar*)name);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetColour)(void* _obj, int colour)
-{
-	((wxPrintData*)_obj)->SetColour(colour != 0);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetDuplex)(void* _obj, int duplex)
-{
-	((wxPrintData*)_obj)->SetDuplex((wxDuplexMode)duplex);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPaperId)(void* _obj, int sizeId)
-{
-	((wxPrintData*)_obj)->SetPaperId((wxPaperSize)sizeId);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPaperSize)(void* _obj, int w, int h)
-{
-	((wxPrintData*)_obj)->SetPaperSize(wxSize(w, h));
-}
-	
-EWXWEXPORT(void, wxPrintData_SetQuality)(void* _obj, int quality)
-{
-	((wxPrintData*)_obj)->SetQuality((wxPrintQuality)quality);
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPrinterCommand)(void* _obj, void* _ref)
-{
-#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
-#ifdef wxUSE_POSTSCRIPT
-	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterCommand();
-#else
-	wxString tmp = ((wxPrintData*)_obj)->GetPrinterCommand();
-#endif
-	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
-	return tmp.Length();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPrinterOptions)(void* _obj, void* _ref)
-{
-#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
-#ifdef wxUSE_POSTSCRIPT
-	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetPrinterOptions();
-#else
-	wxString tmp = ((wxPrintData*)_obj)->GetPrinterOptions();
-#endif
-	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
-	return tmp.Length();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPreviewCommand)(void* _obj, void* _ref)
-{
-#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
-#ifdef wxUSE_POSTSCRIPT
-	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetPreviewCommand();
-#else
-	wxString tmp = ((wxPrintData*)_obj)->GetPreviewCommand();
-#endif
-	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
-	return tmp.Length();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(int, wxPrintData_GetFilename)(void* _obj, void* _ref)
-{
-	wxString tmp = ((wxPrintData*)_obj)->GetFilename();
-	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
-	return tmp.Length();
-}
-	
-EWXWEXPORT(int, wxPrintData_GetFontMetricPath)(void* _obj, void* _ref)
-{
-#if wxVERSION_NUMBER < 2600 || defined (wxUSE_POSTSCRIPT)
-#ifdef wxUSE_POSTSCRIPT
-	wxString tmp = ((wxPostScriptPrintNativeData*)_obj)->GetFontMetricPath();
-#else
-	wxString tmp = ((wxPrintData*)_obj)->GetFontMetricPath();
-#endif
-	if (_ref) wxStrncpy ((wxChar*)_ref, tmp.c_str(), tmp.Length());
-	return tmp.Length();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(double, wxPrintData_GetPrinterScaleX)(void* _obj)
-{
-#ifdef wxUSE_POSTSCRIPT
-	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterScaleX();
-#elif wxVERSION_NUMBER < 2600
-	return ((wxPrintData*)_obj)->GetPrinterScaleX();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(double, wxPrintData_GetPrinterScaleY)(void* _obj)
-{
-#ifdef wxUSE_POSTSCRIPT
-	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterScaleY();
-#elif wxVERSION_NUMBER < 2600
-	return ((wxPrintData*)_obj)->GetPrinterScaleY();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPrinterTranslateX)(void* _obj)
-{
-#ifdef wxUSE_POSTSCRIPT
-	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterTranslateX();
-#elif wxVERSION_NUMBER < 2600
-	return ((wxPrintData*)_obj)->GetPrinterTranslateX();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPrinterTranslateY)(void* _obj)
-{
-#ifdef wxUSE_POSTSCRIPT
-	return ((wxPostScriptPrintNativeData*)_obj)->GetPrinterTranslateY();
-#elif wxVERSION_NUMBER < 2600
-	return ((wxPrintData*)_obj)->GetPrinterTranslateY();
-#else
-	return false;
-#endif
-}
-	
-EWXWEXPORT(int, wxPrintData_GetPrintMode)(void* _obj)
-{
-	return (int)((wxPrintData*)_obj)->GetPrintMode();
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterCommand)(void* _obj, void* command)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterCommand((wxChar*)command);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterCommand((wxChar*)command);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterOptions)(void* _obj, void* options)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterOptions((wxChar*)options);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterOptions((wxChar*)options);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPreviewCommand)(void* _obj, void* command)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPreviewCommand((wxChar*)command);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPreviewCommand((wxChar*)command);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetFilename)(void* _obj, void* filename)
-{
-	((wxPrintData*)_obj)->SetFilename((wxChar*)filename);
-}
-	
-EWXWEXPORT(void, wxPrintData_SetFontMetricPath)(void* _obj, void* path)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetFontMetricPath((wxChar*)path);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetFontMetricPath((wxChar*)path);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterScaleX)(void* _obj, double x)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaleX(x);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterScaleX(x);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterScaleY)(void* _obj, double y)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaleY(y);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterScaleY(y);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterScaling)(void* _obj, double x, double y)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterScaling(x, y);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterScaling(x, y);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterTranslateX)(void* _obj, int x)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslateX((int)x);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterTranslateX((int)x);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterTranslateY)(void* _obj, int y)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslateY((int)y);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterTranslateY((long)y);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrinterTranslation)(void* _obj, int x, int y)
-{
-#ifdef wxUSE_POSTSCRIPT
-	((wxPostScriptPrintNativeData*)_obj)->SetPrinterTranslation((long)x, (long)y);
-#elif wxVERSION_NUMBER < 2600
-	((wxPrintData*)_obj)->SetPrinterTranslation((long)x, (long)y);
-#endif
-}
-	
-EWXWEXPORT(void, wxPrintData_SetPrintMode)(void* _obj, int printMode)
-{
-	((wxPrintData*)_obj)->SetPrintMode((wxPrintMode)printMode);
-}
-	
-EWXWEXPORT(void, wxPrintData_Assign)(void* _obj, void* data)
-{
-	*((wxPrintData*)_obj) = *((wxPrintData*)data);
-}
-	
-EWXWEXPORT(void*, wxPrintDialogData_CreateDefault)()
-{
-	return (void*) new wxPrintDialogData();
-}
-
-EWXWEXPORT(void*, wxPrintDialogData_CreateFromData)(void* printData)
-{
-	return (void*) new wxPrintDialogData(*((wxPrintData*)printData));
-}
-
-EWXWEXPORT(void, wxPrintDialogData_Delete) (void* _obj)
-{
-	delete (wxPrintDialogData*)_obj;
-}
-
-EWXWEXPORT(int, wxPrintDialogData_GetFromPage)(void* _obj)
-{
-	return ((wxPrintDialogData*)_obj)->GetFromPage();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetToPage)(void* _obj)
-{
-	return ((wxPrintDialogData*)_obj)->GetToPage();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetMinPage)(void* _obj)
-{
-	return ((wxPrintDialogData*)_obj)->GetMinPage();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetMaxPage)(void* _obj)
-{
-	return ((wxPrintDialogData*)_obj)->GetMaxPage();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetNoCopies)(void* _obj)
-{
-	return ((wxPrintDialogData*)_obj)->GetNoCopies();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetAllPages)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetAllPages();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetSelection)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetCollate)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetCollate();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetPrintToFile)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetPrintToFile();
-}
-
-EWXWEXPORT(void, wxPrintDialogData_SetFromPage)(void* _obj, int v)
-{
-	((wxPrintDialogData*)_obj)->SetFromPage(v);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetToPage)(void* _obj, int v)
-{
-	((wxPrintDialogData*)_obj)->SetToPage(v);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetMinPage)(void* _obj, int v)
-{
-	((wxPrintDialogData*)_obj)->SetMinPage(v);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetMaxPage)(void* _obj, int v)
-{
-	((wxPrintDialogData*)_obj)->SetMaxPage(v);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetNoCopies)(void* _obj, int v)
-{
-	((wxPrintDialogData*)_obj)->SetNoCopies(v);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetAllPages)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->SetAllPages(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetSelection)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->SetSelection(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetCollate)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->SetCollate(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetPrintToFile)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->SetPrintToFile(flag != 0);
-}
-
-EWXWEXPORT(void, wxPrintDialogData_EnablePrintToFile)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->EnablePrintToFile(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_EnableSelection)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->EnableSelection(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_EnablePageNumbers)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->EnablePageNumbers(flag != 0);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_EnableHelp)(void* _obj, int flag)
-{
-	((wxPrintDialogData*)_obj)->EnableHelp(flag != 0);
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetEnablePrintToFile)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetEnablePrintToFile();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetEnableSelection)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetEnableSelection();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetEnablePageNumbers)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetEnablePageNumbers();
-}
-	
-EWXWEXPORT(int, wxPrintDialogData_GetEnableHelp)(void* _obj)
-{
-	return (int)((wxPrintDialogData*)_obj)->GetEnableHelp();
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_GetPrintData)(void* _obj, void* _ref)
-{
-	*((wxPrintData*)_ref) = ((wxPrintDialogData*)_obj)->GetPrintData();
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_SetPrintData)(void* _obj, void* printData)
-{
-	((wxPrintDialogData*)_obj)->SetPrintData(*((wxPrintData*)printData));
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_Assign)(void* _obj, void* data)
-{
-	*((wxPrintDialogData*)_obj) = *((wxPrintDialogData*)data);
-}
-	
-EWXWEXPORT(void, wxPrintDialogData_AssignData)(void* _obj, void* data)
-{
-	*((wxPrintDialogData*)_obj) = *((wxPrintData*)data);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljprocess.cpp b/wxc/src/ewxw/eljprocess.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljprocess.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include "wrapper.h"
-#include "wx/process.h"
-
-extern "C"
-
-{
-
-EWXWEXPORT(void*, wxProcess_CreateDefault)(void* _prt, int _id)
-{
-	return (void*)new wxProcess ((wxEvtHandler*)_prt, _id);
-}
-
-EWXWEXPORT(void*, wxProcess_CreateRedirect)(void* _prt, int _rdr)
-{
-	return (void*)new wxProcess ((wxEvtHandler*)_prt, _rdr != 0);
-}
-
-EWXWEXPORT(void, wxProcess_Delete)(void* _obj)
-{
-    delete (wxProcess*)_obj;
-}
-
-EWXWEXPORT(void, wxProcess_Redirect)(void* _obj)
-{
-	((wxProcess*)_obj)->Redirect();
-}
-	
-EWXWEXPORT(int, wxProcess_IsRedirected)(void* _obj)
-{
-	return (int)((wxProcess*)_obj)->IsRedirected();
-}
-	
-EWXWEXPORT(void, wxProcess_Detach)(void* _obj)
-{
-	((wxProcess*)_obj)->Detach();
-}
-	
-EWXWEXPORT(void*, wxProcess_GetInputStream)(void* _obj)
-{
-	return (void*)((wxProcess*)_obj)->GetInputStream();
-}
-	
-EWXWEXPORT(void*, wxProcess_GetErrorStream)(void* _obj)
-{
-	return (void*)((wxProcess*)_obj)->GetErrorStream();
-}
-	
-EWXWEXPORT(void*, wxProcess_GetOutputStream)(void* _obj)
-{
-	return (void*)((wxProcess*)_obj)->GetOutputStream();
-}
-	
-EWXWEXPORT(void, wxProcess_CloseOutput)(void* _obj)
-{
-	((wxProcess*)_obj)->CloseOutput();
-}
-	
-
-EWXWEXPORT(int, wxProcessEvent_GetPid)(void* _obj)
-{
-	return ((wxProcessEvent*)_obj)->GetPid();
-}
-
-EWXWEXPORT(int, wxProcessEvent_GetExitCode)(void* _obj)
-{
-	return ((wxProcessEvent*)_obj)->GetExitCode();
-}
-
-
-EWXWEXPORT(int, wxStreamBase_GetLastError)(void* _obj)
-{
-	return (int)((wxStreamBase*)_obj)->GetLastError();
-}
-	
-EWXWEXPORT(int, wxStreamBase_IsOk)(void* _obj)
-{
-	return (int)((wxStreamBase*)_obj)->IsOk();
-}
-	
-EWXWEXPORT(int, wxStreamBase_GetSize)(void* _obj)
-{
-	return (int)((wxStreamBase*)_obj)->GetSize();
-}
-	
-
-EWXWEXPORT(void, wxOutputStream_Delete)(void* _obj)
-{
-	delete (wxOutputStream*)_obj;
-}
-
-EWXWEXPORT(void, wxOutputStream_PutC)(void* _obj, char c)
-{
-	((wxOutputStream*)_obj)->PutC(c);
-}
-	
-EWXWEXPORT(void, wxOutputStream_Write)(void* _obj, void* buffer, int size)
-{
-	((wxOutputStream*)_obj)->Write((const void*)buffer, (size_t)size);
-}
-	
-EWXWEXPORT(int, wxOutputStream_Seek)(void* _obj, int pos, int mode)
-{
-	return (int)((wxOutputStream*)_obj)->SeekO((off_t)pos, (wxSeekMode)mode);
-}
-	
-EWXWEXPORT(int, wxOutputStream_Tell)(void* _obj)
-{
-	return (int)((wxOutputStream*)_obj)->TellO();
-}
-	
-EWXWEXPORT(int, wxOutputStream_LastWrite)(void* _obj)
-{
-	return (int)((wxOutputStream*)_obj)->LastWrite();
-}
-	
-EWXWEXPORT(void, wxOutputStream_Sync)(void* _obj)
-{
-	((wxOutputStream*)_obj)->Sync();
-}
-	
-
-EWXWEXPORT(void, wxInputStream_Delete)(void* _obj)
-{
-	delete (wxInputStream*)_obj;
-}
-
-EWXWEXPORT(int, wxInputStream_Eof)(void* _obj)
-{
-	return (int)((wxInputStream*)_obj)->Eof();
-}
-	
-EWXWEXPORT(char, wxInputStream_Peek)(void* _obj)
-{
-	return ((wxInputStream*)_obj)->Peek();
-}
-	
-EWXWEXPORT(char, wxInputStream_GetC)(void* _obj)
-{
-	return ((wxInputStream*)_obj)->GetC();
-}
-	
-EWXWEXPORT(void, wxInputStream_Read)(void* _obj, void *buffer, int size)
-{
-	((wxInputStream*)_obj)->Read(buffer, (size_t)size);
-}
-	
-EWXWEXPORT(int, wxInputStream_SeekI)(void* _obj, int pos, int mode)
-{
-	return (int)((wxInputStream*)_obj)->SeekI((off_t)pos, (wxSeekMode)mode);
-}
-	
-EWXWEXPORT(int, wxInputStream_Tell)(void* _obj)
-{
-	return (int)((wxInputStream*)_obj)->TellI();
-}
-	
-EWXWEXPORT(int, wxInputStream_LastRead)(void* _obj)
-{
-	return (int)((wxInputStream*)_obj)->LastRead();
-}	
-
-EWXWEXPORT(int, wxInputStream_UngetBuffer)(void* _obj, void* buffer, int size)
-{
-	return (int)((wxInputStream*)_obj)->Ungetch((const void*)buffer, (size_t)size);
-}
-	
-EWXWEXPORT(int, wxInputStream_Ungetch)(void* _obj, char c)
-{
-	return (int)((wxInputStream*)_obj)->Ungetch(c);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljradiobox.cpp b/wxc/src/ewxw/eljradiobox.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljradiobox.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxRadioBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _n, void* _str, int _dim, int _stl)
-{
-	wxString items[256];
-
-	for (int i = 0; i < _n; i++)
-		items[i] = ((wxChar**)_str)[i];
-
-	return (void*) new wxRadioBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _n, items, _dim, _stl, wxDefaultValidator);
-}
-
-EWXWEXPORT(int, wxRadioBox_FindString)(void* _obj, void* s)
-{
-	return ((wxRadioBox*)_obj)->FindString((wxChar*) s);
-}
-	
-EWXWEXPORT(void, wxRadioBox_SetSelection)(void* _obj, int _n)
-{
-	((wxRadioBox*)_obj)->SetSelection(_n);
-}
-	
-EWXWEXPORT(int, wxRadioBox_GetSelection)(void* _obj)
-{
-	return ((wxRadioBox*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(void, wxRadioBox_SetItemLabel)(void* _obj, int item, void* label)
-{
-#if wxVERSION_NUMBER >= 2400
-	((wxRadioBoxBase*)_obj)->SetString(item, (wxChar*)label);
-#else
-	((wxRadioBox*)_obj)->SetLabel(item, (wxChar*)label);
-#endif
-}
-	
-EWXWEXPORT(void, wxRadioBox_SetItemBitmap)(void* _obj, int item, void* bitmap)
-{
-#if wxVERSION_NUMBER < 2400
-	((wxRadioBox*)_obj)->SetLabel(item, (wxBitmap*) bitmap);
-#endif
-}
-	
-EWXWEXPORT(int, wxRadioBox_GetItemLabel)(void* _obj, int item, void* _buf)
-{
-#if wxVERSION_NUMBER >= 2400
-	wxString result = ((wxRadioBox*)_obj)->GetString(item);
-#else
-	wxString result = ((wxRadioBox*)_obj)->GetLabel(item);
-#endif
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxRadioBox_EnableItem)(void* _obj, int item, int enable)
-{
-	((wxRadioBox*)_obj)->Enable(item, enable != 0);
-}
-	
-EWXWEXPORT(void, wxRadioBox_ShowItem)(void* _obj, int item, int show)
-{
-	((wxRadioBox*)_obj)->Show(item, show != 0);
-}
-	
-EWXWEXPORT(int, wxRadioBox_GetStringSelection)(void* _obj, void* _buf)
-{
-	wxString result = ((wxRadioBox*)_obj)->GetStringSelection();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxRadioBox_SetStringSelection)(void* _obj, void* s)
-{
-	((wxRadioBox*)_obj)->SetStringSelection((wxChar*) s);
-}
-	
-EWXWEXPORT(int, wxRadioBox_Number)(void* _obj)
-{
-#if wxVERSION_NUMBER >= 2400
-	return ((wxRadioBox*)_obj)->GetCount();
-#else
-	return ((wxRadioBox*)_obj)->Number();
-#endif
-}
-	
-EWXWEXPORT(int, wxRadioBox_GetNumberOfRowsOrCols)(void* _obj)
-{
-#if wxVERSION_NUMBER >= 2600
-	return ((wxRadioBox*)_obj)->GetCount();
-#else
-	return ((wxRadioBox*)_obj)->GetNumberOfRowsOrCols();
-#endif
-}
-	
-EWXWEXPORT(void, wxRadioBox_SetNumberOfRowsOrCols)(void* _obj, int n)
-{
-#if wxVERSION_NUMBER >= 2600
-	return;
-#else
-	((wxRadioBox*)_obj)->SetNumberOfRowsOrCols(n);
-#endif
-}
-
-}
diff --git a/wxc/src/ewxw/eljradiobutton.cpp b/wxc/src/ewxw/eljradiobutton.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljradiobutton.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxRadioButton_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxRadioButton ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
-}
-
-EWXWEXPORT(void, wxRadioButton_SetValue)(void* _obj, int value)
-{
-	((wxRadioButton*)_obj)->SetValue(value != 0);
-}
-	
-EWXWEXPORT(int, wxRadioButton_GetValue)(void* _obj)
-{
-	return (int)((wxRadioButton*)_obj)->GetValue();
-}
-
-} 
diff --git a/wxc/src/ewxw/eljrc.cpp b/wxc/src/ewxw/eljrc.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljrc.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-
-#ifdef __WIN32__
-#define LoadBitmap LoadBitmapA
-#define LoadIcon LoadIconA
-#endif
-
-#include "eljscintilla.h"
-#include "wx/xrc/xmlres.h"
-
-class wxMDIParentFrameXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxMDIParentFrameXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-class wxMDIChildFrameXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxMDIChildFrameXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-class wxSplitterWindowXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSplitterWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-class wxScintillaXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxScintillaXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-class wxGridXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxGridXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-wxMDIParentFrameXmlHandler::wxMDIParentFrameXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-    XRC_ADD_STYLE(wxCAPTION);
-    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
-    XRC_ADD_STYLE(wxTHICK_FRAME);
-    XRC_ADD_STYLE(wxSYSTEM_MENU);
-    XRC_ADD_STYLE(wxRESIZE_BORDER);
-    XRC_ADD_STYLE(wxRESIZE_BOX);
-
-    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
-    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
-    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
-    XRC_ADD_STYLE(wxMINIMIZE_BOX);
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-
-    XRC_ADD_STYLE(wxNO_3D);
-    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
-    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
-
-    AddWindowStyles();
-}
-
-wxObject *wxMDIParentFrameXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(frame, wxMDIParentFrame);
-
-    frame->Create(m_parentAsWindow,
-                  GetID(),
-                  GetText(wxT("title")),
-                  wxDefaultPosition, wxDefaultSize,
-                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
-                  GetName());
-
-    if (HasParam(wxT("size")))
-        frame->SetClientSize(GetSize());
-    if (HasParam(wxT("pos")))
-        frame->Move(GetPosition());
-
-    SetupWindow(frame);
-
-    CreateChildren(frame);
-
-    if (GetBool(wxT("centered"), FALSE))
-        frame->Centre();
-
-    return frame;
-}
-
-bool wxMDIParentFrameXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxMDIParentFrame"));
-}
-
-wxMDIChildFrameXmlHandler::wxMDIChildFrameXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-    XRC_ADD_STYLE(wxCAPTION);
-    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
-    XRC_ADD_STYLE(wxTHICK_FRAME);
-    XRC_ADD_STYLE(wxSYSTEM_MENU);
-    XRC_ADD_STYLE(wxRESIZE_BORDER);
-    XRC_ADD_STYLE(wxRESIZE_BOX);
-
-    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
-    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
-    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
-    XRC_ADD_STYLE(wxMINIMIZE_BOX);
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-
-    XRC_ADD_STYLE(wxNO_3D);
-    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
-    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
-
-    AddWindowStyles();
-}
-
-wxObject *wxMDIChildFrameXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
-	
-	wxMDIParentFrame* prt = wxDynamicCast (m_parentAsWindow, wxMDIParentFrame);
-
-	if (prt == NULL)
-	{
-		wxLogError(wxT("Error in resource: wxMDIChildFrame has no wxMDIParentFrame."));
-		return NULL;
-	}
-
-    frame->Create(prt,
-                  GetID(),
-                  GetText(wxT("title")),
-                  wxDefaultPosition, wxDefaultSize,
-                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
-                  GetName());
-
-    SetupWindow(frame);
-
-    CreateChildren(frame);
-
-    if (GetBool(wxT("centered"), FALSE))
-        frame->Centre();
-
-    return frame;
-}
-
-bool wxMDIChildFrameXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxMDIChildFrame"));
-}
-
-wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxSP_3D);
-    XRC_ADD_STYLE(wxSP_3DSASH);
-    XRC_ADD_STYLE(wxSP_BORDER);
-    XRC_ADD_STYLE(wxSP_FULLSASH);
-    XRC_ADD_STYLE(wxSP_BORDER);
-    XRC_ADD_STYLE(wxSP_NOBORDER);
-    XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);
-    XRC_ADD_STYLE(wxSP_LIVE_UPDATE);
-
-    XRC_ADD_STYLE(wxNO_3D);
-    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
-
-    AddWindowStyles();
-}
-
-wxObject *wxSplitterWindowXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(frame, wxSplitterWindow);
-
-    frame->Create(m_parentAsWindow,
-                  GetID(),
-                  wxDefaultPosition, wxDefaultSize,
-                  GetStyle(wxT("style"), wxSP_3D),
-                  GetName());
-
-    SetupWindow(frame);
-
-    CreateChildren(frame);
-	
-	if (frame->GetChildren().GetCount() != 2)
-	{
-		wxLogError(wxT("Error in resource: Splitter window needs exactly two children."));
-		return NULL;
-	}
-	
-	frame->SetSplitMode(GetLong (wxT("splitmode"), wxSPLIT_VERTICAL));
-	long sashpos = GetLong (wxT("sashposition"), 100);
-	
-	wxWindowList::Node* node = frame->GetChildren().GetFirst();
-	wxWindow* wnd1 = node->GetData();
-	wxWindow* wnd2 = node->GetNext()->GetData();
-
-	if (frame->GetSplitMode() == wxSPLIT_VERTICAL)
-		frame->SplitVertically (wnd1, wnd2, sashpos);
-	else
-		frame->SplitHorizontally (wnd1, wnd2, sashpos);
-	
-    return frame;
-}
-
-bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxSplitterWindow"));
-}
-
-wxScintillaXmlHandler::wxScintillaXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxNO_3D);
-    AddWindowStyles();
-}
-
-wxObject *wxScintillaXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(frame, wxScintilla);
-	
-    frame->Create(m_parentAsWindow,
-                  GetID(),
-                  wxDefaultPosition, wxDefaultSize,
-                  GetStyle(wxT("style"), 0),
-				  wxDefaultValidator,
-                  GetName());
-
-    if (HasParam(wxT("size")))
-        frame->SetSize(GetSize());
-    if (HasParam(wxT("pos")))
-        frame->Move(GetPosition());
-
-    SetupWindow(frame);
-
-    return frame;
-}
-
-bool wxScintillaXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxScintilla"));
-}
-
-wxGridXmlHandler::wxGridXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxNO_3D);
-    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
-
-    AddWindowStyles();
-}
-
-wxObject *wxGridXmlHandler::DoCreateResource()
-{
-	wxGrid* grid = new wxGrid(m_parentAsWindow,
-                              GetID(),
-                              wxDefaultPosition, wxDefaultSize,
-                              GetStyle(wxT("style"), wxWANTS_CHARS),
-                              GetName());
-
-	long cols = GetLong (wxT("numcols"), 0);
-	long rows = GetLong (wxT("numrows"), 0);
-	
-	if (cols && rows)
-		grid->CreateGrid(cols, rows, (wxGrid::wxGridSelectionModes)GetLong (wxT("selmode"), 0));
-	
-    if (HasParam(wxT("size")))
-        grid->SetSize(GetSize());
-    if (HasParam(wxT("pos")))
-        grid->Move(GetPosition());
-
-	SetupWindow(grid);
-
-	return grid;
-}
-
-bool wxGridXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxGrid"));
-}
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxXmlResource_Create)(void* _obj, int flags)
-{
-	return (void*)new wxXmlResource(flags);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_CreateFromFile)(void* _obj, void* filemask, int flags)
-{
-	return (void*)new wxXmlResource((char*)filemask, flags);
-}
-	
-EWXWEXPORT(void,wxXmlResource_Delete)(void* _obj)
-{
-	delete (wxXmlResource*)_obj;
-}
-	
-EWXWEXPORT(int,wxXmlResource_Load)(void* _obj, void* filemask)
-{
-	wxGetApp().InitZipFileSystem();
-	return (int)((wxXmlResource*)_obj)->Load((char*)filemask);
-}
-	
-EWXWEXPORT(void,wxXmlResource_InitAllHandlers)(void* _obj)
-{
-	((wxXmlResource*)_obj)->InitAllHandlers();
-	((wxXmlResource*)_obj)->AddHandler(new wxMDIParentFrameXmlHandler());
-	((wxXmlResource*)_obj)->AddHandler(new wxMDIChildFrameXmlHandler());
-	((wxXmlResource*)_obj)->AddHandler(new wxSplitterWindowXmlHandler());
-	((wxXmlResource*)_obj)->AddHandler(new wxScintillaXmlHandler());
-	((wxXmlResource*)_obj)->AddHandler(new wxGridXmlHandler());
-}
-	
-EWXWEXPORT(void,wxXmlResource_AddHandler)(void* _obj, void* handler)
-{
-	((wxXmlResource*)_obj)->AddHandler((wxXmlResourceHandler*)handler);
-}
-	
-EWXWEXPORT(void,wxXmlResource_InsertHandler)(void* _obj, void* handler)
-{
-	((wxXmlResource*)_obj)->InsertHandler((wxXmlResourceHandler*)handler);
-}
-	
-EWXWEXPORT(void,wxXmlResource_ClearHandlers)(void* _obj)
-{
-	((wxXmlResource*)_obj)->ClearHandlers();
-}
-	
-EWXWEXPORT(void,wxXmlResource_AddSubclassFactory)(void* _obj, void* factory)
-{
-	((wxXmlResource*)_obj)->AddSubclassFactory((wxXmlSubclassFactory*)factory);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_LoadMenu)(void* _obj, void* name)
-{
-	return (void*)((wxXmlResource*)_obj)->LoadMenu((char*)name);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_LoadMenuBar)(void* _obj, void* parent, void* name)
-{
-	return (void*)((wxXmlResource*)_obj)->LoadMenuBar((wxWindow*)parent, (char*)name);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_LoadToolBar)(void* _obj, void* parent, void* name)
-{
-	return (void*)((wxXmlResource*)_obj)->LoadToolBar((wxWindow*)parent, (char*)name);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_LoadDialog)(void* _obj, void* parent, void* name)
-{
-	return (void*)((wxXmlResource*)_obj)->LoadDialog((wxWindow*)parent, (char*)name);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_LoadPanel)(void* _obj, void* parent, void* name)
-{
-	return (void*)((wxXmlResource*)_obj)->LoadPanel((wxWindow*)parent, (char*)name);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_LoadFrame)(void* _obj, void* parent, void* name)
-{
-	return (void*)((wxXmlResource*)_obj)->LoadFrame((wxWindow*)parent, (char*)name);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_LoadObject)(void* _obj, void* parent, void* name, void* classname)
-{
-	return (void*)((wxXmlResource*)_obj)->LoadObject((wxWindow*)parent, (char*)name, (char*)classname);
-}
-	
-EWXWEXPORT(int,wxXmlResource_InitializeObject)(void* _obj, void* _inst, void* parent, void* name, void* classname)
-{
-	return (int)((wxXmlResource*)_obj)->LoadObject((wxObject*)_inst, (wxWindow*)parent, (char*)name, (char*)classname);
-}
-	
-EWXWEXPORT(void,wxXmlResource_LoadBitmap)(void* _obj, void* name, void* _ref)
-{
-	*((wxBitmap*)_ref) = ((wxXmlResource*)_obj)->LoadBitmap((char*)name);
-}
-	
-EWXWEXPORT(void,wxXmlResource_LoadIcon)(void* _obj, void* name, void* _ref)
-{
-	*((wxIcon*)_ref) = ((wxXmlResource*)_obj)->LoadIcon((char*)name);
-}
-	
-EWXWEXPORT(int,wxXmlResource_AttachUnknownControl)(void* _obj, void* name, void* control, void* parent)
-{
-	return (int)((wxXmlResource*)_obj)->AttachUnknownControl((char*)name, (wxWindow*)control, (wxWindow*)parent);
-}
-	
-EWXWEXPORT(int,wxXmlResource_GetXRCID)(void* str_id)
-{
-	return wxXmlResource::GetXRCID((wxChar*)str_id);
-}
-	
-EWXWEXPORT(int,wxXmlResource_GetVersion)(void* _obj)
-{
-	return (int)((wxXmlResource*)_obj)->GetVersion();
-}
-	
-EWXWEXPORT(int,wxXmlResource_CompareVersion)(void* _obj, int major, int minor, int release, int revision)
-{
-	return ((wxXmlResource*)_obj)->CompareVersion(major, minor, release, revision);
-}
-	
-EWXWEXPORT(void*,wxXmlResource_Get)()
-{
-	return (void*)wxXmlResource::Get();
-}
-	
-EWXWEXPORT(void*,wxXmlResource_Set)(void* res)
-{
-	return (void*)wxXmlResource::Set((wxXmlResource*)res);
-}
-	
-EWXWEXPORT(int,wxXmlResource_GetFlags)(void* _obj)
-{
-	return ((wxXmlResource*)_obj)->GetFlags();
-}
-	
-EWXWEXPORT(void,wxXmlResource_SetFlags)(void* _obj, int flags)
-{
-	((wxXmlResource*)_obj)->SetFlags(flags);
-}
-	
-}
-#endif
diff --git a/wxc/src/ewxw/eljregion.cpp b/wxc/src/ewxw/eljregion.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljregion.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-	
-EWXWEXPORT(void*, wxRegion_CreateDefault) ()
-{
-	return (void*) new wxRegion();
-}
-
-EWXWEXPORT(void*, wxRegion_CreateFromRect) (int x, int y, int w, int h)
-{
-	return (void*) new wxRegion((wxCoord)x, (wxCoord)y, (wxCoord)w, (wxCoord)h);
-}
-
-EWXWEXPORT(void, wxRegion_Delete) (void* _obj)
-{
-	delete (wxRegion*)_obj;
-}
-
-EWXWEXPORT(void, wxRegion_Assign)(void* _obj, void* region)
-{
-	*((wxRegion*)_obj) = *((wxRegion*)region);
-}
-
-EWXWEXPORT(void, wxRegion_Clear)(void* _obj)
-{
-	((wxRegion*)_obj)->Clear();
-}
-	
-EWXWEXPORT(int, wxRegion_UnionRect)(void* _obj, int x, int y, int width, int height)
-{
-	return (int)((wxRegion*)_obj)->Union((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(int, wxRegion_UnionRegion)(void* _obj, void* region)
-{
-	return (int)((wxRegion*)_obj)->Union(*((wxRegion*)region));
-}
-	
-EWXWEXPORT(int, wxRegion_IntersectRect)(void* _obj, int x, int y, int width, int height)
-{
-	return (int)((wxRegion*)_obj)->Intersect((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(int, wxRegion_IntersectRegion)(void* _obj, void* region)
-{
-	return (int)((wxRegion*)_obj)->Intersect(*((wxRegion*)region));
-}
-	
-EWXWEXPORT(int, wxRegion_SubtractRect)(void* _obj, int x, int y, int width, int height)
-{
-	return (int)((wxRegion*)_obj)->Subtract((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(int, wxRegion_SubtractRegion)(void* _obj, void* region)
-{
-	return (int)((wxRegion*)_obj)->Subtract(*((wxRegion*)region));
-}
-	
-EWXWEXPORT(int, wxRegion_XorRect)(void* _obj, int x, int y, int width, int height)
-{
-	return (int)((wxRegion*)_obj)->Xor((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-EWXWEXPORT(int, wxRegion_XorRegion)(void* _obj, void* region)
-{
-	return (int)((wxRegion*)_obj)->Xor(*((wxRegion*)region));
-}
-	
-EWXWEXPORT(void, wxRegion_GetBox)(void* _obj, void* x, void* y, void* w, void* h)
-{
-	((wxRegion*)_obj)->GetBox(*((wxCoord*)x), *((wxCoord*)y), *((wxCoord*)w), *((wxCoord*)h));
-}
-	
-EWXWEXPORT(int, wxRegion_Empty)(void* _obj)
-{
-	return (int)((wxRegion*)_obj)->Empty();
-}
-	
-EWXWEXPORT(int, wxRegion_ContainsPoint)(void* _obj, int x, int y)
-{
-	return (int)((wxRegion*)_obj)->Contains((wxCoord)x, (wxCoord)y);
-}
-	
-EWXWEXPORT(int, wxRegion_ContainsRect)(void* _obj, int x, int y, int width, int height)
-{
-	return (int)((wxRegion*)_obj)->Contains((wxCoord)x, (wxCoord)y, (wxCoord)width, (wxCoord)height);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljregioniter.cpp b/wxc/src/ewxw/eljregioniter.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljregioniter.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxRegionIterator_Create)()
-{
-	return (void*) new wxRegionIterator();
-}
-
-EWXWEXPORT(void*, wxRegionIterator_CreateFromRegion)(void* region)
-{
-	return (void*) new wxRegionIterator(*((wxRegion*)region));
-}
-
-EWXWEXPORT(void, wxRegionIterator_Delete)(void* _obj)
-{
-	delete (wxRegionIterator*)_obj;
-}
-
-EWXWEXPORT(void, wxRegionIterator_Reset)(void* _obj)
-{
-	((wxRegionIterator*)_obj)->Reset();
-}
-	
-EWXWEXPORT(void, wxRegionIterator_ResetToRegion)(void* _obj, void* region)
-{
-	((wxRegionIterator*)_obj)->Reset(*((wxRegion*)region));
-}
-	
-EWXWEXPORT(int, wxRegionIterator_HaveRects)(void* _obj)
-{
-	return (int)((wxRegionIterator*)_obj)->HaveRects();
-}
-
-EWXWEXPORT(void, wxRegionIterator_Next)(void* _obj)
-{
-	(*((wxRegionIterator*)_obj))++;
-}
-	
-EWXWEXPORT(int, wxRegionIterator_GetX)(void* _obj)
-{
-	return ((wxRegionIterator*)_obj)->GetX();
-}
-	
-EWXWEXPORT(int, wxRegionIterator_GetY)(void* _obj)
-{
-	return ((wxRegionIterator*)_obj)->GetY();
-}
-	
-EWXWEXPORT(int, wxRegionIterator_GetWidth)(void* _obj)
-{
-	return ((wxRegionIterator*)_obj)->GetWidth();
-}
-	
-EWXWEXPORT(int, wxRegionIterator_GetHeight)(void* _obj)
-{
-	return ((wxRegionIterator*)_obj)->GetHeight();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljsash.cpp b/wxc/src/ewxw/eljsash.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljsash.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxSashWindow_Create) (void* _par, int _id, int _x, int _y, int _w, int _h, int _stl)
-{
-	return (void*) new wxSashWindow ((wxWindow*)_par, _id, wxPoint(_x, _y), wxSize (_w, _h), (long)_stl);
-}
-
-EWXWEXPORT(void, wxSashWindow_SetSashVisible)(void* _obj, int edge, int sash)
-{
-	((wxSashWindow*)_obj)->SetSashVisible((wxSashEdgePosition)edge, sash != 0);
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetSashVisible)(void* _obj, int edge)
-{
-	return (int)((wxSashWindow*)_obj)->GetSashVisible((wxSashEdgePosition)edge);
-}
-	
-EWXWEXPORT(void, wxSashWindow_SetSashBorder)(void* _obj, int edge, int border)
-{
-	((wxSashWindow*)_obj)->SetSashBorder((wxSashEdgePosition)edge, border != 0);
-}
-	
-EWXWEXPORT(int, wxSashWindow_HasBorder)(void* _obj, int edge)
-{
-	return (int)((wxSashWindow*)_obj)->HasBorder((wxSashEdgePosition)edge);
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetEdgeMargin)(void* _obj, int edge)
-{
-	return ((wxSashWindow*)_obj)->GetEdgeMargin((wxSashEdgePosition)edge);
-}
-	
-EWXWEXPORT(void, wxSashWindow_SetDefaultBorderSize)(void* _obj, int width)
-{
-	((wxSashWindow*)_obj)->SetDefaultBorderSize(width);
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetDefaultBorderSize)(void* _obj)
-{
-	return ((wxSashWindow*)_obj)->GetDefaultBorderSize();
-}
-	
-EWXWEXPORT(void, wxSashWindow_SetExtraBorderSize)(void* _obj, int width)
-{
-	((wxSashWindow*)_obj)->SetExtraBorderSize(width);
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetExtraBorderSize)(void* _obj)
-{
-	return ((wxSashWindow*)_obj)->GetExtraBorderSize();
-}
-	
-EWXWEXPORT(void, wxSashWindow_SetMinimumSizeX)(void* _obj, int min)
-{
-	((wxSashWindow*)_obj)->SetMinimumSizeX(min);
-}
-	
-EWXWEXPORT(void, wxSashWindow_SetMinimumSizeY)(void* _obj, int min)
-{
-	((wxSashWindow*)_obj)->SetMinimumSizeY(min);
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetMinimumSizeX)(void* _obj)
-{
-	return ((wxSashWindow*)_obj)->GetMinimumSizeX();
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetMinimumSizeY)(void* _obj)
-{
-	return ((wxSashWindow*)_obj)->GetMinimumSizeY();
-}
-	
-EWXWEXPORT(void, wxSashWindow_SetMaximumSizeX)(void* _obj, int max)
-{
-	((wxSashWindow*)_obj)->SetMaximumSizeX(max);
-}
-	
-EWXWEXPORT(void, wxSashWindow_SetMaximumSizeY)(void* _obj, int max)
-{
-	((wxSashWindow*)_obj)->SetMaximumSizeY(max);
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetMaximumSizeX)(void* _obj)
-{
-	return ((wxSashWindow*)_obj)->GetMaximumSizeX();
-}
-	
-EWXWEXPORT(int, wxSashWindow_GetMaximumSizeY)(void* _obj)
-{
-	return ((wxSashWindow*)_obj)->GetMaximumSizeY();
-}
-
-
-EWXWEXPORT(void*, wxSashEvent_Create) (int id, int edge)
-{
-	return (void*) new wxSashEvent(id, (wxSashEdgePosition)edge);
-}
-
-EWXWEXPORT(void, wxSashEvent_SetEdge)(void* _obj, int edge)
-{
-	((wxSashEvent*)_obj)->SetEdge((wxSashEdgePosition)edge);
-}
-	
-EWXWEXPORT(int, wxSashEvent_GetEdge)(void* _obj)
-{
-	return (int)((wxSashEvent*)_obj)->GetEdge();
-}
-	
-EWXWEXPORT(void, wxSashEvent_SetDragRect)(void* _obj, int x, int y , int w, int h)
-{
-	((wxSashEvent*)_obj)->SetDragRect(wxRect (x, y , w, h));
-}
-	
-EWXWEXPORT(void, wxSashEvent_GetDragRect)(void* _obj, void* x, void* y , void* w, void* h)
-{
-	wxRect tmp = ((wxSashEvent*)_obj)->GetDragRect();
-	(*(int*)x) = tmp.x;
-	(*(int*)y) = tmp.y;
-	(*(int*)w) = tmp.width;
-	(*(int*)h) = tmp.height;
-}
-	
-EWXWEXPORT(void, wxSashEvent_SetDragStatus)(void* _obj, int status)
-{
-	((wxSashEvent*)_obj)->SetDragStatus((wxSashDragStatus)status);
-}
-	
-EWXWEXPORT(int, wxSashEvent_GetDragStatus)(void* _obj)
-{
-	return (int)((wxSashEvent*)_obj)->GetDragStatus();
-}
-	
-
-EWXWEXPORT(void*, wxSashLayoutWindow_Create) (void* _par, int _id, int _x, int _y, int _w, int _h, int _stl)
-{
-	return (void*) new wxSashLayoutWindow ((wxWindow*)_par, _id, wxPoint(_x, _y), wxSize (_w, _h), (long)_stl);
-}
-
-EWXWEXPORT(int, wxSashLayoutWindow_GetAlignment)(void* _obj)
-{
-	return (int)((wxSashLayoutWindow*)_obj)->GetAlignment();
-}
-	
-EWXWEXPORT(int, wxSashLayoutWindow_GetOrientation)(void* _obj)
-{
-	return (int)((wxSashLayoutWindow*)_obj)->GetOrientation();
-}
-	
-EWXWEXPORT(void, wxSashLayoutWindow_SetAlignment)(void* _obj, int align)
-{
-	((wxSashLayoutWindow*)_obj)->SetAlignment((wxLayoutAlignment)align);
-}
-	
-EWXWEXPORT(void, wxSashLayoutWindow_SetOrientation)(void* _obj, int orient)
-{
-	((wxSashLayoutWindow*)_obj)->SetOrientation((wxLayoutOrientation)orient);
-}
-	
-EWXWEXPORT(void, wxSashLayoutWindow_SetDefaultSize)(void* _obj, int w, int h)
-{
-	((wxSashLayoutWindow*)_obj)->SetDefaultSize(wxSize(w, h));
-}
-	
-
-EWXWEXPORT(void*, wxQueryLayoutInfoEvent_Create) (int id)
-{
-	return (void*) new wxQueryLayoutInfoEvent(id);
-}
-
-EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetRequestedLength)(void* _obj, int length)
-{
-	((wxQueryLayoutInfoEvent*)_obj)->SetRequestedLength(length);
-}
-	
-EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetRequestedLength)(void* _obj)
-{
-	return ((wxQueryLayoutInfoEvent*)_obj)->GetRequestedLength();
-}
-	
-EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetFlags)(void* _obj, int flags)
-{
-	((wxQueryLayoutInfoEvent*)_obj)->SetFlags(flags);
-}
-	
-EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetFlags)(void* _obj)
-{
-	return ((wxQueryLayoutInfoEvent*)_obj)->GetFlags();
-}
-	
-EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetSize)(void* _obj, int w, int h)
-{
-	((wxQueryLayoutInfoEvent*)_obj)->SetSize(wxSize(w, h));
-}
-	
-EWXWEXPORT(void, wxQueryLayoutInfoEvent_GetSize)(void* _obj, void* w, void* h)
-{
-	wxSize tmp = ((wxQueryLayoutInfoEvent*)_obj)->GetSize();
-	(*(int*)w) = tmp.x;
-	(*(int*)h) = tmp.y;
-}
-	
-EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetOrientation)(void* _obj, int orient)
-{
-	((wxQueryLayoutInfoEvent*)_obj)->SetOrientation((wxLayoutOrientation)orient);
-}
-	
-EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetOrientation)(void* _obj)
-{
-	return (int)((wxQueryLayoutInfoEvent*)_obj)->GetOrientation();
-}
-	
-EWXWEXPORT(void, wxQueryLayoutInfoEvent_SetAlignment)(void* _obj, int align)
-{
-	((wxQueryLayoutInfoEvent*)_obj)->SetAlignment((wxLayoutAlignment)align);
-}
-	
-EWXWEXPORT(int, wxQueryLayoutInfoEvent_GetAlignment)(void* _obj)
-{
-	return (int)((wxQueryLayoutInfoEvent*)_obj)->GetAlignment();
-}
-	
-
-EWXWEXPORT(void*, wxCalculateLayoutEvent_Create) (int id)
-{
-	return (void*) new wxCalculateLayoutEvent(id);
-}
-
-EWXWEXPORT(void, wxCalculateLayoutEvent_SetFlags)(void* _obj, int flags)
-{
-	((wxCalculateLayoutEvent*)_obj)->SetFlags(flags);
-}
-	
-EWXWEXPORT(int, wxCalculateLayoutEvent_GetFlags)(void* _obj)
-{
-	return ((wxCalculateLayoutEvent*)_obj)->GetFlags();
-}
-	
-EWXWEXPORT(void, wxCalculateLayoutEvent_SetRect)(void* _obj, int x, int y , int w, int h)
-{
-	((wxCalculateLayoutEvent*)_obj)->SetRect(wxRect(x, y, w, h));
-}
-	
-EWXWEXPORT(void, wxCalculateLayoutEvent_GetRect)(void* _obj, void* x, void* y , void* w, void* h)
-{
-	wxRect tmp = ((wxCalculateLayoutEvent*)_obj)->GetRect();
-	(*(int*)x) = tmp.x;
-	(*(int*)y) = tmp.y;
-	(*(int*)w) = tmp.width;
-	(*(int*)h) = tmp.height;
-}
-
-EWXWEXPORT(void*, wxLayoutAlgorithm_Create)()
-{
-	return (void*) new wxLayoutAlgorithm();
-}
-
-EWXWEXPORT(void, wxLayoutAlgorithm_Delete)(void* _obj)
-{
-	delete (wxLayoutAlgorithm*)_obj;
-}
-
-EWXWEXPORT(int, wxLayoutAlgorithm_LayoutMDIFrame)(void* _obj, void* frame, int x, int y , int w, int h, int use)
-{
-	wxRect* r = NULL;
-	if (use) r = new wxRect(x, y, w, h);
-	
-	int result = (int)((wxLayoutAlgorithm*)_obj)->LayoutMDIFrame((wxMDIParentFrame*)frame, r);
-	
-	if (r) delete r;
-	return result;
-}
-	
-EWXWEXPORT(int, wxLayoutAlgorithm_LayoutFrame)(void* _obj, void* frame, void* mainWindow)
-{
-	return (int)((wxLayoutAlgorithm*)_obj)->LayoutFrame((wxFrame*)frame, (wxWindow*)mainWindow);
-}
-	
-EWXWEXPORT(int, wxLayoutAlgorithm_LayoutWindow)(void* _obj, void* frame, void* mainWindow)
-{
-	return (int)((wxLayoutAlgorithm*)_obj)->LayoutWindow((wxFrame*)frame, (wxWindow*)mainWindow);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljscintilla.cpp b/wxc/src/ewxw/eljscintilla.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljscintilla.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-#include "wrapper.h"
-#include "eljscintilla.h"
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxScintilla, wxControl)
-
-#ifdef __WIN32__
-bool wxScintilla::EnsureDll()
-{
-	static bool done = FALSE;
-
-	if (done) return TRUE;
-
-	done = TRUE;
-	return (bool)LoadLibrary (wxT("SciLexer.dll"));
-}
-
-bool wxScintilla::Create(wxWindow *parent,
-                      wxWindowID id,
-                      const wxPoint& pos,
-                      const wxSize& size,
-                      long style,
-                      const wxValidator& validator,
-                      const wxString& name)
-{
-	sc_eiffel = NULL;
-	sc_object = NULL;
-	
-	if (!EnsureDll())
-		return FALSE;
-		
-    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
-        return FALSE;
-
-    parent->AddChild((wxButton *)this);
-
-    long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD /* | WS_CLIPSIBLINGS */ ;
-
-    m_hWnd = (WXHWND)CreateWindowEx
-                     (
-                      m_windowStyle,
-                      /* MakeExtendedStyle(m_windowStyle), */
-                      wxT("Scintilla"),
-                      wxT(""),
-                      msStyle,
-                      0, 0, 0, 0,
-                      GetWinHwnd(parent),
-                      (HMENU)m_windowId,
-                      wxGetInstance(),
-                      NULL
-                     );
-
-    if (m_hWnd == 0)
-    {
-        wxString msg;
-#ifdef __WIN16__
-        msg.Printf(wxT("CreateWindowEx failed"));
-#else
-        msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (long) GetLastError());
-#endif
-        wxFAIL_MSG(msg);
-    }
-
-	m_proc = (ScExec)SendMessage((HWND)m_hWnd, 2184, 0, 0);
-	m_obj  = (void*) SendMessage((HWND)m_hWnd, 2185, 0, 0);
-
-    // Subclass again for purposes of dialog editing mode
-    SubclassWin(m_hWnd);
-
-    SetSize(pos.x, pos.y, size.x, size.y);
-
-    return TRUE;
-}
-
-wxSize wxScintilla::GetDefaultSize()
-{
-    static wxSize s_sizeSci;
-
-    if ( s_sizeSci.x == 0 )
-    {
-		s_sizeSci.x = 200;
-		s_sizeSci.y = 200;
-	}
-	
-	return s_sizeSci;
-
-}
-
-bool wxScintilla::MSWOnNotify(int idCtrl,
-                              WXLPARAM lParam,
-                              WXLPARAM* result)
-{
-    wxCommandEvent event(wxEVT_NULL, m_windowId);
-    wxEventType eventType = wxEVT_NULL;
-    NMHDR *hdr1 = (NMHDR*) lParam;
-    switch ( hdr1->code )
-    {
-        case NM_CLICK:
-            eventType = wxEVT_COMMAND_LEFT_CLICK;
-            break;
-
-        case NM_DBLCLK:
-            eventType = wxEVT_COMMAND_LEFT_DCLICK;
-            break;
-
-        case NM_RCLICK:
-            eventType = wxEVT_COMMAND_RIGHT_CLICK;
-            break;
-
-        case NM_RDBLCLK:
-            eventType = wxEVT_COMMAND_RIGHT_DCLICK;
-            break;
-
-        case NM_SETFOCUS:
-            eventType = wxEVT_COMMAND_SET_FOCUS;
-            break;
-
-        case NM_KILLFOCUS:
-            eventType = wxEVT_COMMAND_KILL_FOCUS;
-            break;
-
-        case NM_RETURN:
-            eventType = wxEVT_COMMAND_ENTER;
-            break;
-
-        default:
-			if (hdr1->hwndFrom == (void*)m_hWnd)
-				if (sc_eiffel && sc_object)
-					return sc_eiffel(sc_object, (void*)lParam) != 0;
-				else
-					break;
-			else
-            	return wxWindow::MSWOnNotify(idCtrl, lParam, result);
-    }
-
-    event.SetEventType(eventType);
-    event.SetEventObject(this);
-
-    return GetEventHandler()->ProcessEvent(event);
-}
-#else
-bool wxScintilla::EnsureDll()
-{
-	return FALSE;
-}
-
-bool wxScintilla::Create(wxWindow *parent,
-                      wxWindowID id,
-                      const wxPoint& pos,
-                      const wxSize& size,
-                      long style,
-                      const wxValidator& validator,
-                      const wxString& name)
-{
-	sc_eiffel = NULL;
-	sc_object = NULL;
-
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, validator, name ))
-    {
-        wxFAIL_MSG( wxT("wxScintilla creation failed") );
-	    return FALSE;
-    }
-
-	m_widget = scintilla_new();
-	
-	if (m_widget)
-	{
-		scintilla_set_id (m_widget, id);
-
-		m_proc = (ScExec)scintilla_send_message(m_widget, 2184, 0, 0);
-		m_obj  = (void*) scintilla_send_message(m_widget, 2185, 0, 0);
-
-		gtk_signal_connect( GTK_OBJECT(m_widget), SCINTILLA_NOTIFY,
-			GTK_SIGNAL_FUNC(wxScintilla::gtk_scintilla_notify_callback), (gpointer*)this );
-	  
-    	m_parent->DoAddChild( this );
-  
-    	PostCreation();
-
-	    SetSize(pos.x, pos.y, size.x, size.y);
-		
-		Show (TRUE);
-		
-		return TRUE;
-	}
-	return FALSE;
-}
-
-wxSize wxScintilla::GetDefaultSize()
-{
-    static wxSize s_sizeSci;
-
-    if ( s_sizeSci.x == 0 )
-    {
-		s_sizeSci.x = 200;
-		s_sizeSci.y = 200;
-	}
-	
-	return s_sizeSci;
-
-}
-
-void wxScintilla::gtk_scintilla_notify_callback(GtkWidget*, gint /*wParam*/, gpointer lParam, wxScintilla* wxSci)
-{
-	if (wxSci->sc_object && wxSci->sc_eiffel)
-		wxSci->sc_eiffel(wxSci->sc_object, (void*)lParam);
-}
-
-#endif
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxScintilla_Create) (void* obj, void* fnc, void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	wxScintilla* result = new wxScintilla ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
-	result->SetEiffelCB(obj, fnc);
-
-	return (void*)result;
-}
-
-EWXWEXPORT(int, wxScintilla_Exec) (void* obj, int code, int param1, int param2)
-{
-	return ((wxScintilla*)obj)->m_proc(((wxScintilla*)obj)->m_obj, code, param1, param2);
-}
-
-EWXWEXPORT(void, wxScintilla_SetEiffelCB) (void* obj, void* eif, void* fnc)
-{
-	((wxScintilla*)obj)->SetEiffelCB(eif, fnc);
-}
-
-}
diff --git a/wxc/src/ewxw/eljscintilla.h b/wxc/src/ewxw/eljscintilla.h
deleted file mode 100644
--- a/wxc/src/ewxw/eljscintilla.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef __ELJSCINTILLA_H
-#define __ELJSCINTILLA_H
-
-#ifdef __WIN32__
-#include "wx/msw/private.h"
-#include <commctrl.h>
-#else
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#if GTK_MAJOR_VERSION < 2
-#define SCINTILLA_NOTIFY "notify"
-#else
-#define SCINTILLA_NOTIFY "sci-notify"
-#endif
-extern "C"
-{
-typedef unsigned long uptr_t;
-typedef long sptr_t;
-
-GtkWidget*	scintilla_new		(void);
-void		scintilla_set_id	(GtkWidget*, int id);
-sptr_t	scintilla_send_message	(GtkWidget*, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-}
-#endif
-
-extern "C"
-{
-
-typedef int  _cdecl (*ScNotify)(void*, void*);
-typedef int  _cdecl (*ScExec)  (void*, int, int, int);
-
-}
-
-class wxScintilla : public wxControl
-{
-DECLARE_DYNAMIC_CLASS(wxScintilla)
-
-public:
-    wxScintilla() { }
-    wxScintilla(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxT("wxScintilla"))
-    {
-        Create(parent, id, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxT("wxScintilla"));
-
-    static wxSize GetDefaultSize();
-
-#ifdef __WIN32__
-	bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result);
-#else
-	static void gtk_scintilla_notify_callback(GtkWidget*, gint, gpointer lParam, wxScintilla* scitew);
-#endif
-
-	ScExec m_proc;
-	void* m_obj;
-
-	ScNotify sc_eiffel;
-	void* sc_object;
-	
-	void SetEiffelCB (void* _obj, void* _fnc) {sc_object = _obj; sc_eiffel = (ScNotify)_fnc;};
-
-protected:
-    virtual wxSize DoGetBestSize() const
-	{return GetDefaultSize();};
-
-private:
-	bool EnsureDll();
-};
-
-#endif
diff --git a/wxc/src/ewxw/eljscrollbar.cpp b/wxc/src/ewxw/eljscrollbar.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljscrollbar.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxScrollBar_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxScrollBar ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(int, wxScrollBar_GetThumbPosition)(void* _obj)
-{
-	return ((wxScrollBar*)_obj)->GetThumbPosition();
-}
-	
-EWXWEXPORT(int, wxScrollBar_GetThumbSize)(void* _obj)
-{
-	return ((wxScrollBar*)_obj)->GetThumbSize();
-}
-	
-EWXWEXPORT(int, wxScrollBar_GetPageSize)(void* _obj)
-{
-	return ((wxScrollBar*)_obj)->GetPageSize();
-}
-	
-EWXWEXPORT(int, wxScrollBar_GetRange)(void* _obj)
-{
-	return ((wxScrollBar*)_obj)->GetRange();
-}
-	
-EWXWEXPORT(void, wxScrollBar_SetThumbPosition)(void* _obj, int viewStart)
-{
-	((wxScrollBar*)_obj)->SetThumbPosition(viewStart);
-}
-	
-EWXWEXPORT(void, wxScrollBar_SetScrollbar)(void* _obj, int position, int thumbSize, int range, int pageSize, int refresh)
-{
-	((wxScrollBar*)_obj)->SetScrollbar(position, thumbSize, range, pageSize, refresh != 0);
-}
-
-}
diff --git a/wxc/src/ewxw/eljscrolledwindow.cpp b/wxc/src/ewxw/eljscrolledwindow.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljscrolledwindow.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxScrolledWindow_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxScrolledWindow ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void, wxScrolledWindow_SetTargetWindow)(void* _obj, void* target)
-{
-	((wxScrolledWindow*)_obj)->SetTargetWindow((wxWindow*)target);
-}
-	
-EWXWEXPORT(void*, wxScrolledWindow_GetTargetWindow)(void* _obj)
-{
-	return (void*)((wxScrolledWindow*)_obj)->GetTargetWindow();
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_SetScrollbars)(void* _obj, int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, int noRefresh)
-{
-	((wxScrolledWindow*)_obj)->SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_Scroll)(void* _obj, int x_pos, int y_pos)
-{
-	((wxScrolledWindow*)_obj)->Scroll(x_pos, y_pos);
-}
-	
-EWXWEXPORT(int, wxScrolledWindow_GetScrollPageSize)(void* _obj, int orient)
-{
-	return ((wxScrolledWindow*)_obj)->GetScrollPageSize(orient);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_SetScrollPageSize)(void* _obj, int orient, int pageSize)
-{
-	((wxScrolledWindow*)_obj)->SetScrollPageSize(orient, pageSize);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_GetScrollPixelsPerUnit)(void* _obj, void* x_unit, void* y_unit)
-{
-	((wxScrolledWindow*)_obj)->GetScrollPixelsPerUnit((int*)x_unit, (int*)y_unit);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_EnableScrolling)(void* _obj, int x_scrolling, int y_scrolling)
-{
-	((wxScrolledWindow*)_obj)->EnableScrolling(x_scrolling != 0, y_scrolling != 0);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_GetViewStart)(void* _obj, void* x, void* y)
-{
-	((wxScrolledWindow*)_obj)->GetViewStart((int*)x, (int*)y);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_ViewStart)(void* _obj, void* x, void* y)
-{
-	((wxScrolledWindow*)_obj)->GetViewStart((int*)x, (int*)y);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_GetVirtualSize)(void* _obj, void* x, void* y)
-{
-	((wxScrolledWindow*)_obj)->GetVirtualSize((int*)x, (int*)y);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_SetScale)(void* _obj, double xs, double ys)
-{
-	((wxScrolledWindow*)_obj)->SetScale(xs, ys);
-}
-	
-EWXWEXPORT(double, wxScrolledWindow_GetScaleX)(void* _obj)
-{
-	return ((wxScrolledWindow*)_obj)->GetScaleX();
-}
-	
-EWXWEXPORT(double, wxScrolledWindow_GetScaleY)(void* _obj)
-{
-	return ((wxScrolledWindow*)_obj)->GetScaleY();
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_CalcScrolledPosition)(void* _obj, int x, int y, void* xx, void* yy)
-{
-	((wxScrolledWindow*)_obj)->CalcScrolledPosition(x, y, (int*)xx, (int*)yy);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_CalcUnscrolledPosition)(void* _obj, int x, int y, void* xx, void* yy)
-{
-	((wxScrolledWindow*)_obj)->CalcUnscrolledPosition(x, y, (int*)xx, (int*)yy);
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_AdjustScrollbars)(void* _obj)
-{
-	((wxScrolledWindow*)_obj)->AdjustScrollbars();
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_OnDraw)(void* _obj, void* dc)
-{
-	((wxScrolledWindow*)_obj)->OnDraw(*((wxDC*)dc));
-}
-	
-EWXWEXPORT(void, wxScrolledWindow_PrepareDC)(void* _obj, void* dc)
-{
-	((wxScrolledWindow*)_obj)->PrepareDC(*((wxDC*)dc));
-}
-
-}
diff --git a/wxc/src/ewxw/eljsingleinst.cpp b/wxc/src/ewxw/eljsingleinst.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljsingleinst.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-#include "wx/snglinst.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxSingleInstanceChecker_CreateDefault)()
-{
-	return (void*)new wxSingleInstanceChecker();
-}
-	
-EWXWEXPORT(int,wxSingleInstanceChecker_Create)(void* _obj, void* name, void* path)
-{
-	return (int)((wxSingleInstanceChecker*)_obj)->Create((wxChar*)name, (wxChar*)path);
-}
-	
-EWXWEXPORT(int,wxSingleInstanceChecker_IsAnotherRunning)(void* _obj)
-{
-	return (int)((wxSingleInstanceChecker*)_obj)->IsAnotherRunning();
-}
-	
-EWXWEXPORT(void,wxSingleInstanceChecker_Delete)(void* _obj)
-{
-	delete (wxSingleInstanceChecker*)_obj;
-}
-	
-}
-#endif
diff --git a/wxc/src/ewxw/eljsizer.cpp b/wxc/src/ewxw/eljsizer.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljsizer.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxSizerItem_Create)(int width, int height, int option, int flag, int border, void* userData)
-{
-	return (void*) new wxSizerItem(width, height, option, flag, border, new ELJDataObject(userData));
-}
-	
-EWXWEXPORT(void*, wxSizerItem_CreateInWindow)(void* window, int option, int flag, int border, void* userData )
-{
-	return (void*) new wxSizerItem((wxWindow*)window, option, flag, border, new ELJDataObject(userData));
-}
-	
-EWXWEXPORT(void*, wxSizerItem_CreateInSizer)(void* sizer, int option, int flag, int border, void* userData )
-{
-	return (void*) new wxSizerItem((wxSizer*) sizer, option, flag, border, new ELJDataObject(userData));
-}
-	
-EWXWEXPORT(void, wxSizerItem_GetSize)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxSizerItem*)_obj)->GetSize();
-	(*(int*)_h) = res.GetHeight();
-	(*(int*)_w) = res.GetWidth();
-}
-	
-EWXWEXPORT(void, wxSizerItem_CalcMin)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxSizerItem*)_obj)->CalcMin();
-	(*(int*)_h) = res.GetHeight();
-	(*(int*)_w) = res.GetWidth();
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetDimension)(void* _obj,  int _x, int _y, int _w, int _h)
-{
-	((wxSizerItem*)_obj)->SetDimension(wxPoint(_x, _y), wxSize(_w, _h));
-}
-	
-EWXWEXPORT(void, wxSizerItem_GetMinSize)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxSizerItem*)_obj)->GetMinSize();
-	(*(int*)_h) = res.GetHeight();
-	(*(int*)_w) = res.GetWidth();
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetRatio)(void* _obj,  int width, int height)
-{
-	((wxSizerItem*)_obj)->SetRatio(width, height);
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetFloatRatio)(void* _obj,  float ratio)
-{
-	((wxSizerItem*)_obj)->SetRatio(ratio);
-}
-	
-EWXWEXPORT(float, wxSizerItem_GetRatio)(void* _obj)
-{
-	return ((wxSizerItem*)_obj)->GetRatio();
-}
-	
-EWXWEXPORT(int, wxSizerItem_IsWindow)(void* _obj)
-{
-	return (int)((wxSizerItem*)_obj)->IsWindow();
-}
-	
-EWXWEXPORT(int, wxSizerItem_IsSizer)(void* _obj)
-{
-	return (int)((wxSizerItem*)_obj)->IsSizer();
-}
-	
-EWXWEXPORT(int, wxSizerItem_IsSpacer)(void* _obj)
-{
-	return (int)((wxSizerItem*)_obj)->IsSpacer();
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetInitSize)(void* _obj, int x, int y)
-{
-	((wxSizerItem*)_obj)->SetInitSize(x, y);
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetOption)(void* _obj, int option)
-{
-#if (wxVERSION_NUMBER <= 2600)
-	((wxSizerItem*)_obj)->SetOption(option);
-#else
-	((wxSizerItem*)_obj)->SetProportion(option);
-#endif
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetFlag)(void* _obj, int flag)
-{
-	((wxSizerItem*)_obj)->SetFlag(flag);
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetBorder)(void* _obj, int border)
-{
-	((wxSizerItem*)_obj)->SetBorder(border);
-}
-	
-EWXWEXPORT(void*, wxSizerItem_GetWindow)(void* _obj)
-{
-	return (void*)((wxSizerItem*)_obj)->GetWindow();
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetWindow)(void* _obj, void* window)
-{
-	((wxSizerItem*)_obj)->SetWindow((wxWindow*) window);
-}
-	
-EWXWEXPORT(void*, wxSizerItem_GetSizer)(void* _obj)
-{
-	return (void*)((wxSizerItem*)_obj)->GetSizer();
-}
-	
-EWXWEXPORT(void, wxSizerItem_SetSizer)(void* _obj, void* sizer)
-{
-	((wxSizerItem*)_obj)->SetSizer((wxSizer*) sizer);
-}
-	
-EWXWEXPORT(int, wxSizerItem_GetOption)(void* _obj)
-{
-#if (wxVERSION_NUMBER < 2600)
-	return ((wxSizerItem*)_obj)->GetOption();
-#else
-	return ((wxSizerItem*)_obj)->GetProportion();
-#endif
-}
-	
-EWXWEXPORT(int, wxSizerItem_GetFlag)(void* _obj)
-{
-	return ((wxSizerItem*)_obj)->GetFlag();
-}
-	
-EWXWEXPORT(int, wxSizerItem_GetBorder)(void* _obj)
-{
-	return ((wxSizerItem*)_obj)->GetBorder();
-}
-	
-EWXWEXPORT(void*, wxSizerItem_GetUserData)(void* _obj)
-{
-	return ((ELJDataObject*)((wxSizerItem*)_obj)->GetUserData())->data;
-}
-	
-EWXWEXPORT(void, wxSizerItem_GetPosition)(void* _obj, void* _x, void* _y)
-{
-	wxPoint res = ((wxSizerItem*)_obj)->GetPosition();
-	(*(int*)_x) = res.x;
-	(*(int*)_y) = res.y;
-}
-	
-EWXWEXPORT(void, wxSizer_AddWindow)(void* _obj, void* window, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Add((wxWindow*)window, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_AddSizer)(void* _obj, void* sizer, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Add((wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_Add)(void* _obj, int width, int height, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Add(width, height, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_InsertWindow)(void* _obj, int before, void* window, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Insert(before, (wxWindow*)window, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_InsertSizer)(void* _obj, int before, void* sizer, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Insert(before, (wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_Insert)(void* _obj, int before, int width, int height, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Insert(before, width, height, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_PrependWindow)(void* _obj, void* window, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Prepend((wxWindow*)window, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_PrependSizer)(void* _obj, void* sizer, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Prepend((wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(void, wxSizer_Prepend)(void* _obj, int width, int height, int option, int flag, int border, void* userData)
-{
-	((wxSizer*)_obj)->Prepend(width, height, option, flag, border, new ELJDataObject (userData));
-}
-	
-EWXWEXPORT(int, wxSizer_RemoveWindow)(void* _obj, void* window)
-{
-#if (wxVERSION_NUMBER < 2600)
-	return (int)((wxSizer*)_obj)->Remove((wxWindow*) window);
-#else
-	return (int)((wxSizer*)_obj)->Detach((wxWindow*) window);
-#endif
-}
-	
-EWXWEXPORT(int, wxSizer_RemoveSizer)(void* _obj, void* sizer)
-{
-	return (int)((wxSizer*)_obj)->Remove((wxSizer*) sizer);
-}
-	
-EWXWEXPORT(int, wxSizer_Remove)(void* _obj, int pos)
-{
-	return (int)((wxSizer*)_obj)->Remove(pos);
-}
-	
-EWXWEXPORT(void, wxSizer_SetMinSize)(void* _obj, int width, int height)
-{
-	((wxSizer*)_obj)->SetMinSize(width, height);
-}
-	
-EWXWEXPORT(void, wxSizer_SetItemMinSizeWindow)(void* _obj, void* window, int width, int height)
-{
-	((wxSizer*)_obj)->SetItemMinSize((wxWindow*) window, width, height);
-}
-	
-EWXWEXPORT(void, wxSizer_SetItemMinSizeSizer)(void* _obj, void* sizer, int width, int height)
-{
-	((wxSizer*)_obj)->SetItemMinSize((wxSizer*) sizer, width, height);
-}
-	
-EWXWEXPORT(void, wxSizer_SetItemMinSize)(void* _obj, int pos, int width, int height )
-{
-	((wxSizer*)_obj)->SetItemMinSize(pos, width, height);
-}
-	
-EWXWEXPORT(void, wxSizer_GetSize)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxSizer*)_obj)->GetSize();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-}
-	
-EWXWEXPORT(void, wxSizer_GetPosition)(void* _obj, void* _x, void* _y)
-{
-	wxPoint res = ((wxSizer*)_obj)->GetPosition();
-	(*(int*)_x) = res.x;
-	(*(int*)_y) = res.y;
-}
-	
-EWXWEXPORT(void, wxSizer_GetMinSize)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxSizer*)_obj)->GetMinSize();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-}
-	
-EWXWEXPORT(void, wxSizer_RecalcSizes)(void* _obj)
-{
-	((wxSizer*)_obj)->RecalcSizes();
-}
-	
-EWXWEXPORT(void, wxSizer_CalcMin)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxSizer*)_obj)->CalcMin();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-}
-	
-EWXWEXPORT(void, wxSizer_Layout)(void* _obj)
-{
-	((wxSizer*)_obj)->Layout();
-}
-	
-EWXWEXPORT(void, wxSizer_Fit)(void* _obj, void* window )
-{
-	((wxSizer*)_obj)->Fit((wxWindow*) window);
-}
-	
-EWXWEXPORT(void, wxSizer_SetSizeHints)(void* _obj, void* window )
-{
-	((wxSizer*)_obj)->SetSizeHints((wxWindow*) window);
-}
-	
-EWXWEXPORT(int, wxSizer_GetChildren)(void* _obj, void* _res, int _cnt)
-{
-	if (_res && (unsigned int)_cnt == ((wxSizer*)_obj)->GetChildren().GetCount())
-	{
-		int i = 0;
-#if (wxVERSION_NUMBER < 2600)
-		wxNode* node = NULL;
-		wxList list = ((wxSizer*)_obj)->GetChildren();
-	
-		
-		while ((node = list.Item(i++)))
-			((void**)_res)[i] = (void*)node->GetData();
-#else
-		wxSizerItemList::compatibility_iterator node = ((wxSizer*)_obj)->GetChildren().GetFirst();
-		while (node)
-		{
-			((void**)_res)[i] = node->GetData();
-			++i;
-		}
-#endif
-		return i;
-	}
-	else
-		return ((wxSizer*)_obj)->GetChildren().GetCount();
-}
-	
-EWXWEXPORT(void, wxSizer_SetDimension)(void* _obj, int x, int y, int width, int height)
-{
-	((wxSizer*)_obj)->SetDimension(x, y, width, height);
-}
-	
-EWXWEXPORT(void*, wxGridSizer_Create)(int rows, int cols, int vgap, int hgap)
-{
-	return (void*) new wxGridSizer(rows, cols, vgap, hgap);
-}
-	
-EWXWEXPORT(void, wxGridSizer_RecalcSizes)(void* _obj)
-{
-	((wxGridSizer*)_obj)->RecalcSizes();
-}
-	
-EWXWEXPORT(void, wxGridSizer_CalcMin)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxGridSizer*)_obj)->CalcMin();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-}
-	
-EWXWEXPORT(void, wxGridSizer_SetCols)(void* _obj, int cols )
-{
-	((wxGridSizer*)_obj)->SetCols(cols);
-}
-	
-EWXWEXPORT(void, wxGridSizer_SetRows)(void* _obj, int rows)
-{
-	((wxGridSizer*)_obj)->SetRows(rows);
-}
-	
-EWXWEXPORT(void, wxGridSizer_SetVGap)(void* _obj, int gap)
-{
-	((wxGridSizer*)_obj)->SetVGap(gap);
-}
-	
-EWXWEXPORT(void, wxGridSizer_SetHGap)(void* _obj, int gap)
-{
-	((wxGridSizer*)_obj)->SetHGap(gap);
-}
-	
-EWXWEXPORT(int, wxGridSizer_GetCols)(void* _obj)
-{
-	return ((wxGridSizer*)_obj)->GetCols();
-}
-	
-EWXWEXPORT(int, wxGridSizer_GetRows)(void* _obj)
-{
-	return ((wxGridSizer*)_obj)->GetRows();
-}
-	
-EWXWEXPORT(int, wxGridSizer_GetVGap)(void* _obj)
-{
-	return ((wxGridSizer*)_obj)->GetVGap();
-}
-	
-EWXWEXPORT(int, wxGridSizer_GetHGap)(void* _obj)
-{
-	return ((wxGridSizer*)_obj)->GetHGap();
-}
-	
-EWXWEXPORT(void*, wxFlexGridSizer_Create)(int rows, int cols, int vgap, int hgap)
-{
-	return new wxFlexGridSizer(rows, cols, vgap, hgap);
-}
-	
-EWXWEXPORT(void, wxFlexGridSizer_RecalcSizes)(void* _obj)
-{
-	((wxFlexGridSizer*)_obj)->RecalcSizes();
-}
-	
-EWXWEXPORT(void, wxFlexGridSizer_CalcMin)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxFlexGridSizer*)_obj)->CalcMin();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-}
-	
-EWXWEXPORT(void, wxFlexGridSizer_AddGrowableRow)(void* _obj, size_t idx)
-{
-	((wxFlexGridSizer*)_obj)->AddGrowableRow(idx);
-}
-	
-EWXWEXPORT(void, wxFlexGridSizer_RemoveGrowableRow)(void* _obj, size_t idx)
-{
-	((wxFlexGridSizer*)_obj)->RemoveGrowableRow(idx);
-}
-	
-EWXWEXPORT(void, wxFlexGridSizer_AddGrowableCol)(void* _obj, size_t idx)
-{
-	((wxFlexGridSizer*)_obj)->AddGrowableCol(idx);
-}
-	
-EWXWEXPORT(void, wxFlexGridSizer_RemoveGrowableCol)(void* _obj, size_t idx)
-{
-	((wxFlexGridSizer*)_obj)->RemoveGrowableCol(idx);
-}
-	
-EWXWEXPORT(void*, wxBoxSizer_Create)(int orient )
-{
-	return (void*) new wxBoxSizer(orient);
-}
-	
-EWXWEXPORT(void, wxBoxSizer_RecalcSizes)(void* _obj)
-{
-	((wxBoxSizer*)_obj)->RecalcSizes();
-}
-	
-EWXWEXPORT(void, wxBoxSizer_CalcMin)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxBoxSizer*)_obj)->CalcMin();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-}
-	
-EWXWEXPORT(int, wxBoxSizer_GetOrientation)(void* _obj)
-{
-	return ((wxBoxSizer*)_obj)->GetOrientation();
-}
-	
-EWXWEXPORT(void*, wxStaticBoxSizer_Create)(void* box, int orient)
-{
-	return (void*) new wxStaticBoxSizer((wxStaticBox*) box, orient );
-}
-	
-EWXWEXPORT(void, wxStaticBoxSizer_RecalcSizes)(void* _obj)
-{
-	((wxStaticBoxSizer*)_obj)->RecalcSizes();
-}
-	
-EWXWEXPORT(void, wxStaticBoxSizer_CalcMin)(void* _obj, void* _w, void* _h)
-{
-	wxSize res = ((wxStaticBoxSizer*)_obj)->CalcMin();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-}
-	
-EWXWEXPORT(void*, wxStaticBoxSizer_GetStaticBox)(void* _obj)
-{
-	return (void*)((wxStaticBoxSizer*)_obj)->GetStaticBox();
-}
-	
-EWXWEXPORT(void*, wxNotebookSizer_Create)(void* nb)
-{
-#if (wxVERSION_NUMBER < 2600)
-	return (void*) new wxNotebookSizer((wxNotebook*)nb);
-#else
-	return NULL;
-#endif
-}
-	
-EWXWEXPORT(void, wxNotebookSizer_RecalcSizes)(void* _obj)
-{
-#if (wxVERSION_NUMBER < 2600)
-	((wxNotebookSizer*)_obj)->RecalcSizes();
-#endif
-}
-	
-EWXWEXPORT(void, wxNotebookSizer_CalcMin)(void* _obj, void* _w, void* _h)
-{
-#if (wxVERSION_NUMBER < 2600)
-	wxSize res = ((wxNotebookSizer*)_obj)->CalcMin();
-	(*(int*)_w) = res.GetWidth();
-	(*(int*)_h) = res.GetHeight();
-#endif
-}
-	
-EWXWEXPORT(void*, wxNotebookSizer_GetNotebook)(void* _obj)
-{
-#if (wxVERSION_NUMBER < 2600)
-	return (void*)((wxNotebookSizer*)_obj)->GetNotebook();
-#else
-	return NULL;
-#endif
-}
-	
-}
diff --git a/wxc/src/ewxw/eljslider.cpp b/wxc/src/ewxw/eljslider.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljslider.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "wrapper.h"
-#include "wx/slider.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxSlider_Create) (void* _prt, int _id, int _init, int _min, int _max, int _lft, int _top, int _wdt, int _hgt, long _stl)
-{
-	return (void*) new wxSlider ((wxWindow*)_prt, _id, _init, _min, _max, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(int,wxSlider_GetValue)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetValue();
-}
-	
-EWXWEXPORT(void,wxSlider_SetValue)(void* _obj, int value)
-{
-	((wxSlider*)_obj)->SetValue(value);
-}
-	
-EWXWEXPORT(void,wxSlider_SetRange)(void* _obj, int minValue, int maxValue)
-{
-	((wxSlider*)_obj)->SetRange(minValue, maxValue);
-}
-	
-EWXWEXPORT(int,wxSlider_GetMin)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetMin();
-}
-	
-EWXWEXPORT(int,wxSlider_GetMax)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetMax();
-}
-	
-EWXWEXPORT(void,wxSlider_SetTickFreq)(void* _obj, int n, int pos)
-{
-	((wxSlider*)_obj)->SetTickFreq(n, pos);
-}
-	
-EWXWEXPORT(int,wxSlider_GetTickFreq)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetTickFreq();
-}
-	
-EWXWEXPORT(void,wxSlider_SetPageSize)(void* _obj, int pageSize)
-{
-	((wxSlider*)_obj)->SetPageSize(pageSize);
-}
-	
-EWXWEXPORT(int,wxSlider_GetPageSize)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetPageSize();
-}
-	
-EWXWEXPORT(void,wxSlider_ClearSel)(void* _obj)
-{
-	((wxSlider*)_obj)->ClearSel();
-}
-	
-EWXWEXPORT(void,wxSlider_ClearTicks)(void* _obj)
-{
-	((wxSlider*)_obj)->ClearTicks();
-}
-	
-EWXWEXPORT(void,wxSlider_SetLineSize)(void* _obj, int lineSize)
-{
-	((wxSlider*)_obj)->SetLineSize(lineSize);
-}
-	
-EWXWEXPORT(int,wxSlider_GetLineSize)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetLineSize();
-}
-	
-EWXWEXPORT(int,wxSlider_GetSelEnd)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetSelEnd();
-}
-	
-EWXWEXPORT(int,wxSlider_GetSelStart)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetSelStart();
-}
-	
-EWXWEXPORT(void,wxSlider_SetSelection)(void* _obj, int minPos, int maxPos)
-{
-	((wxSlider*)_obj)->SetSelection(minPos, maxPos);
-}
-	
-EWXWEXPORT(void,wxSlider_SetThumbLength)(void* _obj, int len)
-{
-	((wxSlider*)_obj)->SetThumbLength(len);
-}
-	
-EWXWEXPORT(int,wxSlider_GetThumbLength)(void* _obj)
-{
-	return ((wxSlider*)_obj)->GetThumbLength();
-}
-	
-EWXWEXPORT(void,wxSlider_SetTick)(void* _obj, int tickPos)
-{
-	((wxSlider*)_obj)->SetTick(tickPos);
-}
-	
-} 
diff --git a/wxc/src/ewxw/eljspinctrl.cpp b/wxc/src/ewxw/eljspinctrl.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljspinctrl.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxSpinCtrl_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, long _stl, int _min, int _max, int _init)
-{
-	return (void*) new wxSpinCtrl ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, _min, _max, _init);
-}
-
-EWXWEXPORT(void, wxSpinCtrl_SetValue)(void* _obj, int val)
-{
-	((wxSpinCtrl*)_obj)->SetValue(val);
-}
-	
-EWXWEXPORT(int, wxSpinCtrl_GetValue)(void* _obj)
-{
-	return ((wxSpinCtrl*)_obj)->GetValue();
-}
-	
-EWXWEXPORT(void, wxSpinCtrl_SetRange)(void* _obj, int min_val, int max_val)
-{
-	((wxSpinCtrl*)_obj)->SetRange(min_val, max_val);
-}
-	
-EWXWEXPORT(int, wxSpinCtrl_GetMin)(void* _obj)
-{
-	return ((wxSpinCtrl*)_obj)->GetMin();
-}
-	
-EWXWEXPORT(int, wxSpinCtrl_GetMax)(void* _obj)
-{
-	return ((wxSpinCtrl*)_obj)->GetMax();
-}
-
-EWXWEXPORT(void*, wxSpinButton_Create)(void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, long _stl)
-{
-	return (void*) new wxSpinButton ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(int, wxSpinButton_GetValue)(void* _obj)
-{
-	return ((wxSpinButton*)_obj)->GetValue();
-}
-	
-EWXWEXPORT(int, wxSpinButton_GetMin)(void* _obj)
-{
-	return ((wxSpinButton*)_obj)->GetMin();
-}
-	
-EWXWEXPORT(int, wxSpinButton_GetMax)(void* _obj)
-{
-	return ((wxSpinButton*)_obj)->GetMax();
-}
-	
-EWXWEXPORT(void, wxSpinButton_SetValue)(void* _obj, int val)
-{
-	((wxSpinButton*)_obj)->SetValue(val);
-}
-	
-EWXWEXPORT(void, wxSpinButton_SetRange)(void* _obj, int minVal, int maxVal)
-{
-	((wxSpinButton*)_obj)->SetRange(minVal, maxVal);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljsplitterwindow.cpp b/wxc/src/ewxw/eljsplitterwindow.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljsplitterwindow.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxSplitterWindow_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxSplitterWindow ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void*, wxSplitterWindow_GetWindow1)(void* _obj)
-{
-	return (void*)((wxSplitterWindow*)_obj)->GetWindow1();
-}
-	
-EWXWEXPORT(void*, wxSplitterWindow_GetWindow2)(void* _obj)
-{
-	return (void*)((wxSplitterWindow*)_obj)->GetWindow2();
-}
-	
-EWXWEXPORT(void, wxSplitterWindow_SetSplitMode)(void* _obj, int mode)
-{
-	((wxSplitterWindow*)_obj)->SetSplitMode(mode);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_GetSplitMode)(void* _obj)
-{
-	return ((wxSplitterWindow*)_obj)->GetSplitMode();
-}
-	
-EWXWEXPORT(void, wxSplitterWindow_Initialize)(void* _obj, void* window)
-{
-	((wxSplitterWindow*)_obj)->Initialize((wxWindow*)window);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_SplitVertically)(void* _obj, void* window1, void* window2, int sashPosition)
-{
-	return (int)((wxSplitterWindow*)_obj)->SplitVertically((wxWindow*)window1, (wxWindow*)window2, sashPosition);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_SplitHorizontally)(void* _obj, void* window1, void* window2, int sashPosition)
-{
-	return (int)((wxSplitterWindow*)_obj)->SplitHorizontally((wxWindow*)window1, (wxWindow*)window2, sashPosition);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_Unsplit)(void* _obj, void* toRemove)
-{
-	return (int)((wxSplitterWindow*)_obj)->Unsplit((wxWindow*)toRemove);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_ReplaceWindow)(void* _obj, void* winOld, void* winNew)
-{
-	return (int)((wxSplitterWindow*)_obj)->ReplaceWindow((wxWindow*)winOld, (wxWindow*)winNew);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_IsSplit)(void* _obj)
-{
-	return (int)((wxSplitterWindow*)_obj)->IsSplit();
-}
-	
-EWXWEXPORT(void, wxSplitterWindow_SetSashSize)(void* _obj, int width)
-{
-	((wxSplitterWindow*)_obj)->SetSashSize(width);
-}
-	
-EWXWEXPORT(void, wxSplitterWindow_SetBorderSize)(void* _obj, int width)
-{
-	((wxSplitterWindow*)_obj)->SetBorderSize(width);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_GetSashSize)(void* _obj)
-{
-	return ((wxSplitterWindow*)_obj)->GetSashSize();
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_GetBorderSize)(void* _obj)
-{
-	return ((wxSplitterWindow*)_obj)->GetBorderSize();
-}
-	
-EWXWEXPORT(void, wxSplitterWindow_SetSashPosition)(void* _obj, int position, int redraw)
-{
-	((wxSplitterWindow*)_obj)->SetSashPosition(position, redraw != 0);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_GetSashPosition)(void* _obj)
-{
-	return ((wxSplitterWindow*)_obj)->GetSashPosition();
-}
-	
-EWXWEXPORT(void, wxSplitterWindow_SetMinimumPaneSize)(void* _obj, int min)
-{
-	((wxSplitterWindow*)_obj)->SetMinimumPaneSize(min);
-}
-	
-EWXWEXPORT(int, wxSplitterWindow_GetMinimumPaneSize)(void* _obj)
-{
-	return ((wxSplitterWindow*)_obj)->GetMinimumPaneSize();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljstaticbox.cpp b/wxc/src/ewxw/eljstaticbox.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljstaticbox.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxStaticBox_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxStaticBox ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-}
diff --git a/wxc/src/ewxw/eljstaticline.cpp b/wxc/src/ewxw/eljstaticline.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljstaticline.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxStaticLine_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxStaticLine ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(int, wxStaticLine_IsVertical) (void* _obj)
-{
-	return (int)((wxStaticLine*)_obj)->IsVertical ();
-}
-	
-EWXWEXPORT(int, wxStaticLine_GetDefaultSize) (void* _obj)
-{
-	return ((wxStaticLine*)_obj)->GetDefaultSize ();
-}
-
-}
diff --git a/wxc/src/ewxw/eljstatictext.cpp b/wxc/src/ewxw/eljstatictext.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljstatictext.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxStaticText_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxStaticText ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-}
diff --git a/wxc/src/ewxw/eljstatusbar.cpp b/wxc/src/ewxw/eljstatusbar.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljstatusbar.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxStatusBar_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-#if wxVERSION_NUMBER >= 2400
-	return (void*) new wxStatusBar ((wxWindow*)_prt, _id, _stl);
-#else
-	return (void*) new wxStatusBar ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-#endif
-}
-
-EWXWEXPORT(void, wxStatusBar_SetFieldsCount)(void* _obj, int number, int* widths)
-{
-	((wxStatusBar*)_obj)->SetFieldsCount(number, widths);
-}
-	
-EWXWEXPORT(int, wxStatusBar_GetFieldsCount)(void* _obj)
-{
-	return ((wxStatusBar*)_obj)->GetFieldsCount();
-}
-	
-EWXWEXPORT(void, wxStatusBar_SetStatusText)(void* _obj, void* text, int number)
-{
-	((wxStatusBar*)_obj)->SetStatusText((wxChar*)text, number);
-}
-	
-EWXWEXPORT(int, wxStatusBar_GetStatusText)(void* _obj, int number, void* _buf)
-{
-	wxString result = ((wxStatusBar*)_obj)->GetStatusText(number);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxStatusBar_SetStatusWidths)(void* _obj, int n, int* widths)
-{
-	((wxStatusBar*)_obj)->SetStatusWidths(n, widths);
-}
-
-/*	
-EWXWEXPORT(int, wxStatusBar_GetFieldRect)(void* _obj, int i, wxRect& rect)
-{
-	return (int)((wxStatusBar*)_obj)->GetFieldRect(int i, wxRect& rect);
-}
-*/
-	
-EWXWEXPORT(void, wxStatusBar_SetMinHeight)(void* _obj, int height)
-{
-	((wxStatusBar*)_obj)->SetMinHeight(height);
-}
-	
-EWXWEXPORT(int, wxStatusBar_GetBorderX)(void* _obj)
-{
-	return ((wxStatusBar*)_obj)->GetBorderX();
-}
-	
-EWXWEXPORT(int, wxStatusBar_GetBorderY)(void* _obj)
-{
-	return ((wxStatusBar*)_obj)->GetBorderY();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljsystemsettings.cpp b/wxc/src/ewxw/eljsystemsettings.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljsystemsettings.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void, wxSystemSettings_GetSystemColour)(wxSystemColour index, void* _ref)
-{
-	*((wxColour*)_ref) = wxSystemSettings::GetColour(index);
-}
-
-EWXWEXPORT(void, wxSystemSettings_GetSystemFont)(wxSystemFont index, void* _ref)
-{
-	*((wxFont*)_ref) = wxSystemSettings::GetFont(index);
-}
-
-EWXWEXPORT(int, wxSystemSettings_GetSystemMetric)(wxSystemMetric index)
-{
-	return wxSystemSettings::GetMetric(index);
-}
-
-}
diff --git a/wxc/src/ewxw/eljtextctrl.cpp b/wxc/src/ewxw/eljtextctrl.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljtextctrl.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxTextCtrl_Create) (void* _prt, int _id, wxChar* _txt, int _lft, int _top, int _wdt, int _hgt, long _stl)
-{
-	return (void*) new wxTextCtrl ((wxWindow*)_prt, _id, _txt, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
-}
-
-EWXWEXPORT(int, wxTextCtrl_GetValue)(void* _obj, void* _buf)
-{
-	wxString result = ((wxTextCtrl*)_obj)->GetValue();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_SetValue)(void* _obj, wxChar* value)
-{
-	((wxTextCtrl*)_obj)->SetValue(value);
-}
-	
-EWXWEXPORT(int, wxTextCtrl_GetLineLength)(void* _obj, long lineNo)
-{
-	return ((wxTextCtrl*)_obj)->GetLineLength(lineNo);
-}
-	
-EWXWEXPORT(int, wxTextCtrl_GetLineText)(void* _obj, long lineNo, void* _buf)
-{
-	wxString result = ((wxTextCtrl*)_obj)->GetLineText(lineNo);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxTextCtrl_GetNumberOfLines)(void* _obj)
-{
-	return ((wxTextCtrl*)_obj)->GetNumberOfLines();
-}
-	
-EWXWEXPORT(int, wxTextCtrl_IsModified)(void* _obj)
-{
-	return (int)((wxTextCtrl*)_obj)->IsModified();
-}
-	
-EWXWEXPORT(int, wxTextCtrl_IsEditable)(void* _obj)
-{
-	return (int)((wxTextCtrl*)_obj)->IsEditable();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_GetSelection)(void* _obj, void* from, void* to)
-{
-	((wxTextCtrl*)_obj)->GetSelection((long*) from, (long*) to);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Clear)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->Clear();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Replace)(void* _obj, long from, long to, wxChar* value)
-{
-	((wxTextCtrl*)_obj)->Replace(from, to, value);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Remove)(void* _obj, long from, long to)
-{
-	((wxTextCtrl*)_obj)->Remove(from, to);
-}
-	
-EWXWEXPORT(int, wxTextCtrl_LoadFile)(void* _obj, wxChar* file)
-{
-	return (int)((wxTextCtrl*)_obj)->LoadFile(file);
-}
-	
-EWXWEXPORT(int, wxTextCtrl_SaveFile)(void* _obj, wxChar* file)
-{
-	return (int)((wxTextCtrl*)_obj)->SaveFile(file);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_DiscardEdits)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->DiscardEdits();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_WriteText)(void* _obj, wxChar* text)
-{
-	((wxTextCtrl*)_obj)->WriteText(text);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_AppendText)(void* _obj, wxChar* text)
-{
-	((wxTextCtrl*)_obj)->AppendText(text);
-}
-	
-EWXWEXPORT(long, wxTextCtrl_XYToPosition)(void* _obj, long x, long y)
-{
-	return ((wxTextCtrl*)_obj)->XYToPosition(x, y);
-}
-	
-EWXWEXPORT(int, wxTextCtrl_PositionToXY)(void* _obj, long pos, long *x, long *y)
-{
-	return (int)((wxTextCtrl*)_obj)->PositionToXY(pos, x, y);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_ShowPosition)(void* _obj, long pos)
-{
-	((wxTextCtrl*)_obj)->ShowPosition(pos);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Copy)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->Copy();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Cut)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->Cut();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Paste)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->Paste();
-}
-	
-EWXWEXPORT(int, wxTextCtrl_CanCopy)(void* _obj)
-{
-	return (int)((wxTextCtrl*)_obj)->CanCopy();
-}
-	
-EWXWEXPORT(int, wxTextCtrl_CanCut)(void* _obj)
-{
-	return (int)((wxTextCtrl*)_obj)->CanCut();
-}
-	
-EWXWEXPORT(int, wxTextCtrl_CanPaste)(void* _obj)
-{
-	return (int)((wxTextCtrl*)_obj)->CanPaste();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Undo)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->Undo();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_Redo)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->Redo();
-}
-	
-EWXWEXPORT(int, wxTextCtrl_CanUndo)(void* _obj)
-{
-	return (int)((wxTextCtrl*)_obj)->CanUndo();
-}
-	
-EWXWEXPORT(int, wxTextCtrl_CanRedo)(void* _obj)
-{
-	return (int)((wxTextCtrl*)_obj)->CanRedo();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_SetInsertionPoint)(void* _obj, long pos)
-{
-	((wxTextCtrl*)_obj)->SetInsertionPoint(pos);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_SetInsertionPointEnd)(void* _obj)
-{
-	((wxTextCtrl*)_obj)->SetInsertionPointEnd();
-}
-	
-EWXWEXPORT(long, wxTextCtrl_GetInsertionPoint)(void* _obj)
-{
-	return ((wxTextCtrl*)_obj)->GetInsertionPoint();
-}
-	
-EWXWEXPORT(long, wxTextCtrl_GetLastPosition)(void* _obj)
-{
-	return ((wxTextCtrl*)_obj)->GetLastPosition();
-}
-	
-EWXWEXPORT(void, wxTextCtrl_SetSelection)(void* _obj, long from, long to)
-{
-	((wxTextCtrl*)_obj)->SetSelection(from, to);
-}
-	
-EWXWEXPORT(void, wxTextCtrl_SetEditable)(void* _obj, int editable)
-{
-	((wxTextCtrl*)_obj)->SetEditable(editable != 0);
-}
-	
-}
diff --git a/wxc/src/ewxw/eljtglbtn.cpp b/wxc/src/ewxw/eljtglbtn.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljtglbtn.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-#include "wx/tglbtn.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxToggleButton_Create)(void* parent, int id, void* label, int x, int y, int w, int h, int style)
-{
-	return (void*)new wxToggleButton((wxWindow*)parent, (wxWindowID)id, (wxChar*)label, wxPoint(x, y), wxSize(w, h), (long)style);
-}
-	
-EWXWEXPORT(void,wxToggleButton_SetValue)(void* _obj, int state)
-{
-	((wxToggleButton*)_obj)->SetValue(state != 0);
-}
-	
-EWXWEXPORT(int,wxToggleButton_GetValue)(void* _obj)
-{
-	return (int)((wxToggleButton*)_obj)->GetValue();
-}
-	
-EWXWEXPORT(void,wxToggleButton_SetLabel)(void* _obj, void* label)
-{
-	((wxToggleButton*)_obj)->SetLabel((wxChar*)label);
-}
-	
-EWXWEXPORT(int,wxToggleButton_Enable)(void* _obj, int enable)
-{
-	return (int)((wxToggleButton*)_obj)->Enable(enable != 0);
-}
-
-EWXWEXPORT(int,expEVT_COMMAND_TOGGLEBUTTON_CLICKED)()
-{
-	return wxEVT_COMMAND_TOGGLEBUTTON_CLICKED;
-}
-	
-}
-#endif
diff --git a/wxc/src/ewxw/eljthread.cpp b/wxc/src/ewxw/eljthread.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljthread.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxCriticalSection_Create) ()
-{
-	return (void*) new wxCriticalSection ();
-}
-
-EWXWEXPORT(void, wxCriticalSection_Delete) (void* _obj)
-{
-	delete (wxCriticalSection*)_obj;
-}
-
-EWXWEXPORT(void, wxCriticalSection_Enter) (void* _obj)
-{
-	((wxCriticalSection*)_obj)->Enter();
-}
-
-EWXWEXPORT(void, wxCriticalSection_Leave) (void* _obj)
-{
-	((wxCriticalSection*)_obj)->Leave();
-}
-
-
-EWXWEXPORT(void*, wxMutex_Create) ()
-{
-	return (void*) new wxMutex ();
-}
-
-EWXWEXPORT(void, wxMutex_Delete) (void* _obj)
-{
-	delete (wxMutex*)_obj;
-}
-
-EWXWEXPORT(int, wxMutex_Lock) (void* _obj)
-{
-	return (int)((wxMutex*)_obj)->Lock();
-}
-
-EWXWEXPORT(int, wxMutex_TryLock) (void* _obj)
-{
-	return (int)((wxMutex*)_obj)->TryLock();
-}
-
-EWXWEXPORT(int, wxMutex_Unlock) (void* _obj)
-{
-	return (int)((wxMutex*)_obj)->Unlock();
-}
-
-EWXWEXPORT(int, wxMutex_IsLocked) (void* _obj)
-{
-#if wxVERSION_NUMBER >= 2400
-	return 0;
-#else
-	return (int)((wxMutex*)_obj)->IsLocked();
-#endif
-}
-
-EWXWEXPORT(void*, wxCondition_Create) (void* _mutex)
-{
-#if wxVERSION_NUMBER < 2400
-	return (void*) new wxCondition ();
-#else
-	return (void*) new wxCondition (*((wxMutex*)_mutex));
-#endif
-}
-
-EWXWEXPORT(void, wxCondition_Delete) (void* _obj)
-{
-	delete (wxCondition*)_obj;
-}
-
-EWXWEXPORT(void, wxCondition_Wait) (void* _obj)
-{
-	((wxCondition*)_obj)->Wait();
-}
-
-EWXWEXPORT(int, wxCondition_WaitFor) (void* _obj, int sec, int nsec)
-{
-#if wxVERSION_NUMBER >= 2400
-	return (int)((wxCondition*)_obj)->WaitTimeout((unsigned long)nsec);
-#else
-	return (int)((wxCondition*)_obj)->Wait((unsigned long)sec, (unsigned long)nsec);
-#endif
-}
-
-EWXWEXPORT(void, wxCondition_Signal) (void* _obj)
-{
-	((wxCondition*)_obj)->Signal();
-}
-
-EWXWEXPORT(void, wxCondition_Broadcast) (void* _obj)
-{
-	((wxCondition*)_obj)->Broadcast();
-}
-
-
-EWXWEXPORT(void, wxMutexGui_Enter) ()
-{
-	wxMutexGuiEnter();
-}
-
-EWXWEXPORT(void, wxMutexGui_Leave) ()
-{
-	wxMutexGuiLeave();
-}
-
-}
diff --git a/wxc/src/ewxw/eljtimer.cpp b/wxc/src/ewxw/eljtimer.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljtimer.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxTimer_Create) (void* _prt, int _id)
-{
-	return (void*) new wxTimer ((wxEvtHandler*)_prt, _id);
-}
-
-EWXWEXPORT(void, wxTimer_Delete) (void* _obj)
-{
-	delete (wxTimer*)_obj;
-}
-
-EWXWEXPORT(int, wxTimer_Start) (void* _obj, int _int, int _one)
-{
-	return (int)((wxTimer*)_obj)->Start (_int, _one != 0);
-}
-
-EWXWEXPORT(void, wxTimer_Stop) (void* _obj)
-{
-	((wxTimer*)_obj)->Stop();
-}
-
-EWXWEXPORT(int, wxTimer_IsRuning) (void* _obj)
-{
-	return (int)((wxTimer*)_obj)->IsRunning();
-}
-
-EWXWEXPORT(int, wxTimer_IsOneShot) (void* _obj)
-{
-	return (int)((wxTimer*)_obj)->IsOneShot();
-}
-
-EWXWEXPORT(int, wxTimer_GetInterval) (void* _obj)
-{
-	return ((wxTimer*)_obj)->GetInterval();
-}
-
-
-EWXWEXPORT(void*,wxStopWatch_Create)()
-{
-	return (void*)new wxStopWatch();
-}
-	
-EWXWEXPORT(void,wxStopWatch_Delete)(void* _obj)
-{
-	delete (wxStopWatch*)_obj;
-}
-	
-EWXWEXPORT(void,wxStopWatch_Start)(void* _obj, int _t)
-{
-	((wxStopWatch*)_obj)->Start((long)_t);
-}
-	
-EWXWEXPORT(void,wxStopWatch_Pause)(void* _obj)
-{
-	((wxStopWatch*)_obj)->Pause();
-}
-	
-EWXWEXPORT(void,wxStopWatch_Resume)(void* _obj)
-{
-	((wxStopWatch*)_obj)->Resume();
-}
-	
-EWXWEXPORT(int,wxStopWatch_Time)(void* _obj)
-{
-	return (int)((wxStopWatch*)_obj)->Time();
-}
-	
-}
diff --git a/wxc/src/ewxw/eljtipwnd.cpp b/wxc/src/ewxw/eljtipwnd.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljtipwnd.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "wrapper.h"
-#if wxVERSION_NUMBER >= 2400
-#include "wx/tipwin.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*,wxTipWindow_Create)(void*parent, void* text, int maxLength)
-{
-	return (void*)new wxTipWindow((wxWindow*)parent, (wxChar*)text, (wxCoord)maxLength);
-}
-	
-EWXWEXPORT(void,wxTipWindow_SetTipWindowPtr)(void* _obj, void* windowPtr)
-{
-	((wxTipWindow*)_obj)->SetTipWindowPtr((wxTipWindow**)windowPtr);
-}
-	
-EWXWEXPORT(void,wxTipWindow_SetBoundingRect)(void* _obj, int x, int y, int w, int h)
-{
-	((wxTipWindow*)_obj)->SetBoundingRect(wxRect(x, y, w, h));
-}
-	
-EWXWEXPORT(void,wxTipWindow_Close)(void* _obj)
-{
-	((wxTipWindow*)_obj)->Close();
-}
-
-}
-#endif
diff --git a/wxc/src/ewxw/eljtoolbar.cpp b/wxc/src/ewxw/eljtoolbar.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljtoolbar.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxToolBar_Create) (void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new wxToolBar ((wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl);
-}
-
-EWXWEXPORT(void, wxToolBar_Delete) (void* _obj)
-{
-	delete (wxToolBar*)_obj;
-}
-
-EWXWEXPORT(int, wxToolBar_AddControl) (void* _obj, void* ctrl)
-{
-	return ((wxToolBar*)_obj)->AddControl ((wxControl*)ctrl) != NULL;
-}
-
-EWXWEXPORT(void, wxToolBar_AddSeparator) (void* _obj)
-{
-	((wxToolBar*)_obj)->AddSeparator ();
-}
-
-EWXWEXPORT(void, wxToolBar_AddTool) (void* _obj, int id, void* bmp, void* shelp, void* lhelp)
-{
-	((wxToolBar*)_obj)->AddTool (id, *(wxBitmap*)bmp, (wxChar*)shelp, (wxChar*)lhelp);
-}
-
-EWXWEXPORT(void, wxToolBar_AddToolEx) (void* _obj, int id, void* bmp1, void* bmp2, int tgl, int x, int y, void* dat, void* shelp, void* lhelp)
-{
-	((wxToolBar*)_obj)->AddTool (id, *(wxBitmap*)bmp1, *(wxBitmap*)bmp2, tgl != 0, x, y, (wxObject*)dat, (wxChar*)shelp, (wxChar*)lhelp);
-}
-
-EWXWEXPORT(int, wxToolBar_DeleteTool) (void* _obj, int id)
-{
-	return (int)((wxToolBar*)_obj)->DeleteTool (id);
-}
-
-EWXWEXPORT(int, wxToolBar_DeleteToolByPos) (void* _obj, int pos)
-{
-	return (int)((wxToolBar*)_obj)->DeleteToolByPos (pos);
-}
-
-EWXWEXPORT(void, wxToolBar_EnableTool) (void* _obj, int id, int enb)
-{
-	((wxToolBar*)_obj)->EnableTool (id, enb != 0);
-}
-
-EWXWEXPORT(void, wxToolBar_GetToolSize) (void* _obj, void* x, void* y)
-{
-	*((int*)x) = ((wxToolBar*)_obj)->GetToolSize().x;
-	*((int*)y) = ((wxToolBar*)_obj)->GetToolSize().y;
-}
-
-EWXWEXPORT(void, wxToolBar_GetToolBitmapSize) (void* _obj, void* x, void* y)
-{
-	*((int*)x) = ((wxToolBar*)_obj)->GetToolBitmapSize().x;
-	*((int*)y) = ((wxToolBar*)_obj)->GetToolBitmapSize().y;
-}
-
-EWXWEXPORT(void, wxToolBar_GetMargins) (void* _obj, void* x, void* y)
-{
-	*((int*)x) = ((wxToolBar*)_obj)->GetMargins().x;
-	*((int*)y) = ((wxToolBar*)_obj)->GetMargins().y;
-}
-
-EWXWEXPORT(void*, wxToolBar_GetToolClientData) (void* _obj, int id)
-{
-	return (void*)((wxToolBar*)_obj)->GetToolClientData (id);
-}
-
-EWXWEXPORT(int, wxToolBar_GetToolEnabled) (void* _obj, int id)
-{
-	return (int)((wxToolBar*)_obj)->GetToolEnabled (id);
-}
-
-EWXWEXPORT(int, wxToolBar_GetToolLongHelp) (void* _obj, int id, void* _buf)
-{
-	wxString result =((wxToolBar*)_obj)->GetToolLongHelp (id);
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(int, wxToolBar_GetToolPacking) (void* _obj)
-{
-	return ((wxToolBar*)_obj)->GetToolPacking ();
-}
-
-EWXWEXPORT(int, wxToolBar_GetToolShortHelp) (void* _obj, int id, void* _buf)
-{
-	wxString result =((wxToolBar*)_obj)->GetToolShortHelp (id);
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(int, wxToolBar_GetToolState) (void* _obj, int id)
-{
-	return (int)((wxToolBar*)_obj)->GetToolState (id);
-}
-
-EWXWEXPORT(void, wxToolBar_InsertControl) (void* _obj, int pos, void* ctrl)
-{
-	((wxToolBar*)_obj)->InsertControl ((size_t)pos, (wxControl*) ctrl);
-}
-
-EWXWEXPORT(void, wxToolBar_InsertSeparator) (void* _obj, int pos)
-{
-	((wxToolBar*)_obj)->InsertSeparator ((size_t)pos);
-}
-
-EWXWEXPORT(void, wxToolBar_InsertTool) (void* _obj, int pos, int id, void* bmp1, void* bmp2, int tgl, void* dat, void* shelp, void* lhelp)
-{
-	((wxToolBar*)_obj)->InsertTool ((size_t)pos, id, *(wxBitmap*)bmp1, *(wxBitmap*)bmp2, tgl != 0, (wxObject*)dat, (wxChar*)shelp, (wxChar*)lhelp);
-}
-
-EWXWEXPORT(int, wxToolBar_Realize) (void* _obj)
-{
-	return (int)((wxToolBar*)_obj)->Realize ();
-}
-
-EWXWEXPORT(void, wxToolBar_RemoveTool) (void* _obj, int id)
-{
-	((wxToolBar*)_obj)->RemoveTool (id);
-}
-
-EWXWEXPORT(void, wxToolBar_SetMargins) (void* _obj, int x, int y)
-{
-#ifdef __WIN32__
-	((wxToolBar*)_obj)->SetMargins(wxSize(x, y));
-#else
-	((wxToolBar*)_obj)->SetMargins(x, y);
-#endif
-}
-
-EWXWEXPORT(void, wxToolBar_SetToolBitmapSize) (void* _obj, int x, int y)
-{
-	((wxToolBar*)_obj)->SetToolBitmapSize (wxSize(x, y));
-}
-
-EWXWEXPORT(void, wxToolBar_SetToolClientData) (void* _obj, int id, void* dat)
-{
-	((wxToolBar*)_obj)->SetToolClientData (id, (wxObject*)dat);
-}
-
-EWXWEXPORT(void, wxToolBar_SetToolLongHelp) (void* _obj, int id, void* str)
-{
-	((wxToolBar*)_obj)->SetToolLongHelp (id, (wxChar*)str);
-}
-
-EWXWEXPORT(void, wxToolBar_SetToolPacking) (void* _obj, int val)
-{
-	((wxToolBar*)_obj)->SetToolPacking (val);
-}
-
-EWXWEXPORT(void, wxToolBar_SetToolShortHelp) (void* _obj, int id, void* str)
-{
-	((wxToolBar*)_obj)->SetToolShortHelp (id, (wxChar*)str);
-}
-
-EWXWEXPORT(void, wxToolBar_SetToolSeparation) (void* _obj, int val)
-{
-	((wxToolBar*)_obj)->SetToolSeparation (val);
-}
-
-EWXWEXPORT(void, wxToolBar_ToggleTool) (void* _obj, int id, int val)
-{
-	((wxToolBar*)_obj)->ToggleTool (id, val != 0);
-}
-
-}
diff --git a/wxc/src/ewxw/eljtreectrl.cpp b/wxc/src/ewxw/eljtreectrl.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljtreectrl.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-#include "wrapper.h"
-
-class ELJTreeItemData : public wxTreeItemData
-{
-	public:
-		void* data;
-		ELJTreeItemData(void* _data) {data = _data;};
-};
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxTreeItemId_Create) ()
-{
-	return new wxTreeItemId();
-}
-
-EWXWEXPORT(void, wxTreeItemId_Delete) (void* _obj)
-{
-	delete (wxTreeItemId*)_obj;
-}
-
-EWXWEXPORT(int, wxTreeItemId_IsOk) (void* _obj)
-{
-	return (int)((wxTreeItemId*)_obj)->IsOk();
-}
-
-IMPLEMENT_DYNAMIC_CLASS(ELJTreeControl,wxTreeCtrl)
-
-
-EWXWEXPORT(void*, wxTreeCtrl_Create) (void* _obj, void* _cmp, void* _prt, int _id, int _lft, int _top, int _wdt, int _hgt, int _stl)
-{
-	return (void*) new ELJTreeControl (_obj, _cmp, (wxWindow*)_prt, _id, wxPoint(_lft, _top), wxSize(_wdt, _hgt), _stl, wxDefaultValidator);
-}
-
-EWXWEXPORT(int, wxTreeCtrl_GetCount)(void* _obj)
-{
-	int result =(int)((ELJTreeControl*)_obj)->GetCount();
-#ifdef __WXGTK__
-	wxTreeItemId t = ((ELJTreeControl*)_obj)->GetRootItem();
-	if (t.IsOk()) result++;
-#endif
-	return result;
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_GetIndent)(void* _obj)
-{
-	return ((ELJTreeControl*)_obj)->GetIndent();
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetIndent)(void* _obj, int indent)
-{
-	((ELJTreeControl*)_obj)->SetIndent(indent);
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_GetSpacing)(void* _obj)
-{
-	return (int)((ELJTreeControl*)_obj)->GetSpacing();
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetSpacing)(void* _obj, int spacing)
-{
-	((ELJTreeControl*)_obj)->SetSpacing(spacing);
-}
-	
-EWXWEXPORT(void*, wxTreeCtrl_GetImageList)(void* _obj)
-{
-	return (void*)((ELJTreeControl*)_obj)->GetImageList();
-}
-	
-EWXWEXPORT(void*, wxTreeCtrl_GetStateImageList)(void* _obj)
-{
-	return (void*)((ELJTreeControl*)_obj)->GetStateImageList();
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetImageList)(void* _obj, void* imageList)
-{
-	((ELJTreeControl*)_obj)->SetImageList((wxImageList*) imageList);
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetStateImageList)(void* _obj, void* imageList)
-{
-	((ELJTreeControl*)_obj)->SetStateImageList((wxImageList*) imageList);
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_GetItemText)(void* _obj, void* item, void* _buf)
-{
-	wxString result = ((ELJTreeControl*)_obj)->GetItemText(*(wxTreeItemId*)item);
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_GetItemImage)(void* _obj, void* item, int which)
-{
-	return ((ELJTreeControl*)_obj)->GetItemImage(*((wxTreeItemId*) item), (wxTreeItemIcon) which);
-}
-	
-EWXWEXPORT(void*, wxTreeCtrl_GetItemData)(void* _obj, void* item)
-{
-	return ((ELJTreeItemData*)((ELJTreeControl*)_obj)->GetItemData(*((wxTreeItemId*) item)))->data;
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemText)(void* _obj, void* item, void* text)
-{
-	((ELJTreeControl*)_obj)->SetItemText(*((wxTreeItemId*) item), (char*)text);
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemImage)(void* _obj, void* item, int image, int which)
-{
-	((ELJTreeControl*)_obj)->SetItemImage(*((wxTreeItemId*)item), image, (wxTreeItemIcon)which);
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemData)(void* _obj, void* item, void* data)
-{
-	((ELJTreeControl*)_obj)->SetItemData(*((wxTreeItemId*) item), new ELJTreeItemData (data));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemHasChildren)(void* _obj, void* item, int has)
-{
-	((ELJTreeControl*)_obj)->SetItemHasChildren(*((wxTreeItemId*)item), has != 0);
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemBold)(void* _obj, void* item, int bold)
-{
-	((ELJTreeControl*)_obj)->SetItemBold(*((wxTreeItemId*) item), bold != 0);
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemDropHighlight)(void* _obj, void* item, int highlight)
-{
-#ifdef __WIN32__
-	((ELJTreeControl*)_obj)->SetItemDropHighlight(*((wxTreeItemId*) item), highlight != 0);
-#endif
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemTextColour)(void* _obj, void* item, void* col)
-{
-	((ELJTreeControl*)_obj)->SetItemTextColour(*((wxTreeItemId*)item), *((wxColour*) col));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemBackgroundColour)(void* _obj, void* item, void* col)
-{
-	((ELJTreeControl*)_obj)->SetItemBackgroundColour(*((wxTreeItemId*) item), *((wxColour*) col));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SetItemFont)(void* _obj, void* item, void* font)
-{
-	((ELJTreeControl*)_obj)->SetItemFont(*((wxTreeItemId*) item), *((wxFont*) font));
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_IsVisible)(void* _obj, void* item)
-{
-	return (int)((ELJTreeControl*)_obj)->IsVisible(*((wxTreeItemId*) item));
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_ItemHasChildren)(void* _obj, void* item)
-{
-	return (int)((ELJTreeControl*)_obj)->ItemHasChildren(*((wxTreeItemId*) item));
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_IsExpanded)(void* _obj, void* item)
-{
-	return (int)((ELJTreeControl*)_obj)->IsExpanded(*((wxTreeItemId*) item));
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_IsSelected)(void* _obj, void* item)
-{
-	return (int)((ELJTreeControl*)_obj)->IsSelected(*((wxTreeItemId*) item));
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_IsBold)(void* _obj, void* item)
-{
-	return (int)((ELJTreeControl*)_obj)->IsBold(*((wxTreeItemId*) item));
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_GetChildrenCount)(void* _obj, void* item, int recursively)
-{
-	return ((ELJTreeControl*)_obj)->GetChildrenCount(*((wxTreeItemId*) item), recursively);
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetRootItem)(void* _obj, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetRootItem();
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetSelection)(void* _obj, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetSelection();
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_GetSelections)(void* _obj, void* selections)
-{
-	int result = 0;
-	wxArrayTreeItemIds sel;
-	result = ((ELJTreeControl*)_obj)->GetSelections(sel);
-	
-	if (selections)
-	{
-		for (int i = 0; i < result; i++)
-			*(((wxTreeItemId**)selections)[i]) = sel[i];
-	}
-	return result;		
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetParent)(void* _obj, void* item, void* _item)
-{
-#if wxVERSION_NUMBER < 2400
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetParent(*((wxTreeItemId*)item));
-#else
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetItemParent(*((wxTreeItemId*)item));
-#endif
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetFirstChild)(void* _obj, void* item, void* cookie, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetFirstChild(*((wxTreeItemId*)item), *((long*)cookie));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetNextChild)(void* _obj, void* item, void* cookie, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetNextChild(*((wxTreeItemId*)item), *((long*)cookie));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetLastChild)(void* _obj, void* item, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetLastChild(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetNextSibling)(void* _obj, void* item, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetNextSibling(*((wxTreeItemId*) item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetPrevSibling)(void* _obj, void* item, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetPrevSibling(*((wxTreeItemId*) item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetFirstVisibleItem)(void* _obj, void* item, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetFirstVisibleItem();
-}
-
-EWXWEXPORT(void, wxTreeCtrl_GetNextVisible)(void* _obj, void* item, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetNextVisible(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_GetPrevVisible)(void* _obj, void* item, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->GetPrevVisible(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_AddRoot)(void* _obj, void* text, int image, int selectedImage, void* data, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->AddRoot((char*) text, image, selectedImage, new ELJTreeItemData(data));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_PrependItem)(void* _obj, void* parent, void* text, int image, int selectedImage, void* data, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->PrependItem(*((wxTreeItemId*)parent), (char*)text, image, selectedImage, new ELJTreeItemData(data));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_InsertItem)(void* _obj, void* parent, void* idPrevious, void* text, int image, int selectedImage, void* data, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->InsertItem(*((wxTreeItemId*)parent), *((wxTreeItemId*)idPrevious), (char*)text, image, selectedImage, new ELJTreeItemData(data));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_InsertItemByIndex)(void* _obj, void* parent, int index, void* text, int image, int selectedImage, void* data, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->InsertItem(*((wxTreeItemId*)parent), index, (char*)text, image, selectedImage, new ELJTreeItemData(data));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_AppendItem)(void* _obj, void* parent, void* text, int image, int selectedImage, void* data, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->AppendItem(*((wxTreeItemId*) parent), (char*)text, image, selectedImage, new ELJTreeItemData(data));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_Delete)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->Delete(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_DeleteChildren)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->DeleteChildren(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_DeleteAllItems)(void* _obj)
-{
-	((ELJTreeControl*)_obj)->DeleteAllItems();
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_Expand)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->Expand(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_Collapse)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->Collapse(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_CollapseAndReset)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->CollapseAndReset(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_Toggle)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->Toggle(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_Unselect)(void* _obj)
-{
-	((ELJTreeControl*)_obj)->Unselect();
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_UnselectAll)(void* _obj)
-{
-	((ELJTreeControl*)_obj)->UnselectAll();
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SelectItem)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->SelectItem(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_EnsureVisible)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->EnsureVisible(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_ScrollTo)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->ScrollTo(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_EditLabel)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->EditLabel(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void*, wxTreeCtrl_GetEditControl)(void* _obj)
-{
-#ifdef __WIN32__
-	return (void*)((ELJTreeControl*)_obj)->GetEditControl();
-#else
-	return NULL;
-#endif
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_EndEditLabel)(void* _obj, void* item, int discardChanges)
-{
-#ifdef __WIN32__
-	((ELJTreeControl*)_obj)->EndEditLabel(*((wxTreeItemId*)item), discardChanges != 0);
-#endif
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_OnCompareItems)(void* _obj, void* item1, void* item2)
-{
-	return ((ELJTreeControl*)_obj)->OnCompareItems(*((wxTreeItemId*)item1), *((wxTreeItemId*)item2));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_SortChildren)(void* _obj, void* item)
-{
-	((ELJTreeControl*)_obj)->SortChildren(*((wxTreeItemId*)item));
-}
-	
-EWXWEXPORT(void, wxTreeCtrl_HitTest)(void* _obj, int _x, int _y, void* flags, void* _item)
-{
-	(*(wxTreeItemId*)_item) = ((ELJTreeControl*)_obj)->HitTest(wxPoint(_x, _y), *((int*)flags));
-}
-	
-EWXWEXPORT(int, wxTreeCtrl_GetBoundingRect)(void* _obj, void* item, int textOnly, void* _x, void* _y, void* _w, void* _h)
-{
-#ifdef __WIN32__
-	wxRect rct;
-	int result = ((ELJTreeControl*)_obj)->GetBoundingRect(*((wxTreeItemId*)item), rct, textOnly != 0);
-	if (result)
-	{
-		*((int*)_x) = rct.x;
-		*((int*)_y) = rct.y;
-		*((int*)_w) = rct.width;
-		*((int*)_h) = rct.height;
-	}
-	return result;
-#else
-	return 0;
-#endif
-}
-	
-}
diff --git a/wxc/src/ewxw/eljvalidator.cpp b/wxc/src/ewxw/eljvalidator.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljvalidator.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxValidator_Create)()
-{
-	return (void*) new wxValidator();
-}
-
-EWXWEXPORT(void, wxValidator_Delete)(void* _obj)
-{
-	delete (wxValidator*)_obj;
-}
-
-EWXWEXPORT(int, wxValidator_Validate)(void* _obj, void* parent)
-{
-	return (int)((wxValidator*)_obj)->Validate((wxWindow*)parent);
-}
-	
-EWXWEXPORT(int, wxValidator_TransferToWindow)(void* _obj)
-{
-	return (int)((wxValidator*)_obj)->TransferToWindow();
-}
-	
-EWXWEXPORT(int, wxValidator_TransferFromWindow)(void* _obj)
-{
-	return (int)((wxValidator*)_obj)->TransferFromWindow();
-}
-	
-EWXWEXPORT(void*, wxValidator_GetWindow)(void* _obj)
-{
-	return (void*)((wxValidator*)_obj)->GetWindow();
-}
-	
-EWXWEXPORT(void, wxValidator_SetWindow)(void* _obj, void* win)
-{
-	((wxValidator*)_obj)->SetWindow((wxWindowBase*)win);
-}
-	
-EWXWEXPORT(int, wxValidator_IsSilent)()
-{
-	return (int)wxValidator::IsSilent();
-}
-	
-EWXWEXPORT(void, wxValidator_SetBellOnError)(int doIt)
-{
-	wxValidator::SetBellOnError(doIt != 0);
-}
-	
-EWXWEXPORT(void*, wxTextValidator_Create)(int style, void* val)
-{
-	return (void*) new wxTextValidator((long)style, new wxString);
-}
-
-EWXWEXPORT(int, wxTextValidator_GetStyle)(void* _obj)
-{
-	return (int)((wxTextValidator*)_obj)->GetStyle();
-}
-	
-EWXWEXPORT(void, wxTextValidator_SetStyle)(void* _obj, int style)
-{
-	((wxTextValidator*)_obj)->SetStyle((long) style);
-}
-	
-EWXWEXPORT(void, wxTextValidator_SetIncludeList)(void* _obj, void* list, int count)
-{
-#if (wxVERSION_NUMBER <= 2600)
-	wxStringList str;
-	
-	for (int i = 0; i < count; i++)
-		str.Add(((wxChar**)list)[i]);
-		
-	((wxTextValidator*)_obj)->SetIncludeList(str);
-#else
-	((wxTextValidator*)_obj)->SetIncludes((const wxArrayString&)list);
-#endif
-}
-	
-EWXWEXPORT(int, wxTextValidator_GetIncludeList)(void* _obj, void* _ref)
-{
-#if (wxVERSION_NUMBER <= 2600)
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < ((wxTextValidator*)_obj)->GetIncludeList().GetCount(); i++)
-			((const wxChar**)_ref)[i] = wxStrdup(((wxTextValidator*)_obj)->GetIncludeList().Item(i)->GetData());
-	}
-	return ((wxTextValidator*)_obj)->GetIncludeList().GetCount();
-#else
-	wxArrayString arr = ((wxTextValidator*)_obj)->GetIncludes();
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)_ref)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	return arr.GetCount();
-#endif
-}
-	
-EWXWEXPORT(void, wxTextValidator_SetExcludeList)(void* _obj, void* list, int count)
-{
-#if (wxVERSION_NUMBER <= 2600)
-	wxStringList str;
-	
-	for (int i = 0; i < count; i++)
-		str.Add(((wxChar**)list)[i]);
-		
-	((wxTextValidator*)_obj)->SetExcludeList(str);
-#else
-	((wxTextValidator*)_obj)->SetExcludes((const wxArrayString&)list);
-#endif
-}
-	
-EWXWEXPORT(int, wxTextValidator_GetExcludeList)(void* _obj, void* _ref)
-{
-#if (wxVERSION_NUMBER <= 2600)
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < ((wxTextValidator*)_obj)->GetExcludeList().GetCount(); i++)
-			((const wxChar**)_ref)[i] = ((wxTextValidator*)_obj)->GetExcludeList().Item(i)->GetData();
-	}
-	return ((wxTextValidator*)_obj)->GetExcludeList().GetCount();
-#else
-	wxArrayString arr = ((wxTextValidator*)_obj)->GetExcludes();
-	if (_ref)
-	{
-		for (unsigned int i = 0; i < arr.GetCount(); i++)
-			((const wxChar**)_ref)[i] = wxStrdup (arr.Item(i).c_str());
-	}
-	return arr.GetCount();
-#endif
-}
-	
-EWXWEXPORT(void, wxTextValidator_OnChar)(void* _obj, void* event)
-{
-	((wxTextValidator*)_obj)->OnChar(*((wxKeyEvent*)event));
-}
-
-EWXWEXPORT(void*, ELJTextValidator_Create) (void* _obj, void* _fnc, void* _txt, long _stl)
-{
-	return new ELJTextValidator(_obj, _fnc, _txt, _stl);
-}
-
-}
-
-bool ELJTextValidator::Validate(wxWindow* _prt)
-{
-	if (obj && fnc)
-		return fnc(obj) != 0;
-	else
-		return wxTextValidator::Validate(_prt);
-}
diff --git a/wxc/src/ewxw/eljwindow.cpp b/wxc/src/ewxw/eljwindow.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljwindow.cpp
+++ /dev/null
@@ -1,681 +0,0 @@
-#include "wrapper.h"
-#include "wx/tooltip.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxWindow_Create)(void* _prt, int _id, int _x, int _y, int _w, int _h, int _stl)
-{
-	return (void*)new wxWindow((wxWindow*)_prt, (wxWindowID)_id, wxPoint(_x, _y), wxSize(_w, _h), (long)_stl);
-}
-	
-EWXWEXPORT(int, wxWindow_Close)(void* _obj, int _force)
-{
-	return (int)((wxWindow*)_obj)->Close(_force != 0);
-}
-	
-EWXWEXPORT(int, wxWindow_Destroy)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->Destroy();
-}
-	
-EWXWEXPORT(void, wxWindow_Clear)(void* _obj)
-{
-#if wxCHECK_VERSION(2,5,0)
-        ((wxWindow*)_obj)->ClearBackground();
-#else
-	((wxWindow*)_obj)->Clear();
-#endif
-}
-	
-EWXWEXPORT(void, wxWindow_Fit)(void* _obj)
-{
-	((wxWindow*)_obj)->Fit();
-}
-	
-EWXWEXPORT(int, wxWindow_DestroyChildren)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->DestroyChildren();
-}
-	
-EWXWEXPORT(int, wxWindow_IsBeingDeleted)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->IsBeingDeleted();
-}
-	
-EWXWEXPORT(void, wxWindow_SetLabel)(void* _obj, wxChar* _title)
-{
-	((wxWindow*)_obj)->SetLabel(_title);
-}
-	
-EWXWEXPORT(int, wxWindow_GetLabel)(void* _obj, void* _buf)
-{
-	wxString result = ((wxWindow*)_obj)->GetLabel().c_str();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(int, wxWindow_GetLabelEmpty)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->GetLabel().IsEmpty();
-}
-	
-EWXWEXPORT(void, wxWindow_SetName)(void* _obj, wxChar* _name)
-{
-	((wxWindow*)_obj)->SetName(_name);
-}
-	
-EWXWEXPORT(int, wxWindow_GetName)(void* _obj, void* _buf)
-{
-	wxString result =((wxWindow*)_obj)->GetName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, wxWindow_SetId)(void* _obj, int _id)
-{
-	((wxWindow*)_obj)->SetId(_id);
-}
-	
-EWXWEXPORT(int, wxWindow_GetId)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->GetId();
-}
-	
-EWXWEXPORT(void, wxWindow_SetSize)(void* _obj,  int x, int y, int width, int height, int sizeFlags)
-{
-	((wxWindow*)_obj)->SetSize(x, y, width, height, sizeFlags);
-}
-	
-EWXWEXPORT(void, wxWindow_Move)(void* _obj,  int x, int y )
-{
-	((wxWindow*)_obj)->Move( x, y );
-}
-	
-EWXWEXPORT(void, wxWindow_Raise)(void* _obj)
-{
-	((wxWindow*)_obj)->Raise();
-}
-	
-EWXWEXPORT(void, wxWindow_Lower)(void* _obj)
-{
-	((wxWindow*)_obj)->Lower();
-}
-	
-EWXWEXPORT(void, wxWindow_SetClientSize)(void* _obj, int width, int height )
-{
-	((wxWindow*)_obj)->SetClientSize( width, height );
-}
-	
-EWXWEXPORT(void, wxWindow_GetPosition)(void* _obj, void* _x, void* _y)
-{
-	((wxWindow*)_obj)->GetPosition((int*)_x, (int*)_y);
-}
-	
-EWXWEXPORT(void, wxWindow_GetSize)(void* _obj, void* _w, void* _h)
-{
-	((wxWindow*)_obj)->GetSize((int*)_w, (int*)_h);
-}
-	
-EWXWEXPORT(void, wxWindow_GetRect)(void* _obj, int* x, int* y, int* w, int* h)
-{
-	wxRect rc = ((wxWindow*)_obj)->GetRect();
-	*x = rc.x;
-	*y = rc.y;
-	*w = rc.width;
-	*h = rc.height;
-}
-	
-EWXWEXPORT(void, wxWindow_GetClientSize)(void* _obj, void* _w, void* _h)
-{
-	((wxWindow*)_obj)->GetClientSize((int*)_w, (int*)_h);
-}
-	
-EWXWEXPORT(void, wxWindow_GetBestSize)(void* _obj, void* _w, void* _h)
-{
-	((wxWindow*)_obj)->GetBestSize((int*)_w, (int*)_h);
-}
-	
-EWXWEXPORT(void, wxWindow_Center)(void* _obj, int direction)
-{
-	((wxWindow*)_obj)->Center( direction );
-}
-	
-EWXWEXPORT(void, wxWindow_CenterOnParent)(void* _obj, int dir)
-{
-	((wxWindow*)_obj)->CenterOnParent(dir);
-}
-	
-EWXWEXPORT(void, wxWindow_SetSizeHints)(void* _obj, int minW, int minH,int maxW, int maxH, int incW, int incH)
-{
-	((wxWindow*)_obj)->SetSizeHints( minW, minH, maxW, maxH, incW, incH );
-}
-	
-EWXWEXPORT(int, wxWindow_GetMinWidth)(void* _obj)
-{
-	return ((wxWindow*)_obj)->GetMinWidth();
-}
-	
-EWXWEXPORT(int, wxWindow_GetMinHeight)(void* _obj)
-{
-	return ((wxWindow*)_obj)->GetMinHeight();
-}
-	
-EWXWEXPORT(int, wxWindow_GetMaxWidth)(void* _obj)
-{
-	return ((wxWindow*)_obj)->GetMaxWidth();
-}
-
-EWXWEXPORT(int, wxWindow_GetMaxHeight)(void* _obj)
-{
-	return ((wxWindow*)_obj)->GetMaxHeight();
-}
-	
-EWXWEXPORT(int, wxWindow_Show)(void* _obj)
-{
-	return ((wxWindow*)_obj)->Show();
-}
-	
-EWXWEXPORT(int, wxWindow_Hide)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->Hide();
-}
-	
-EWXWEXPORT(int, wxWindow_Enable)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->Enable();
-}
-
-EWXWEXPORT(int, wxWindow_Disable)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->Disable();
-}
-	
-EWXWEXPORT(int, wxWindow_IsShown)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->IsShown();
-}
-	
-EWXWEXPORT(int, wxWindow_IsEnabled)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->IsEnabled();
-}
-	
-EWXWEXPORT(void, wxWindow_SetWindowStyleFlag)(void* _obj, long style)
-{
-	((wxWindow*)_obj)->SetWindowStyleFlag( style );
-}
-	
-EWXWEXPORT(int, wxWindow_GetWindowStyleFlag)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->GetWindowStyleFlag();
-}
-	
-EWXWEXPORT(int, wxWindow_HasFlag)(void* _obj, int flag)
-{
-	return (int)((wxWindow*)_obj)->HasFlag(flag);
-}
-	
-EWXWEXPORT(void, wxWindow_SetExtraStyle)(void* _obj, long exStyle)
-{
-	((wxWindow*)_obj)->SetExtraStyle(exStyle);
-}
-	
-EWXWEXPORT(void, wxWindow_MakeModal)(void* _obj, int modal)
-{
-	((wxWindow*)_obj)->MakeModal(modal != 0);
-}
-	
-EWXWEXPORT(void, wxWindow_SetFocus)(void* _obj)
-{
-	((wxWindow*)_obj)->SetFocus();
-}
-	
-EWXWEXPORT(void*, wxWindow_FindFocus)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->FindFocus();
-}
-	
-EWXWEXPORT(int, wxWindow_GetChildren)(void* _obj, void* _res, int _cnt)
-{
-	if (_res && (unsigned int)_cnt == ((wxWindow*)_obj)->GetChildren().GetCount())
-	{
-		unsigned int i = 0;
-		wxWindowListNode* node = ((wxWindow*)_obj)->GetChildren().GetFirst();
-	
-		while (node)
-		{
-			((void**)_res)[i++] = (void*)(node->GetData());
-			node = node->GetNext();
-		}
-
-		return i;
-	}
-	else
-		return ((wxWindow*)_obj)->GetChildren().GetCount();
-}
-	
-EWXWEXPORT(void*, wxWindow_GetParent)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetParent();
-}
-	
-EWXWEXPORT(int, wxWindow_IsTopLevel)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->IsTopLevel();
-}
-	
-EWXWEXPORT(void*, wxWindow_FindWindow)(void* _obj, wxChar* name )
-{
-	return (void*)((wxWindow*)_obj)->FindWindow( name );
-}
-	
-EWXWEXPORT(void, wxWindow_AddChild)(void* _obj, void* child )
-{
-	((wxWindow*)_obj)->AddChild( (wxWindowBase*) child );
-}
-	
-EWXWEXPORT(void, wxWindow_RemoveChild)(void* _obj, void* child )
-{
-	((wxWindow*)_obj)->RemoveChild( (wxWindowBase*) child );
-}
-	
-EWXWEXPORT(void*, wxWindow_GetEventHandler)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetEventHandler();
-}
-	
-EWXWEXPORT(void, wxWindow_PushEventHandler)(void* _obj, void* handler )
-{
-	((wxWindow*)_obj)->PushEventHandler( (wxEvtHandler*) handler );
-}
-	
-EWXWEXPORT(void*, wxWindow_PopEventHandler)(void* _obj, int deleteHandler)
-{
-	return (void*)((wxWindow*)_obj)->PopEventHandler(deleteHandler != 0);
-}
-	
-EWXWEXPORT(void, wxWindow_SetValidator)(void* _obj, void* validator )
-{
-	((wxWindow*)_obj)->SetValidator(*((wxValidator*)validator));
-}
-	
-EWXWEXPORT(void*, wxWindow_GetValidator)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetValidator();
-}
-	
-EWXWEXPORT(void, wxWindow_SetClientData)(void* _obj, void *data )
-{
-	((wxWindow*)_obj)->SetClientData( data );
-}
-	
-EWXWEXPORT(void*, wxWindow_GetClientData)(void* _obj)
-{
-	return (void*) ((wxWindow*)_obj)->GetClientData();
-}
-	
-EWXWEXPORT(int, wxWindow_Validate)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->Validate();
-}
-	
-EWXWEXPORT(int, wxWindow_TransferDataToWindow)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->TransferDataToWindow();
-}
-	
-EWXWEXPORT(int, wxWindow_TransferDataFromWindow)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->TransferDataFromWindow();
-}
-	
-EWXWEXPORT(void, wxWindow_InitDialog)(void* _obj)
-{
-	((wxWindow*)_obj)->InitDialog();
-}
-	
-EWXWEXPORT(void, wxWindow_SetAcceleratorTable)(void* _obj, void* accel )
-{
-	((wxWindow*)_obj)->SetAcceleratorTable(*((wxAcceleratorTable*) accel));
-}
-	
-EWXWEXPORT(void, wxWindow_ConvertPixelsToDialog)(void* _obj, int* x, int* y)
-{
-	wxPoint pt = ((wxWindow*)_obj)->ConvertPixelsToDialog(wxPoint(*x, *y));
-	*x = pt.x;
-	*y = pt.y;
-}
-	
-EWXWEXPORT(void, wxWindow_ConvertDialogToPixels)(void* _obj, int* x, int* y)
-{
-	wxPoint pt = ((wxWindow*)_obj)->ConvertDialogToPixels(wxPoint(*x, *y));
-	*x = pt.x;
-	*y = pt.y;
-}
-	
-EWXWEXPORT(void, wxWindow_WarpPointer)(void* _obj, int x, int y)
-{
-	((wxWindow*)_obj)->WarpPointer(x, y);
-}
-	
-EWXWEXPORT(void, wxWindow_CaptureMouse)(void* _obj)
-{
-	((wxWindow*)_obj)->CaptureMouse();
-}
-	
-EWXWEXPORT(void, wxWindow_ReleaseMouse)(void* _obj)
-{
-	((wxWindow*)_obj)->ReleaseMouse();
-}
-	
-EWXWEXPORT(void, wxWindow_Refresh)(void* _obj, int eraseBackground)
-{
-	((wxWindow*)_obj)->Refresh(eraseBackground != 0, (const wxRect*) NULL);
-}
-	
-EWXWEXPORT(void, wxWindow_RefreshRect)(void* _obj, int eraseBackground, int x, int y, int w, int h)
-{
-	const wxRect rect(x, y, w, h);
-	((wxWindow*)_obj)->Refresh(eraseBackground != 0, &rect);
-}
-	
-EWXWEXPORT(void, wxWindow_PrepareDC)(void* _obj, void* dc)
-{
-	((wxWindow*)_obj)->PrepareDC(*((wxDC*)dc));
-}
-	
-EWXWEXPORT(void*, wxWindow_GetUpdateRegion)(void* _obj)
-{
-	return (void*) (&((wxWindow*)_obj)->GetUpdateRegion());
-}
-	
-EWXWEXPORT(int, wxWindow_IsExposed)(void* _obj,  int x, int y, int w, int h )
-{
-	return (int)((wxWindow*)_obj)->IsExposed( x, y, w, h );
-}
-	
-EWXWEXPORT(int, wxWindow_SetBackgroundColour)(void* _obj, void* colour)
-{
-	return (int)((wxWindow*)_obj)->SetBackgroundColour(*((wxColour*) colour));
-}
-	
-EWXWEXPORT(int, wxWindow_SetForegroundColour)(void* _obj, void* colour)
-{
-	return (int)((wxWindow*)_obj)->SetForegroundColour(*((wxColour*) colour));
-}
-	
-EWXWEXPORT(void, wxWindow_GetBackgroundColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxWindow*)_obj)->GetBackgroundColour();
-}
-	
-EWXWEXPORT(void, wxWindow_GetForegroundColour)(void* _obj, void* colour)
-{
-	*((wxColour*)colour) = ((wxWindow*)_obj)->GetForegroundColour();
-}
-	
-EWXWEXPORT(int, wxWindow_SetCursor)(void* _obj, void* cursor)
-{
-	return (int)((wxWindow*)_obj)->SetCursor(*((wxCursor*) cursor));
-}
-	
-EWXWEXPORT(void*, wxWindow_GetCursor)(void* _obj)
-{
-	return (void*) (&((wxWindow*)_obj)->GetCursor());
-}
-	
-EWXWEXPORT(int, wxWindow_SetFont)(void* _obj,  void* font)
-{
-	return (int)((wxWindow*)_obj)->SetFont( *((wxFont*)font) );
-}
-	
-EWXWEXPORT(void, wxWindow_GetFont)(void* _obj, void* _font)
-{
-	(*(wxFont*)_font) = ((wxWindow*)_obj)->GetFont();
-}
-	
-EWXWEXPORT(void, wxWindow_SetCaret)(void* _obj, void* caret)
-{
-	((wxWindow*)_obj)->SetCaret((wxCaret*)caret);
-}
-	
-EWXWEXPORT(void*, wxWindow_GetCaret)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetCaret();
-}
-	
-EWXWEXPORT(int, wxWindow_GetCharHeight)(void* _obj)
-{
-	return ((wxWindow*)_obj)->GetCharHeight();
-}
-	
-EWXWEXPORT(int, wxWindow_GetCharWidth)(void* _obj)
-{
-	return ((wxWindow*)_obj)->GetCharWidth();
-}
-	
-EWXWEXPORT(void, wxWindow_GetTextExtent)(void* _obj, wxChar* string, int* x, int* y, int* descent, int* externalLeading, void* theFont)
-{
-	((wxWindow*)_obj)->GetTextExtent(string, x,  y, descent, externalLeading, (const wxFont*) theFont );
-}
-	
-EWXWEXPORT(void, wxWindow_ScreenToClient)(void* _obj, int *x, int *y)
-{
-	((wxWindow*)_obj)->ScreenToClient(x, y);
-}
-	
-EWXWEXPORT(void, wxWindow_UpdateWindowUI)(void* _obj)
-{
-	((wxWindow*)_obj)->UpdateWindowUI();
-}
-	
-EWXWEXPORT(int, wxWindow_PopupMenu)(void* _obj, void* menu, int x, int y )
-{
-	return (int)((wxWindow*)_obj)->PopupMenu((wxMenu*) menu, x, y );
-}
-	
-EWXWEXPORT(void, wxWindow_SetScrollPos)(void* _obj, int orient, int pos, int refresh)
-{
-	((wxWindow*)_obj)->SetScrollPos( orient, pos, refresh != 0);
-}
-	
-EWXWEXPORT(int, wxWindow_GetScrollPos)(void* _obj, int orient )
-{
-	return ((wxWindow*)_obj)->GetScrollPos( orient );
-}
-	
-EWXWEXPORT(int, wxWindow_GetScrollThumb)(void* _obj, int orient )
-{
-	return ((wxWindow*)_obj)->GetScrollThumb( orient );
-}
-	
-EWXWEXPORT(int, wxWindow_GetScrollRange)(void* _obj, int orient )
-{
-	return ((wxWindow*)_obj)->GetScrollRange( orient );
-}
-	
-EWXWEXPORT(void, wxWindow_ScrollWindow)(void* _obj, int dx, int dy)
-{
-	((wxWindow*)_obj)->ScrollWindow(dx, dy, (const wxRect*) NULL);
-}
-	
-EWXWEXPORT(void, wxWindow_ScrollWindowRect)(void* _obj, int dx, int dy, int x, int y, int w, int h)
-{
-	const wxRect rect(x, y, w, h);
-	((wxWindow*)_obj)->ScrollWindow(dx, dy, &rect);
-}
-	
-EWXWEXPORT(void, wxWindow_SetToolTip)(void* _obj, wxChar* tip )
-{
-	((wxWindow*)_obj)->SetToolTip( tip );
-}
-	
-EWXWEXPORT(int, wxWindow_GetToolTip)(void* _obj, void* _buf)
-{
-	wxToolTip* tip = ((wxWindow*)_obj)->GetToolTip();
-
-	if (tip)
-	{
-                wxString res = tip->GetTip();
-		return copyStrToBuf(_buf, res);
-	}
-	return 0;
-}
-	
-EWXWEXPORT(void, wxWindow_SetDropTarget)(void* _obj, void* dropTarget )
-{
-	((wxWindow*)_obj)->SetDropTarget((wxDropTarget*) dropTarget);
-}
-	
-EWXWEXPORT(void*, wxWindow_GetDropTarget)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetDropTarget();
-}
-	
-EWXWEXPORT(void, wxWindow_SetConstraints)(void* _obj, void* constraints )
-{
-	((wxWindow*)_obj)->SetConstraints((wxLayoutConstraints*) constraints);
-}
-	
-EWXWEXPORT(void*, wxWindow_GetConstraints)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetConstraints();
-}
-	
-EWXWEXPORT(void, wxWindow_SetAutoLayout)(void* _obj, int autoLayout )
-{
-	((wxWindow*)_obj)->SetAutoLayout( autoLayout != 0 );
-}
-	
-EWXWEXPORT(int, wxWindow_GetAutoLayout)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->GetAutoLayout();
-}
-	
-EWXWEXPORT(int, wxWindow_Layout)(void* _obj)
-{
-	return (int)((wxWindow*)_obj)->Layout();
-}
-	
-EWXWEXPORT(void, wxWindow_UnsetConstraints)(void* _obj, void* c)
-{
-	((wxWindow*)_obj)->UnsetConstraints((wxLayoutConstraints*) c);
-}
-	
-EWXWEXPORT(void*, wxWindow_GetConstraintsInvolvedIn)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetConstraintsInvolvedIn();
-}
-	
-EWXWEXPORT(void, wxWindow_AddConstraintReference)(void* _obj, void* otherWin)
-{
-	((wxWindow*)_obj)->AddConstraintReference((wxWindowBase*) otherWin);
-}
-	
-EWXWEXPORT(void, wxWindow_RemoveConstraintReference)(void* _obj, void* otherWin)
-{
-	((wxWindow*)_obj)->RemoveConstraintReference((wxWindowBase*) otherWin);
-}
-	
-EWXWEXPORT(void, wxWindow_DeleteRelatedConstraints)(void* _obj)
-{
-	((wxWindow*)_obj)->DeleteRelatedConstraints();
-}
-	
-EWXWEXPORT(void, wxWindow_ResetConstraints)(void* _obj)
-{
-	((wxWindow*)_obj)->ResetConstraints();
-}
-	
-EWXWEXPORT(void, wxWindow_SetConstraintSizes)(void* _obj, int recurse)
-{
-	((wxWindow*)_obj)->SetConstraintSizes(recurse != 0);
-}
-	
-EWXWEXPORT(int, wxWindow_LayoutPhase1)(void* _obj, int *noChanges)
-{
-	return (int)((wxWindow*)_obj)->LayoutPhase1(noChanges);
-}
-	
-EWXWEXPORT(int, wxWindow_LayoutPhase2)(void* _obj, int *noChanges)
-{
-	return (int)((wxWindow*)_obj)->LayoutPhase2(noChanges);
-}
-	
-EWXWEXPORT(int, wxWindow_DoPhase)(void* _obj, int phase)
-{
-	return (int)((wxWindow*)_obj)->DoPhase(phase);
-}
-	
-EWXWEXPORT(void, wxWindow_SetSizeConstraint)(void* _obj, int x, int y, int w, int h)
-{
-	((wxWindow*)_obj)->SetSizeConstraint(x, y, w, h);
-}
-	
-EWXWEXPORT(void, wxWindow_MoveConstraint)(void* _obj, int x, int y)
-{
-	((wxWindow*)_obj)->MoveConstraint(x, y);
-}
-	
-EWXWEXPORT(void, wxWindow_GetSizeConstraint)(void* _obj, int *w, int *h)
-{
-	((wxWindow*)_obj)->GetSizeConstraint(w, h);
-}
-	
-EWXWEXPORT(void, wxWindow_GetClientSizeConstraint)(void* _obj, int *w, int *h)
-{
-	((wxWindow*)_obj)->GetClientSizeConstraint(w, h);
-}
-	
-EWXWEXPORT(void, wxWindow_GetPositionConstraint)(void* _obj, int *x, int *y)
-{
-	((wxWindow*)_obj)->GetPositionConstraint(x, y);
-}
-	
-EWXWEXPORT(void, wxWindow_SetSizer)(void* _obj, void* sizer )
-{
-	((wxWindow*)_obj)->SetSizer( (wxSizer*) sizer );
-}
-	
-EWXWEXPORT(void*, wxWindow_GetSizer)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetSizer();
-}
-	
-EWXWEXPORT(void*, wxWindow_GetHandle)(void* _obj)
-{
-	return (void*)((wxWindow*)_obj)->GetHandle();
-}
-	
-EWXWEXPORT(void, wxWindow_SetScrollbar)(void* _obj, int orient, int pos, int thumbVisible, int range, int refresh)
-{
-    ((wxWindow*)_obj)->SetScrollbar(orient, pos, thumbVisible, range, refresh != 0);
-}
-
-EWXWEXPORT(int, wxWindow_Reparent)(void* _obj, void* _par)
-{
-	return (int)((wxWindow*)_obj)->Reparent((wxWindow*)_par);
-}
-
-EWXWEXPORT(void, wxWindow_GetAdjustedBestSize)(void* _obj, void* _w, void* _h)
-{
-#if (wxVERSION_NUMBER < 2800)
-	wxSize sz = ((wxWindow*)_obj)->GetAdjustedBestSize();
-#else
-	wxSize sz = ((wxWindow*)_obj)->GetEffectiveMinSize();
-#endif
-        *((int*)_w) = sz.GetWidth();
-        *((int*)_h) = sz.GetHeight();
-}
-
-EWXWEXPORT(void, wxWindow_Freeze)(void* _obj)
-{
-	((wxWindow*)_obj)->Freeze();
-}
-
-EWXWEXPORT(void, wxWindow_Thaw)(void* _obj)
-{
-	((wxWindow*)_obj)->Thaw();
-}
-
-	
-}
diff --git a/wxc/src/ewxw/eljwizard.cpp b/wxc/src/ewxw/eljwizard.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/eljwizard.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "wrapper.h"
-
-extern "C"
-{
-
-EWXWEXPORT(void*, wxWizard_Create) (void* _prt, int _id, void* _txt, void* _bmp, int _lft, int _top, int _wdt, int _hgt)
-{
-	wxBitmap bmp = wxNullBitmap;
-	if (_bmp) bmp = *((wxBitmap*)_bmp);
-#if wxVERSION_NUMBER >= 2400
-	return (void*) new wxWizard ((wxWindow*)_prt, _id, (wxChar*)_txt, bmp, wxPoint(_lft, _top));
-#else
-	return (void*) wxWizard::Create ((wxWindow*)_prt, _id, (wxChar*)_txt, bmp, wxPoint(_lft, _top), wxSize(_wdt, _hgt));
-#endif
-}
-
-EWXWEXPORT(int, wxWizard_RunWizard)(void* _obj, void* firstPage)
-{
-	return (int)((wxWizard*)_obj)->RunWizard((wxWizardPage*)firstPage);
-}
-	
-EWXWEXPORT(void*, wxWizard_GetCurrentPage)(void* _obj)
-{
-	return (void*)((wxWizard*)_obj)->GetCurrentPage();
-}
-	
-EWXWEXPORT(void, wxWizard_Chain)(void* f, void* s)
-{
-	wxWizardPageSimple::Chain((wxWizardPageSimple*)f, (wxWizardPageSimple*)s);
-}
-	
-EWXWEXPORT(void, wxWizard_SetPageSize)(void* _obj, int w, int h)
-{
-	((wxWizard*)_obj)->SetPageSize(wxSize(w, h));
-}
-	
-EWXWEXPORT(void, wxWizard_GetPageSize)(void* _obj, void* w, void* h)
-{
-	wxSize tmp = ((wxWizard*)_obj)->GetPageSize();
-	*((int*)w) = tmp.x;
-	*((int*)h) = tmp.y;
-}
-	
-EWXWEXPORT(void*, wxWizardPageSimple_Create) (void* _prt)
-{
-	return (void*)new wxWizardPageSimple ((wxWizard*)_prt);
-}
-
-EWXWEXPORT(void*, wxWizardPageSimple_GetPrev)(void* _obj)
-{
-	return (void*)((wxWizardPageSimple*)_obj)->GetPrev();
-}
-	
-EWXWEXPORT(void*, wxWizardPageSimple_GetNext)(void* _obj)
-{
-	return (void*)((wxWizardPageSimple*)_obj)->GetNext();
-}
-	
-EWXWEXPORT(void, wxWizardPageSimple_GetBitmap)(void* _obj, void* _ref)
-{
-	*((wxBitmap*)_ref) = ((wxWizardPageSimple*)_obj)->GetBitmap();
-}
-	
-EWXWEXPORT(void, wxWizardPageSimple_SetPrev)(void* _obj, void* prev)
-{
-	((wxWizardPageSimple*)_obj)->SetPrev((wxWizardPage*)prev);
-}
-	
-EWXWEXPORT(void, wxWizardPageSimple_SetNext)(void* _obj, void* next)
-{
-	((wxWizardPageSimple*)_obj)->SetNext((wxWizardPage*)next);
-}
-
-EWXWEXPORT(int, wxWizardEvent_GetDirection)(void* _obj)
-{
-	return (int)((wxWizardEvent*)_obj)->GetDirection();
-}
-	
-}
diff --git a/wxc/src/ewxw/ewxw_def.h b/wxc/src/ewxw/ewxw_def.h
deleted file mode 100644
--- a/wxc/src/ewxw/ewxw_def.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __EWXW_DEF_H
-#define __EWXW_DEF_H
-
-#ifdef FOREIGN_RELIGION
-#include "../contrib/contrib.h"
-#endif
-
-#ifdef __WATCOMC__
-  #include <windows.h>
-  #define EWXWEXPORT(TYPE,FUNC_NAME) TYPE __export FUNC_NAME
-#else
-  #ifdef __GNUWIN32__
-    #define EWXWEXPORT(TYPE,FUNC_NAME) __declspec(dllexport) TYPE FUNC_NAME
-  #else
-    #define EWXWEXPORT(TYPE,FUNC_NAME) TYPE FUNC_NAME
-  #endif /* #ifdef __GNUWIN32__ */
-  #ifndef _cdecl
-    #define _cdecl
-  #endif
-#endif /* #ifdef __WATCOMC__ */
-
-#endif /* #ifndef __EWXW_DEF_H */
diff --git a/wxc/src/ewxw/ewxw_main.cpp b/wxc/src/ewxw/ewxw_main.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/ewxw_main.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "wrapper.h"
-
-extern int APPTerminating;
-
-#ifdef __WIN32__
-#include <windows.h>
-
-#if wxVERSION_NUMBER >= 2400
-extern HINSTANCE wxhInstance;
-#else
-HINSTANCE wxhInstance = 0;
-#endif
-
-extern "C"
-{
-
-EWXWEXPORT(void, ELJApp_initialize) (void* _obj, AppInitFunc _func, void* _cmd, void* _inst)
-{
-	wxhInstance = (HINSTANCE) _inst;
-	init_func = _func;
-	eiffel_obj = _obj;
-	wxEntry(_inst, NULL, (char*)_cmd, SW_SHOWNORMAL, true);
-	APPTerminating = 1;
-}
-
-EWXWEXPORT(void, ELJModule_initialize) (void* _inst, void* _app)
-{
-	wxhInstance = (HINSTANCE) _inst;
-    wxApp::Initialize();
-
-	wxTheApp = (wxApp*)_app;
-
-    wxTheApp->argc = 0;
-    wxTheApp->argv = NULL;
-}
-
-BOOL WINAPI DllMain (HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
-{
-//	wxhInstance = (HINSTANCE)hModule;
-	return TRUE;
-}
-
-#if wxVERSION_NUMBER < 2400
-HINSTANCE wxGetInstance()
-{
-	return wxhInstance;
-}
-
-void wxSetInstance(HINSTANCE hInst)
-{
-	wxhInstance = hInst;
-}
-#endif
-
-}
-
-#else
-extern "C"
-{
-
-EWXWEXPORT(void, ELJApp_initialize) (void* _obj, AppInitFunc _func, int _argc, void* _argv)
-{
-	init_func = _func;
-	eiffel_obj = _obj;
-	wxEntry(_argc, (char**)_argv);
-	APPTerminating = 1;
-}
-
-}
-#endif
diff --git a/wxc/src/ewxw/wrapper.cpp b/wxc/src/ewxw/wrapper.cpp
deleted file mode 100644
--- a/wxc/src/ewxw/wrapper.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-#include "wrapper.h"
-#include "wx/tooltip.h"
-#include "wx/dynlib.h"
-#include "wx/quantize.h"
-#include "wx/fs_zip.h"
-
-AppInitFunc init_func = NULL;
-void* eiffel_obj = NULL;
-int APPTerminating = 0;
-
-#ifdef __WIN32__
-IMPLEMENT_APP(ELJApp);
-#else
-IMPLEMENT_APP_NO_MAIN(ELJApp);
-#endif
-
-bool ELJApp::OnInit (void)
-{
-	return init_func (eiffel_obj) != 0;
-}
-
-void ELJApp::HandleEvent(wxEvent& _evt)
-{
-	EiffelCallback* call_back = (EiffelCallback*)((ELJCallback*)_evt.m_callbackUserData)->call_back;
-	call_back->event = (void*)&_evt;
-	call_back->func(call_back->object, call_back->data);
-}
-
-void ELJApp::InitZipFileSystem()
-{
-	static int InitZIPFileSystem_done = 0;
-	
-	if (!InitZIPFileSystem_done)
-	{
-		InitZIPFileSystem_done = 1;
-		wxFileSystem::AddHandler(new wxZipFSHandler());
-	}
-}
-
-void ELJApp::InitImageHandlers()
-{
-	static int InitImageHandlers_done = 0;
-	
-	if (!InitImageHandlers_done)
-	{
-		InitImageHandlers_done = 1;
-		wxInitAllImageHandlers();
-	}
-}
-
-extern "C"
-{
-
-//int OnExit();
-//virtual void OnFatalException();
-EWXWEXPORT(int, ELJApp_MainLoop)()
-{
-	return wxGetApp().MainLoop();
-}
-	
-EWXWEXPORT(int, ELJApp_Initialized)()
-{
-	return (int)wxGetApp().Initialized();
-}
-	
-EWXWEXPORT(int, ELJApp_Pending)()
-{
-	return (int)wxGetApp().Pending();
-}
-	
-EWXWEXPORT(void, ELJApp_Dispatch)()
-{
-	wxGetApp().Dispatch();
-}
-	
-EWXWEXPORT(int, ELJApp_GetAppName)(void* _buf)
-{
-	wxString result = wxGetApp().GetAppName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, ELJApp_SetAppName)(char* name)
-{
-	wxGetApp().SetAppName(name);
-}
-	
-EWXWEXPORT(int, ELJApp_GetClassName)(void* _buf)
-{
-	wxString result = wxGetApp().GetClassName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, ELJApp_SetClassName)(char* name)
-{
-	wxGetApp().SetClassName(name);
-}
-	
-EWXWEXPORT(int, ELJApp_GetVendorName)(void* _buf)
-{
-	wxString result = wxGetApp().GetVendorName();
-	return copyStrToBuf(_buf, result);
-}
-	
-EWXWEXPORT(void, ELJApp_SetVendorName)(char* name)
-{
-	wxGetApp().SetVendorName(name);
-}
-	
-EWXWEXPORT(void*, ELJApp_GetTopWindow)()
-{
-	return wxGetApp().GetTopWindow();
-}
-
-EWXWEXPORT(void, ELJApp_SetExitOnFrameDelete)(int flag)
-{
-	wxGetApp().SetExitOnFrameDelete(flag != 0);
-}
-	
-EWXWEXPORT(int, ELJApp_GetExitOnFrameDelete)()
-{
-	return (int)wxGetApp().GetExitOnFrameDelete();
-}
-	
-EWXWEXPORT(void*, ELJApp_CreateLogTarget)()
-{
-	return wxGetApp().CreateLogTarget();
-}
-	
-EWXWEXPORT(int, ELJApp_GetWantDebugOutput)()
-{
-#if wxVERSION_NUMBER < 2400
-	return (int)wxGetApp().GetWantDebugOutput();
-#else
-	return 0;
-#endif
-}
-	
-EWXWEXPORT(void, ELJApp_SetUseBestVisual)( int flag )
-{
-	wxGetApp().SetUseBestVisual( flag != 0 );
-}
-	
-EWXWEXPORT(int, ELJApp_GetUseBestVisual)()
-{
-	return (int)wxGetApp().GetUseBestVisual();
-}
-	
-EWXWEXPORT(void, ELJApp_SetPrintMode)(int mode)
-{
-	wxGetApp().SetPrintMode(mode);
-}
-	
-EWXWEXPORT(void, ELJApp_ExitMainLoop) ()
-{
-	wxGetApp ().ExitMainLoop();
-}
-
-EWXWEXPORT(void, ELJApp_SetTopWindow) (void* _wnd)
-{
-	wxGetApp ().SetTopWindow ((wxWindow*)_wnd);
-}
-
-EWXWEXPORT(int, ELJApp_SendIdleEvents)()
-{
-	return (int)wxGetApp().SendIdleEvents();
-}
-	
-EWXWEXPORT(int, ELJApp_SendIdleEventsToWindow)(void* win)
-{
-	return (int)wxGetApp().SendIdleEvents((wxWindow*) win);
-}
-
-EWXWEXPORT(void, ELJApp_EnableTooltips)(int _enable)
-{
-	wxToolTip::Enable (_enable != 0);
-}
-
-EWXWEXPORT(void, ELJApp_SetTooltipDelay)(int _ms)
-{
-	wxToolTip::SetDelay (_ms);
-}
-
-EWXWEXPORT(void, ELJApp_InitAllImageHandlers)()
-{
-	wxGetApp().InitImageHandlers();
-}
-
-EWXWEXPORT(void, ELJApp_Bell)()
-{
-	wxBell();
-}
-
-EWXWEXPORT(void, ELJApp_DisplaySize)(void* w, void* h)
-{
-	wxDisplaySize((int*)w, (int*)h);
-}
-
-EWXWEXPORT(void, ELJApp_EnableTopLevelWindows)(int _enb)
-{
-	wxEnableTopLevelWindows(_enb != 0);
-}
-
-EWXWEXPORT(void, ELJApp_Exit)()
-{
-	wxExit();
-}
-
-EWXWEXPORT(void, ELJApp_MousePosition)(void* x, void* y)
-{
-	wxGetMousePosition((int*)x, (int*)y);
-}
-
-EWXWEXPORT(void*, ELJApp_FindWindowByLabel)(void* _lbl, void* _prt)
-{
-	return (void*)wxWindow::FindWindowByLabel((char*)_lbl, (wxWindow*)_prt);
-}
-
-EWXWEXPORT(void*, ELJApp_FindWindowByName)(void* _lbl, void* _prt)
-{
-	return (void*)wxWindow::FindWindowByName((char*)_lbl, (wxWindow*)_prt);
-}
-
-EWXWEXPORT(void*, ELJApp_FindWindowById)(int _id, void* _prt)
-{
-	return (void*)wxWindow::FindWindowById((long)_id, (wxWindow*)_prt);
-}
-
-EWXWEXPORT(void*, ELJApp_GetApp)()
-{
-	return (void*)wxTheApp;
-}
-
-EWXWEXPORT(int, ELJApp_GetUserId)(void* _buf)
-{
-	wxString result = wxGetUserId();
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(int, ELJApp_GetUserName)(void* _buf)
-{
-	wxString result = wxGetUserName();
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(int, ELJApp_GetUserHome)(void* _usr, void* _buf)
-{
-	wxString result = wxGetUserHome((const char*)_usr);
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(int, ELJApp_ExecuteProcess)(void* _cmd, int _snc, void* _prc)
-{
-	return (int)wxExecute((const char*)_cmd, _snc != 0, (wxProcess*)_prc);
-}
-
-EWXWEXPORT(int, ELJApp_Yield)()
-{
-	return (int)wxYield();
-}
-
-EWXWEXPORT(int, ELJApp_SafeYield)(void* _win)
-{
-	return (int)wxSafeYield((wxWindow*)_win);
-}
-
-EWXWEXPORT(int, ELJApp_GetOsVersion)(void* _maj, void* _min)
-{
-	return wxGetOsVersion((int*)_maj, (int*)_min);
-}
-
-EWXWEXPORT(int, ELJApp_GetOsDescription)(void* _buf)
-{
-	wxString result = wxGetOsDescription();
-	return copyStrToBuf(_buf, result);
-}
-
-EWXWEXPORT(void, ELJApp_Sleep)(int _scs)
-{
-	wxSleep(_scs);
-}
-
-EWXWEXPORT(void, ELJApp_USleep)(int _mscs)
-{
-	wxUsleep(_mscs);
-}
-
-EWXWEXPORT(int,ELJApp_IsTerminating)()
-{
-	return APPTerminating;
-}
-
-EWXWEXPORT(int, QuantizePalette)(void* src, void* dest, void* pPalette, int desiredNoColours, void* eightBitData, int flags)
-{
-	return (int)wxQuantize::Quantize(*((wxImage*)src), *((wxImage*)dest), (wxPalette**)pPalette, desiredNoColours, (unsigned char**)eightBitData, flags);
-}
-
-EWXWEXPORT(int, Quantize)(void* src, void* dest, int desiredNoColours, void* eightBitData, int flags)
-{
-	return (int)wxQuantize::Quantize(*((wxImage*)src), *((wxImage*)dest), desiredNoColours, (unsigned char**)eightBitData, flags);
-}
-
-
-EWXWEXPORT(void*, wxEvtHandler_Create)()
-{
-	return (void*) new wxEvtHandler();
-}
-
-EWXWEXPORT(void, wxEvtHandler_Delete)(void* _obj)
-{
-	delete (wxEvtHandler*)_obj;
-}
-
-EWXWEXPORT(int, wxEvtHandler_Connect)(void* _obj, int first, int last, int type, void* data)
-{
-	void* result = (void*)new ELJCallback((EiffelCallback*)data);
-	((wxEvtHandler*)_obj)->Connect(first, last, type, (wxObjectEventFunction)&ELJApp::HandleEvent, (wxObject*)result);
-
-	return (int)result;
-}
-
-EWXWEXPORT(int, wxEvtHandler_Disconnect)(void* _obj, int first, int last, int type, int data)
-{
-	return (int)((wxEvtHandler*)_obj)->Disconnect(first, last, type, (wxObjectEventFunction)&ELJApp::HandleEvent, (wxObject*) data);
-}
-
-EWXWEXPORT(void*, wxEvtHandler_GetNextHandler)(void* _obj)
-{
-	return (void*)((wxEvtHandler*)_obj)->GetNextHandler();
-}
-	
-EWXWEXPORT(void*, wxEvtHandler_GetPreviousHandler)(void* _obj)
-{
-	return (void*)((wxEvtHandler*)_obj)->GetPreviousHandler();
-}
-	
-EWXWEXPORT(void, wxEvtHandler_SetNextHandler)(void* _obj, void* handler)
-{
-	((wxEvtHandler*)_obj)->SetNextHandler((wxEvtHandler*)handler);
-}
-	
-EWXWEXPORT(void, wxEvtHandler_SetPreviousHandler)(void* _obj, void* handler)
-{
-	((wxEvtHandler*)_obj)->SetPreviousHandler((wxEvtHandler*)handler);
-}
-	
-EWXWEXPORT(void, wxEvtHandler_SetEvtHandlerEnabled)(void* _obj, int enabled)
-{
-	((wxEvtHandler*)_obj)->SetEvtHandlerEnabled(enabled != 0);
-}
-	
-EWXWEXPORT(int, wxEvtHandler_GetEvtHandlerEnabled)(void* _obj)
-{
-	return (int)((wxEvtHandler*)_obj)->GetEvtHandlerEnabled();
-}
-	
-EWXWEXPORT(int, wxEvtHandler_ProcessEvent)(void* _obj, void* event)
-{
-	return (int)((wxEvtHandler*)_obj)->ProcessEvent(*((wxEvent*)event));
-}
-	
-EWXWEXPORT(void, wxEvtHandler_AddPendingEvent)(void* _obj, void* event)
-{
-	((wxEvtHandler*)_obj)->AddPendingEvent(*((wxEvent*)event));
-}
-	
-EWXWEXPORT(void, wxEvtHandler_ProcessPendingEvents)(void* _obj)
-{
-	((wxEvtHandler*)_obj)->ProcessPendingEvents();
-}
-
-EWXWEXPORT(void*, Null_AcceleratorTable)()
-{
-	return (void*)&wxNullAcceleratorTable;
-}
-
-EWXWEXPORT(void*, Null_Bitmap)()
-{
-	return (void*)&wxNullBitmap;
-}
-
-EWXWEXPORT(void*, Null_Icon)()
-{
-	return (void*)&wxNullIcon;
-}
-
-EWXWEXPORT(void*, Null_Cursor)()
-{
-	return (void*)&wxNullCursor;
-}
-
-EWXWEXPORT(void*, Null_Pen)()
-{
-	return (void*)&wxNullPen;
-}
-
-EWXWEXPORT(void*, Null_Brush)()
-{
-	return (void*)&wxNullBrush;
-}
-
-EWXWEXPORT(void*, Null_Palette)()
-{
-	return (void*)&wxNullPalette;
-}
-
-EWXWEXPORT(void*, Null_Font)()
-{
-	return (void*)&wxNullFont;
-}
-
-EWXWEXPORT(void*, Null_Colour)()
-{
-	return (void*)&wxNullColour;
-}
-
-EWXWEXPORT(int, wxDllLoader_LoadLibrary)(void* _name, void* _success)
-{
-#if wxVERSION_NUMBER < 2400
-	bool success;
-	
-	wxDllType result = wxDllLoader::LoadLibrary ((const char*)_name, &success);
-	
-	if (success)
-		*((int*)_success) = 1;
-	else
-		*((int*)_success) = 0;
-	
-	return (int) result;
-#else
-	wxDynamicLibrary* result = new wxDynamicLibrary((const char*)_name);
-	
-	if (result->IsLoaded())
-		*((int*)_success) = 1;
-	else
-		*((int*)_success) = 0;
-	
-	return (int) result;
-#endif
-}
-
-EWXWEXPORT(void, wxDllLoader_UnloadLibrary)(int _handle)
-{
-#if wxVERSION_NUMBER < 2400
-	wxDllLoader::UnloadLibrary ((wxDllType)_handle);
-#else
-	wxDynamicLibrary* lib = (wxDynamicLibrary*)_handle;
-	lib->Unload();
-	delete lib;
-#endif
-}
-
-EWXWEXPORT(void*, wxDllLoader_GetSymbol)(int _handle, void* _name)
-{
-#if wxVERSION_NUMBER < 2400
-	return wxDllLoader::GetSymbol ((wxDllType)_handle, (const char*)_name);
-#else
-	return  ((wxDynamicLibrary*)_handle)->GetSymbol((const char*)_name);
-#endif
-}
-
-EWXWEXPORT(void, wxCFree) (void* _ptr)
-{
-	free (_ptr);
-}
-
-EWXWEXPORT(void*, wxClassInfo_CreateClassByName) (void* _inf)
-{
-	wxClassInfo* inf = wxClassInfo::FindClass ((char*)_inf);
-	if (inf)
-		return inf->CreateObject();
-	return NULL;
-}
-
-EWXWEXPORT(void*, wxClassInfo_GetClassName) (void* _obj)
-{
-	wxClassInfo* inf = ((wxObject*)_obj)->GetClassInfo();
-	if (inf)
-		return (void*)inf->GetClassName();
-	return NULL;
-}
-
-EWXWEXPORT(int, wxClassInfo_IsKindOf) (void* _obj, void* _name)
-{
-	wxClassInfo* inf = wxClassInfo::FindClass ((char*)_name);
-	if (inf)
-		return (int)((wxObject*)_obj)->IsKindOf(inf);
-	return 0;
-}
-
-EWXWEXPORT(int,wxEvent_NewEventType)()
-{
-	return (int)wxNewEventType();
-}
-
-}
diff --git a/wxc/src/ewxw_def.h b/wxc/src/ewxw_def.h
new file mode 100644
--- /dev/null
+++ b/wxc/src/ewxw_def.h
@@ -0,0 +1,22 @@
+#ifndef __EWXW_DEF_H
+#define __EWXW_DEF_H
+
+#ifdef FOREIGN_RELIGION
+#include "../contrib/contrib.h"
+#endif
+
+#ifdef __WATCOMC__
+  #include <windows.h>
+  #define EWXWEXPORT(TYPE,FUNC_NAME) TYPE __export FUNC_NAME
+#else
+  #ifdef __GNUWIN32__
+    #define EWXWEXPORT(TYPE,FUNC_NAME) __declspec(dllexport) TYPE FUNC_NAME
+  #else
+    #define EWXWEXPORT(TYPE,FUNC_NAME) TYPE FUNC_NAME
+  #endif /* #ifdef __GNUWIN32__ */
+  #ifndef _cdecl
+    #define _cdecl
+  #endif
+#endif /* #ifdef __WATCOMC__ */
+
+#endif /* #ifndef __EWXW_DEF_H */
diff --git a/wxc/src/ewxw_main.cpp b/wxc/src/ewxw_main.cpp
--- a/wxc/src/ewxw_main.cpp
+++ b/wxc/src/ewxw_main.cpp
@@ -13,23 +13,23 @@
  #include <crtdbg.h>
 #endif
 
-#include <windows.h>
-
-#if wxCHECK_VERSION(2,5,0)
- #define wxHANDLE  HINSTANCE
- extern int wxEntry(wxHANDLE hInstance, wxHANDLE hPrevInstance, char *pCmdLine, int nCmdShow);
-#else
- #define wxHANDLE  WXHINSTANCE
-#endif
+#include <windows.h>
 
+#if wxCHECK_VERSION(2,5,0)
+ #define wxHANDLE  HINSTANCE
+ extern int wxEntry(wxHANDLE hInstance, wxHANDLE hPrevInstance, char *pCmdLine, int nCmdShow);
+#else
+ #define wxHANDLE  WXHINSTANCE
+#endif
 
+
 extern "C"
 {
 EWXWEXPORT(void, ELJApp_InitializeC) (wxClosure* closure, int _argc, char** _argv)
 {
   wxHANDLE wxhInstance = GetModuleHandle(NULL);
-  
 
+
 /* check memory leaks with visual C++ */
 #if (defined(__WXDEBUG__) && defined(_MSC_VER))
   _CrtMemState memStart,memEnd,memDif;
@@ -44,12 +44,12 @@
 
   initClosure = closure;
   APPTerminating = 0;
-  wxEntry(wxhInstance, NULL, (_argc > 0 ? _argv[0] : NULL), SW_SHOWNORMAL);
+  wxEntry(wxhInstance, NULL, (_argc > 0 ? _argv[0] : NULL), SW_SHOWNORMAL);
   APPTerminating = 1;
- 
+
   /* wxPendingEvents is deleted but not set to NULL -> disaster when restarted from an interpreter */
 #if !defined(WXMAKINGDLL) && !defined(WXUSINGDLL)
-  wxPendingEvents = NULL; 
+  wxPendingEvents = NULL;
 #endif
 
 #if defined(wxUSE_ODBC) && (wxUSE_ODBC != 0)
@@ -63,7 +63,7 @@
      && (memDif.lCounts[_NORMAL_BLOCK]>=-2 && memDif.lCounts[_NORMAL_BLOCK] <= 0))
   {
     _RPT0(_CRT_WARN,"\n** memory leak detected (**\n" );
-    _CrtMemDumpStatistics(&memDif);  
+    _CrtMemDumpStatistics(&memDif);
     /* _CrtMemDumpAllObjectsSince(&memStart);  */
     _RPT0(_CRT_WARN,"** memory leak report done **\n\n" );
 
@@ -79,7 +79,7 @@
   APPTerminating = 1;
   /* wxPendingEvents is deleted but not set to NULL -> disaster when restarted from an interpreter */
 #if !defined(WXMAKINGDLL) && !defined(WXUSINGDLL)
-  wxPendingEvents = NULL; 
+  wxPendingEvents = NULL;
 #endif
 #if defined(wxUSE_ODBC) && (wxUSE_ODBC != 0)
   wxDbCloseConnections();
@@ -116,7 +116,7 @@
   APPTerminating = 1;
   /* wxPendingEvents is deleted but not set to NULL -> disaster when restarted from an interpreter */
 #if !defined(WXMAKINGDLL) && !defined(WXUSINGDLL)
-  wxPendingEvents = NULL; 
+  wxPendingEvents = NULL;
 #endif
 #if defined(wxUSE_ODBC) && (wxUSE_ODBC != 0)
   wxDbCloseConnections();
@@ -130,7 +130,7 @@
   APPTerminating = 1;
   /* wxPendingEvents is deleted but not set to NULL -> disaster when restarted from an interpreter */
 #if !defined(WXMAKINGDLL) && !defined(WXUSINGDLL)
-  wxPendingEvents = NULL; 
+  wxPendingEvents = NULL;
 #endif
 #if defined(wxUSE_ODBC) && (wxUSE_ODBC != 0)
   wxDbCloseConnections();
diff --git a/wxc/src/extra.cpp b/wxc/src/extra.cpp
--- a/wxc/src/extra.cpp
+++ b/wxc/src/extra.cpp
@@ -2,10 +2,10 @@
 #include "wx/process.h"
 #include "wx/textctrl.h"
 #include "wx/progdlg.h"
-#include "wx/listctrl.h"
-#include "wx/grid.h"
-#include "wx/fileconf.h"
-#include "wx/spinctrl.h"
+#include "wx/listctrl.h"
+#include "wx/grid.h"
+#include "wx/fileconf.h"
+#include "wx/spinctrl.h"
 
 #if (wxVERSION_NUMBER >= 2800)
 #include <wx/numdlg.h>
@@ -102,8 +102,8 @@
 EWXWEXPORT(int,expEVT_COMMAND_LIST_COL_END_DRAG)()
 {
   return (int)wxEVT_COMMAND_LIST_COL_END_DRAG;
-}
-
+}
+
 } /* extern "C" */
 
 
@@ -467,35 +467,35 @@
 {
     return m_logicalPosition;
 }
-
-/*-----------------------------------------------------------------------------
-  wxGridCellTextEnterEditor
------------------------------------------------------------------------------*/
-class wxGridCellTextEnterEditor : public wxGridCellTextEditor
-{
-public:
-  wxGridCellTextEnterEditor() : wxGridCellTextEditor() {}
-
-  void Create(wxWindow* parent,
-                        wxWindowID id,
-                        wxEvtHandler* evtHandler);
-
-};
-
-void wxGridCellTextEnterEditor::Create(wxWindow* parent,
-                                       wxWindowID id,
-                                       wxEvtHandler* evtHandler)
-{
-    wxGridCellTextEditor::Create(parent, id, evtHandler);
-    
-    {
-      long style = m_control->GetWindowStyle();
-      m_control->SetWindowStyle( style | wxTE_PROCESS_ENTER );
-    }
-}
-
 
 /*-----------------------------------------------------------------------------
+  wxGridCellTextEnterEditor
+-----------------------------------------------------------------------------*/
+class wxGridCellTextEnterEditor : public wxGridCellTextEditor
+{
+public:
+  wxGridCellTextEnterEditor() : wxGridCellTextEditor() {}
+
+  void Create(wxWindow* parent,
+                        wxWindowID id,
+                        wxEvtHandler* evtHandler);
+
+};
+
+void wxGridCellTextEnterEditor::Create(wxWindow* parent,
+                                       wxWindowID id,
+                                       wxEvtHandler* evtHandler)
+{
+    wxGridCellTextEditor::Create(parent, id, evtHandler);
+    
+    {
+      long style = m_control->GetWindowStyle();
+      m_control->SetWindowStyle( style | wxTE_PROCESS_ENTER );
+    }
+}
+
+
+/*-----------------------------------------------------------------------------
   pre processor definitions
 -----------------------------------------------------------------------------*/
 static const wxChar* defineDefs[] = {
@@ -758,6 +758,10 @@
 #ifdef wxUSE_THREADS
   wxT("THREADS"),
 #endif
+#if defined(wxcREFUSE_OPENGL)
+# undef wxUSE_OPENGL
+# undef wxUSE_GLCANVAS
+#endif
 #ifdef wxUSE_OPENGL
   wxT("OPENGL"),
 #endif
@@ -1219,14 +1223,14 @@
   NULL
 };
 
-
-static const wxChar* hasDefs[] = {
-#ifdef wxHAS_POWER_EVENTS
-  wxT("POWER_EVENTS"),
-#endif
-#ifdef wxHAS_RADIO_MENU_ITEMS
-  wxT("RADIO_MENU_ITEMS"),
-#endif
+
+static const wxChar* hasDefs[] = {
+#ifdef wxHAS_POWER_EVENTS
+  wxT("POWER_EVENTS"),
+#endif
+#ifdef wxHAS_RADIO_MENU_ITEMS
+  wxT("RADIO_MENU_ITEMS"),
+#endif
   NULL
 };
 
@@ -1258,14 +1262,14 @@
     for( i=0; useDefs[i] != NULL; i++ ) {
       if (wxStrcmp(t,useDefs[i]) == 0) return 1;
     }
-  }
-  /* check wxHAS_XXX */
-  if (wxStrncmp(s,wxT("wxHAS_"),6) == 0) {
-    const wxChar* t = s+6;
-    for( i=0; hasDefs[i] != NULL; i++ ) {
-      if (wxStrcmp(t,hasDefs[i]) == 0) return 1;
-    }
   }
+  /* check wxHAS_XXX */
+  if (wxStrncmp(s,wxT("wxHAS_"),6) == 0) {
+    const wxChar* t = s+6;
+    for( i=0; hasDefs[i] != NULL; i++ ) {
+      if (wxStrcmp(t,hasDefs[i]) == 0) return 1;
+    }
+  }
   return 0;
 }
 
@@ -1277,20 +1281,20 @@
 EWXWEXPORT(void, wxcFree)( void* p )
 {
   if (p!=NULL) free(p);
-}
-
-EWXWEXPORT(wxColour*, wxcSystemSettingsGetColour)( int systemColour )
-{
-   wxColour* colour = new wxColour();
-   *colour = wxSystemSettings::GetColour( (wxSystemColour)systemColour );
-   return colour;
-}
-
-EWXWEXPORT( void, wxcWakeUpIdle)(void)
-{
-  wxWakeUpIdle();
 }
 
+EWXWEXPORT(wxColour*, wxcSystemSettingsGetColour)( int systemColour )
+{
+   wxColour* colour = new wxColour();
+   *colour = wxSystemSettings::GetColour( (wxSystemColour)systemColour );
+   return colour;
+}
+
+EWXWEXPORT( void, wxcWakeUpIdle)(void)
+{
+  wxWakeUpIdle();
+}
+
 /*-----------------------------------------------------------------------------
   delete
 -----------------------------------------------------------------------------*/
@@ -1317,29 +1321,29 @@
 EWXWEXPORT(void, wxFrame_SetTitle) (void* _obj, wxChar* _txt)
 {
   ((wxFrame*)_obj)->SetTitle(_txt);
-}
-
-EWXWEXPORT(bool, wxFrame_SetShape)( wxFrame* self, wxRegion* region)
-{
-  return self->SetShape( *region );
-}
+}
 
-EWXWEXPORT(bool, wxFrame_ShowFullScreen)( wxFrame* self, bool show, int style)
-{
-  return self->ShowFullScreen( show, style );
-}
+EWXWEXPORT(bool, wxFrame_SetShape)( wxFrame* self, wxRegion* region)
+{
+  return self->SetShape( *region );
+}
 
-EWXWEXPORT(bool, wxFrame_IsFullScreen)( wxFrame* self )
-{
-  return self->IsFullScreen();
-}
-
-EWXWEXPORT(void, wxFrame_Centre)( wxFrame* self, int orientation )
-{
-  self->Centre();
-}
-
-
+EWXWEXPORT(bool, wxFrame_ShowFullScreen)( wxFrame* self, bool show, int style)
+{
+  return self->ShowFullScreen( show, style );
+}
+
+EWXWEXPORT(bool, wxFrame_IsFullScreen)( wxFrame* self )
+{
+  return self->IsFullScreen();
+}
+
+EWXWEXPORT(void, wxFrame_Centre)( wxFrame* self, int orientation )
+{
+  self->Centre();
+}
+
+
 EWXWEXPORT(void, wxNotebook_AssignImageList)( wxNotebook* _obj, wxImageList* imageList )
 {
   _obj->AssignImageList(imageList);
@@ -1625,29 +1629,29 @@
     return (int)wxEVT_MOUSEWHEEL;
 }
 
-
-/*-----------------------------------------------------------------------------
-  DC
------------------------------------------------------------------------------*/
-EWXWEXPORT(double, wxDC_GetUserScaleX)( wxDC* dc )
-{
-  double x = 1.0;
-  double y = 1.0;
-  dc->GetUserScale(&x,&y);
-  return x;
-}
-
-
-EWXWEXPORT(double, wxDC_GetUserScaleY)( wxDC* dc )
-{
-  double x = 1.0;
-  double y = 1.0;
-  dc->GetUserScale(&x,&y);
-  return y;
-}
-
 
 /*-----------------------------------------------------------------------------
+  DC
+-----------------------------------------------------------------------------*/
+EWXWEXPORT(double, wxDC_GetUserScaleX)( wxDC* dc )
+{
+  double x = 1.0;
+  double y = 1.0;
+  dc->GetUserScale(&x,&y);
+  return x;
+}
+
+
+EWXWEXPORT(double, wxDC_GetUserScaleY)( wxDC* dc )
+{
+  double x = 1.0;
+  double y = 1.0;
+  dc->GetUserScale(&x,&y);
+  return y;
+}
+
+
+/*-----------------------------------------------------------------------------
   timers
 -----------------------------------------------------------------------------*/
 EWXWEXPORT(void*, wxTimerEx_Create)()
@@ -1680,17 +1684,17 @@
   return (void*) new wxMenuItem( NULL, id, text, helpstr, (wxItemKind)itemkind, (wxMenu*)submenu );
 }
 
-
-EWXWEXPORT(void, wxMenu_AppendRadioItem)(wxMenu* self, int id, wxChar* text, wxChar* help)
-{
-#ifdef wxHAS_RADIO_MENU_ITEMS
-  self->AppendRadioItem(id, text, help);
-#else
-  self->AppendCheckItem(id, text, help);
-#endif
-}
 
+EWXWEXPORT(void, wxMenu_AppendRadioItem)(wxMenu* self, int id, wxChar* text, wxChar* help)
+{
+#ifdef wxHAS_RADIO_MENU_ITEMS
+  self->AppendRadioItem(id, text, help);
+#else
+  self->AppendCheckItem(id, text, help);
+#endif
+}
 
+
 /*------------------------------------------------------------------------------
   process
 ------------------------------------------------------------------------------*/
@@ -2325,31 +2329,31 @@
         wxLogTrace((wxChar*) mask, (wxChar*)_msg);
 }
 
-/*-----------------------------------------------------------------------------
-  Grid text editor
------------------------------------------------------------------------------*/
-EWXWEXPORT(wxGridCellTextEnterEditor*,wxGridCellTextEnterEditor_Ctor)()
-{
-  return new wxGridCellTextEnterEditor();
-}
-
-/*-----------------------------------------------------------------------------
-  ConfigBase
------------------------------------------------------------------------------*/
-EWXWEXPORT( wxConfigBase*, wxConfigBase_Get)()
-{
-  return wxConfigBase::Get();
-}
-
-EWXWEXPORT( void, wxConfigBase_Set)( wxConfigBase* self )
-{
-  wxConfigBase::Set( self );
-}
-
-EWXWEXPORT( wxFileConfig*, wxFileConfig_Create)( wxInputStream* inp )
-{
-  return new wxFileConfig( *inp );
-}
-
+/*-----------------------------------------------------------------------------
+  Grid text editor
+-----------------------------------------------------------------------------*/
+EWXWEXPORT(wxGridCellTextEnterEditor*,wxGridCellTextEnterEditor_Ctor)()
+{
+  return new wxGridCellTextEnterEditor();
+}
+
+/*-----------------------------------------------------------------------------
+  ConfigBase
+-----------------------------------------------------------------------------*/
+EWXWEXPORT( wxConfigBase*, wxConfigBase_Get)()
+{
+  return wxConfigBase::Get();
+}
+
+EWXWEXPORT( void, wxConfigBase_Set)( wxConfigBase* self )
+{
+  wxConfigBase::Set( self );
+}
+
+EWXWEXPORT( wxFileConfig*, wxFileConfig_Create)( wxInputStream* inp )
+{
+  return new wxFileConfig( *inp );
+}
+
 
 } /* extern "C" */
diff --git a/wxc/src/glcanvas.cpp b/wxc/src/glcanvas.cpp
--- a/wxc/src/glcanvas.cpp
+++ b/wxc/src/glcanvas.cpp
@@ -13,11 +13,13 @@
 # undef wxUSE_GLCANVAS
 #endif
 
+#if defined(wxcREFUSE_OPENGL)
+# undef wxUSE_GLCANVAS
+#endif
+
 #ifndef wxUSE_GLCANVAS
 # define wxGLCanvas      void
 #endif
-
-
 
 extern "C" {
 
diff --git a/wxc/src/managed.cpp b/wxc/src/managed.cpp
--- a/wxc/src/managed.cpp
+++ b/wxc/src/managed.cpp
@@ -2,7 +2,7 @@
 
 /* safety */
 class wxManagedPtr;
-#include "ewxw/wxc_types.h"
+#include "wxc_types.h"
 #include "managed.h"
 
 
diff --git a/wxc/src/mediactrl.cpp b/wxc/src/mediactrl.cpp
--- a/wxc/src/mediactrl.cpp
+++ b/wxc/src/mediactrl.cpp
@@ -15,6 +15,10 @@
 # undef wxUSE_MEDIACTRL
 #endif
 
+#if defined(wxcREFUSE_MEDIACTRL)
+# undef wxUSE_MEDIACTRL
+#endif
+
 #ifndef wxUSE_MEDIACTRL
 # define wxMediaCtrl      void
 #endif
diff --git a/wxc/src/previewframe.cpp b/wxc/src/previewframe.cpp
--- a/wxc/src/previewframe.cpp
+++ b/wxc/src/previewframe.cpp
@@ -1,36 +1,36 @@
-#include "ewxw_def.h"
-#include "wx/wx.h"
-#include "wx/print.h"
+#include "wrapper.h"
+#include "wx/wx.h"
+#include "wx/print.h"
 
 /*-----------------------------------------------------------------------------
-
+
 -----------------------------------------------------------------------------*/
 extern "C" {
 
 /*-----------------------------------------------------------------------------
   PreviewFrame
 -----------------------------------------------------------------------------*/
-EWXWEXPORT(wxPreviewFrame*, wxPreviewFrame_Create)( wxPrintPreview* preview
-                                                  , wxFrame* parent
-                                                  , wxString* title
-                                                  , int x, int y
-                                                  , int w, int h 
-                                                  , int style 
-                                                  , wxString* name 
-                                                  )
-{
-  return new wxPreviewFrame( preview, parent, *title, wxPoint(x,y), wxSize(w,h), style, *name );
-}
-
-EWXWEXPORT(void, wxPreviewFrame_Delete)( wxPreviewFrame* self )
-{
+EWXWEXPORT(wxPreviewFrame*, wxPreviewFrame_Create)( wxPrintPreview* preview
+                                                  , wxFrame* parent
+                                                  , wxString* title
+                                                  , int x, int y
+                                                  , int w, int h
+                                                  , int style
+                                                  , wxString* name
+                                                  )
+{
+  return new wxPreviewFrame( preview, parent, *title, wxPoint(x,y), wxSize(w,h), style, *name );
+}
+
+EWXWEXPORT(void, wxPreviewFrame_Delete)( wxPreviewFrame* self )
+{
   if (self) delete self;
-}
-
-EWXWEXPORT(void, wxPreviewFrame_Initialize)( wxPreviewFrame* self )
-{
-  self->Initialize();
-}
+}
+
+EWXWEXPORT(void, wxPreviewFrame_Initialize)( wxPreviewFrame* self )
+{
+  self->Initialize();
+}
 
 
 }
diff --git a/wxc/src/printout.cpp b/wxc/src/printout.cpp
--- a/wxc/src/printout.cpp
+++ b/wxc/src/printout.cpp
@@ -1,4 +1,4 @@
-#include "ewxw_def.h"
+#include "wrapper.h"
 #include "wx/wx.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
diff --git a/wxc/src/sound.cpp b/wxc/src/sound.cpp
--- a/wxc/src/sound.cpp
+++ b/wxc/src/sound.cpp
@@ -78,6 +78,13 @@
 #endif
 }
 
+EWXWEXPORT(void,wxSound_Stop)(wxSound* self)  
+{
+#ifdef wxUSE_SOUND
+  return self->Stop();
+#endif
+}
+
 #else /* (wxVERSION_NUMBER >= 2500) */
 
 /*-----------------------------------------------------------------------------
@@ -108,6 +115,11 @@
 #endif
 }
 
+EWXWEXPORT(bool,wxSound_Play)(wxWave* self, unsigned flag )  
+{
+  return false;
+}
+
 EWXWEXPORT(bool,wxSound_PlayCompatible)(wxWave* self, bool async, bool looped )  
 {
 #ifdef wxUSE_WAVE 
@@ -115,6 +127,10 @@
 #else
   return false;
 #endif
+}
+
+EWXWEXPORT(void,wxSound_Stop)(wxWave* self)  
+{
 }
 
 #endif /* (wxVERSION_NUMBER >= 2500) */
diff --git a/wxc/src/textstream.cpp b/wxc/src/textstream.cpp
--- a/wxc/src/textstream.cpp
+++ b/wxc/src/textstream.cpp
@@ -2,49 +2,49 @@
 #include <wx/txtstrm.h>
 
 extern "C"
-{
-EWXWEXPORT( bool, wxInputStream_CanRead)( wxInputStream* self )
-{
-  if (self)
-    return self->CanRead();
-  else
-    return false;
-}
-
-
-
-EWXWEXPORT( wxTextInputStream*, wxTextInputStream_Create)( wxInputStream* inputStream, wxString* sep )
-{
-  return new wxTextInputStream( *inputStream, *sep );
-}
-
-EWXWEXPORT( void, wxTextInputStream_Delete)( wxTextInputStream* self )
-{
-  if (self) delete self;
-}
-
-EWXWEXPORT( wxString*, wxTextInputStream_ReadLine)( wxTextInputStream* self )
-{
-  if (!self) 
-    return new wxString(wxT(""));
-  else
-    return new wxString( self->ReadLine() );
-}
-
-EWXWEXPORT( wxTextOutputStream*, wxTextOutputStream_Create)( wxOutputStream* outputStream, wxEOL mode )
-{
-  return new wxTextOutputStream( *outputStream, mode );
-}
-
-EWXWEXPORT( void, wxTextOutputStream_Delete)( wxTextOutputStream* self )
-{
-  if (self) delete self;
-}
-
-EWXWEXPORT( void, wxTextOutputStream_WriteString)( wxTextOutputStream* self, wxString* txt )
-{
-  if (!self) return;
-  self->WriteString( *txt );
-}
-
+{
+EWXWEXPORT( bool, wxInputStream_CanRead)( wxInputStream* self )
+{
+  if (self)
+    return self->CanRead();
+  else
+    return false;
+}
+
+
+
+EWXWEXPORT( wxTextInputStream*, wxTextInputStream_Create)( wxInputStream* inputStream, wxString* sep )
+{
+  return new wxTextInputStream( *inputStream, *sep );
+}
+
+EWXWEXPORT( void, wxTextInputStream_Delete)( wxTextInputStream* self )
+{
+  if (self) delete self;
+}
+
+EWXWEXPORT( wxString*, wxTextInputStream_ReadLine)( wxTextInputStream* self )
+{
+  if (!self)
+    return new wxString(wxT(""));
+  else
+    return new wxString( self->ReadLine() );
+}
+
+EWXWEXPORT( wxTextOutputStream*, wxTextOutputStream_Create)( wxOutputStream* outputStream, wxEOL mode )
+{
+  return new wxTextOutputStream( *outputStream, mode );
+}
+
+EWXWEXPORT( void, wxTextOutputStream_Delete)( wxTextOutputStream* self )
+{
+  if (self) delete self;
+}
+
+EWXWEXPORT( void, wxTextOutputStream_WriteString)( wxTextOutputStream* self, wxString* txt )
+{
+  if (!self) return;
+  self->WriteString( *txt );
+}
+
 }
diff --git a/wxc/src/wrapper.cpp b/wxc/src/wrapper.cpp
--- a/wxc/src/wrapper.cpp
+++ b/wxc/src/wrapper.cpp
@@ -17,35 +17,35 @@
   return src.Length();
 }
 
-/*-----------------------------------------------------------------------------
-    The global idle timer
------------------------------------------------------------------------------*/
-class wxIdleTimer : public wxTimer
-{
-public:
-  void Notify() {
-    wxWakeUpIdle();   /* send idle events */
-  }
-};
-
-wxIdleTimer* idleTimer = NULL;
-
-void initIdleTimer()
-{
-  idleTimer = new wxIdleTimer();
-}
-
-void doneIdleTimer()
-{
-  if (idleTimer) {
-    idleTimer->Stop();
-    delete idleTimer;
-    idleTimer = NULL;
-  }
-}
-
-
+/*-----------------------------------------------------------------------------
+    The global idle timer
+-----------------------------------------------------------------------------*/
+class wxIdleTimer : public wxTimer
+{
+public:
+  void Notify() {
+    wxWakeUpIdle();   /* send idle events */
+  }
+};
 
+wxIdleTimer* idleTimer = NULL;
+
+void initIdleTimer()
+{
+  idleTimer = new wxIdleTimer();
+}
+
+void doneIdleTimer()
+{
+  if (idleTimer) {
+    idleTimer->Stop();
+    delete idleTimer;
+    idleTimer = NULL;
+  }
+}
+
+
+
 /*-----------------------------------------------------------------------------
     The main application
 -----------------------------------------------------------------------------*/
@@ -56,21 +56,21 @@
 
 bool ELJApp::OnInit (void)
 {
-  wxInitAllImageHandlers();
+  wxInitAllImageHandlers();
   initIdleTimer();
   if (initClosure) {
     delete initClosure; /* special: init is only called once with a NULL event */
     initClosure=NULL;
   }
   return true;
-}
-
-int ELJApp::OnExit( void )
-{
-  doneIdleTimer();
-  return wxApp::OnExit();
 }
 
+int ELJApp::OnExit( void )
+{
+  doneIdleTimer();
+  return wxApp::OnExit();
+}
+
 void ELJApp::InitZipFileSystem()
 {
         static int InitZIPFileSystem_done = 0;
@@ -278,31 +278,31 @@
   refData = new wxcClosureRefData( closure );
   _obj->SetRefData( refData );    //set new data -- ref count must be 1 as setRefData doesn't increase it.  
 }
-
-/*-----------------------------------------------------------------------------
-    C interface to the idle timer
------------------------------------------------------------------------------*/
-EWXWEXPORT(int, ELJApp_GetIdleInterval)()
-{
-  if (!idleTimer) return 0;
-
-  if (idleTimer->IsRunning())
-    return idleTimer->GetInterval();
-  else
-    return 0;
-}
-
-EWXWEXPORT(void, ELJApp_SetIdleInterval)( int interval )
-{
-  if (idleTimer) {
-    if (idleTimer->IsRunning()) {
-      idleTimer->Stop();
-    }
-    if (interval >= 5) {
-      idleTimer->Start( interval, false );
-    }
-  }
-}
+
+/*-----------------------------------------------------------------------------
+    C interface to the idle timer
+-----------------------------------------------------------------------------*/
+EWXWEXPORT(int, ELJApp_GetIdleInterval)()
+{
+  if (!idleTimer) return 0;
+
+  if (idleTimer->IsRunning())
+    return idleTimer->GetInterval();
+  else
+    return 0;
+}
+
+EWXWEXPORT(void, ELJApp_SetIdleInterval)( int interval )
+{
+  if (idleTimer) {
+    if (idleTimer->IsRunning()) {
+      idleTimer->Stop();
+    }
+    if (interval >= 5) {
+      idleTimer->Start( interval, false );
+    }
+  }
+}
 
 /*-----------------------------------------------------------------------------
     C interface to the application.
diff --git a/wxc/wxc-2.4.dsp b/wxc/wxc-2.4.dsp
--- a/wxc/wxc-2.4.dsp
+++ b/wxc/wxc-2.4.dsp
@@ -38,12 +38,12 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\out\wxc"
-# PROP Intermediate_Dir "..\out\wxc\release"
+# PROP Output_Dir "..\dist\wxc"
+# PROP Intermediate_Dir "..\dist\wxc\release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWindows-2.4.2\lib\mswu" /I "include" /I "src\ewxw" /I "..\..\wxWindows-2.4.2\contrib\include" /I "..\..\wxWindows-2.4.2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWindows-2.4.2\lib\mswu" /I "include" /I "..\..\wxWindows-2.4.2\contrib\include" /I "..\..\wxWindows-2.4.2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "NDEBUG"
@@ -53,10 +53,10 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmswu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\out\wxc\wxc-msw2.4.2-0.10.1.dll" /libpath:"..\out\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
+# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmswu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.4.2-0.10.3.dll" /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\out\wxc\wxc-msw2.4.2-0.10.1.lib	move libwxc-msw2.4.2-0.10.1.a ..\out\wxc	move wxc-msw2.4.2-0.10.1.def ..\out\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.4.2-0.10.3.lib	move libwxc-msw2.4.2-0.10.3.a ..\dist\wxc	move wxc-msw2.4.2-0.10.3.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "wxc - Win32 Debug"
@@ -68,12 +68,12 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\out\wxc"
-# PROP Intermediate_Dir "..\out\wxc\debug"
+# PROP Output_Dir "..\dist\wxc"
+# PROP Intermediate_Dir "..\dist\wxc\debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWindows-2.4.2\lib\mswud" /I "..\..\wxWindows-2.4.2\contrib\include" /I "include" /I "src\ewxw" /I "..\..\wxWindows-2.4.2\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWindows-2.4.2\lib\mswud" /I "..\..\wxWindows-2.4.2\contrib\include" /I "include" /I "..\..\wxWindows-2.4.2\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "_DEBUG"
@@ -83,10 +83,10 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd-msw2.4.2-0.10.1.dll" /pdbtype:sept  /libpath:"..\out\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
+# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.4.2-0.10.3.dll" /pdbtype:sept  /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\out\wxc\wxcd-msw2.4.2-0.10.1.lib	move libwxcd-msw2.4.2-0.10.1.a ..\out\wxc	move wxcd-msw2.4.2-0.10.1.def ..\out\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.4.2-0.10.3.lib	move libwxcd-msw2.4.2-0.10.3.a ..\dist\wxc	move wxcd-msw2.4.2-0.10.3.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ENDIF 
@@ -251,359 +251,359 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljaccelerator.cpp
+SOURCE=.\src\eljaccelerator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljartprov.cpp
+SOURCE=.\src\eljartprov.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbitmap.cpp
+SOURCE=.\src\eljbitmap.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbrush.cpp
+SOURCE=.\src\eljbrush.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbusyinfo.cpp
+SOURCE=.\src\eljbusyinfo.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbutton.cpp
+SOURCE=.\src\eljbutton.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcalendarctrl.cpp
+SOURCE=.\src\eljcalendarctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcaret.cpp
+SOURCE=.\src\eljcaret.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcheckbox.cpp
+SOURCE=.\src\eljcheckbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljchecklistbox.cpp
+SOURCE=.\src\eljchecklistbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljchoice.cpp
+SOURCE=.\src\eljchoice.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljclipboard.cpp
+SOURCE=.\src\eljclipboard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcoldata.cpp
+SOURCE=.\src\eljcoldata.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcolour.cpp
+SOURCE=.\src\eljcolour.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcolourdlg.cpp
+SOURCE=.\src\eljcolourdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcombobox.cpp
+SOURCE=.\src\eljcombobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljconfigbase.cpp
+SOURCE=.\src\eljconfigbase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcontrol.cpp
+SOURCE=.\src\eljcontrol.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljctxhelp.cpp
+SOURCE=.\src\eljctxhelp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcursor.cpp
+SOURCE=.\src\eljcursor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdataformat.cpp
+SOURCE=.\src\eljdataformat.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdatetime.cpp
+SOURCE=.\src\eljdatetime.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdc.cpp
+SOURCE=.\src\eljdc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdialog.cpp
+SOURCE=.\src\eljdialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdialup.cpp
+SOURCE=.\src\eljdialup.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdirdlg.cpp
+SOURCE=.\src\eljdirdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdnd.cpp
+SOURCE=.\src\eljdnd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdrawing.cpp
+SOURCE=.\src\eljdrawing.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfiledialog.cpp
+SOURCE=.\src\eljfiledialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfilehist.cpp
+SOURCE=.\src\eljfilehist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfindrepldlg.cpp
+SOURCE=.\src\eljfindrepldlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfont.cpp
+SOURCE=.\src\eljfont.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfontdata.cpp
+SOURCE=.\src\eljfontdata.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfontdlg.cpp
+SOURCE=.\src\eljfontdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljframe.cpp
+SOURCE=.\src\eljframe.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljgauge.cpp
+SOURCE=.\src\eljgauge.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljgrid.cpp
+SOURCE=.\src\eljgrid.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljhelpcontroller.cpp
+SOURCE=.\src\eljhelpcontroller.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljicnbndl.cpp
+SOURCE=.\src\eljicnbndl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljicon.cpp
+SOURCE=.\src\eljicon.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljimage.cpp
+SOURCE=.\src\eljimage.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljimagelist.cpp
+SOURCE=.\src\eljimagelist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljipc.cpp
+SOURCE=.\src\eljipc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlayoutconstraints.cpp
+SOURCE=.\src\eljlayoutconstraints.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlistbox.cpp
+SOURCE=.\src\eljlistbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlistctrl.cpp
+SOURCE=.\src\eljlistctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlocale.cpp
+SOURCE=.\src\eljlocale.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlog.cpp
+SOURCE=.\src\eljlog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmask.cpp
+SOURCE=.\src\eljmask.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmdi.cpp
+SOURCE=.\src\eljmdi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmenu.cpp
+SOURCE=.\src\eljmenu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmenubar.cpp
+SOURCE=.\src\eljmenubar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmessagedialog.cpp
+SOURCE=.\src\eljmessagedialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljminiframe.cpp
+SOURCE=.\src\eljminiframe.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljnotebook.cpp
+SOURCE=.\src\eljnotebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpalette.cpp
+SOURCE=.\src\eljpalette.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpanel.cpp
+SOURCE=.\src\eljpanel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpen.cpp
+SOURCE=.\src\eljpen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprintdlg.cpp
+SOURCE=.\src\eljprintdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprinting.cpp
+SOURCE=.\src\eljprinting.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprocess.cpp
+SOURCE=.\src\eljprocess.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljradiobox.cpp
+SOURCE=.\src\eljradiobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljradiobutton.cpp
+SOURCE=.\src\eljradiobutton.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljregion.cpp
+SOURCE=.\src\eljregion.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljregioniter.cpp
+SOURCE=.\src\eljregioniter.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsash.cpp
+SOURCE=.\src\eljsash.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscintilla.cpp
+SOURCE=.\src\eljscintilla.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscrollbar.cpp
+SOURCE=.\src\eljscrollbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscrolledwindow.cpp
+SOURCE=.\src\eljscrolledwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsingleinst.cpp
+SOURCE=.\src\eljsingleinst.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsizer.cpp
+SOURCE=.\src\eljsizer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljslider.cpp
+SOURCE=.\src\eljslider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljspinctrl.cpp
+SOURCE=.\src\eljspinctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsplitterwindow.cpp
+SOURCE=.\src\eljsplitterwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstaticbox.cpp
+SOURCE=.\src\eljstaticbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstaticline.cpp
+SOURCE=.\src\eljstaticline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstatictext.cpp
+SOURCE=.\src\eljstatictext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstatusbar.cpp
+SOURCE=.\src\eljstatusbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsystemsettings.cpp
+SOURCE=.\src\eljsystemsettings.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtextctrl.cpp
+SOURCE=.\src\eljtextctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtglbtn.cpp
+SOURCE=.\src\eljtglbtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljthread.cpp
+SOURCE=.\src\eljthread.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtimer.cpp
+SOURCE=.\src\eljtimer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtipwnd.cpp
+SOURCE=.\src\eljtipwnd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtoolbar.cpp
+SOURCE=.\src\eljtoolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljvalidator.cpp
+SOURCE=.\src\eljvalidator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljwindow.cpp
+SOURCE=.\src\eljwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljwizard.cpp
+SOURCE=.\src\eljwizard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\Scintilla.h
+SOURCE=.\src\Scintilla.h
 # End Source File
 # End Group
 # Begin Group "ewxw headers"
@@ -611,11 +611,11 @@
 # PROP Default_Filter "*.h"
 # Begin Source File
 
-SOURCE=.\include\ewxw\wxc_glue.h
+SOURCE=.\include\wxc_glue.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ewxw\wxc_types.h
+SOURCE=.\include\wxc_types.h
 # End Source File
 # End Group
 # End Group
diff --git a/wxc/wxc-2.6.dsp b/wxc/wxc-2.6.dsp
--- a/wxc/wxc-2.6.dsp
+++ b/wxc/wxc-2.6.dsp
@@ -38,12 +38,12 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\out\wxc"
-# PROP Intermediate_Dir "..\out\wxc\release"
+# PROP Output_Dir "..\dist\wxc"
+# PROP Intermediate_Dir "..\dist\wxc\release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\mswu" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "src\ewxw" /I "..\..\wxWidgets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxWidgets-2.6.4\lib\vc_lib\mswu" /I "..\..\wxWidgets-2.6.4\contrib\include" /I "include" /I "..\..\wxWidgets-2.6.4\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "NDEBUG"
@@ -54,10 +54,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\out\wxc\wxc-msw2.6.4-0.10.1.dll" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.6.4-0.10.3.dll" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\out\wxc\wxc-msw2.6.4-0.10.1.lib	move libwxc-msw2.6.4-0.10.1.a ..\out\wxc	move wxc-msw2.6.4-0.10.1.def ..\out\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.6.4-0.10.3.lib	move libwxc-msw2.6.4-0.10.3.a ..\dist\wxc	move wxc-msw2.6.4-0.10.3.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "wxc - Win32 Debug"
@@ -69,12 +69,12 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\out\wxc"
-# PROP Intermediate_Dir "..\out\wxc\debug"
+# PROP Output_Dir "..\dist\wxc"
+# PROP Intermediate_Dir "..\dist\wxc\debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\vc_lib\mswud" /I "include" /I "src\ewxw" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWidgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxWidgets-2.6.4\lib\vc_lib\mswud" /I "include" /I "..\..\wxWidgets-2.6.4\include" /I "..\..\wxWidgets-2.6.4\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "_DEBUG"
@@ -85,10 +85,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw26ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd-msw2.6.4-0.10.1.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw26ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.6.4-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\out\wxc\wxcd-msw2.6.4-0.10.1.lib	move libwxcd-msw2.6.4-0.10.1.a ..\out\wxc	move wxcd-msw2.6.4-0.10.1.def ..\out\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.6.4-0.10.3.lib	move libwxcd-msw2.6.4-0.10.3.a ..\dist\wxc	move wxcd-msw2.6.4-0.10.3.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ENDIF 
@@ -253,359 +253,359 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljaccelerator.cpp
+SOURCE=.\src\eljaccelerator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljartprov.cpp
+SOURCE=.\src\eljartprov.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbitmap.cpp
+SOURCE=.\src\eljbitmap.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbrush.cpp
+SOURCE=.\src\eljbrush.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbusyinfo.cpp
+SOURCE=.\src\eljbusyinfo.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbutton.cpp
+SOURCE=.\src\eljbutton.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcalendarctrl.cpp
+SOURCE=.\src\eljcalendarctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcaret.cpp
+SOURCE=.\src\eljcaret.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcheckbox.cpp
+SOURCE=.\src\eljcheckbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljchecklistbox.cpp
+SOURCE=.\src\eljchecklistbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljchoice.cpp
+SOURCE=.\src\eljchoice.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljclipboard.cpp
+SOURCE=.\src\eljclipboard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcoldata.cpp
+SOURCE=.\src\eljcoldata.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcolour.cpp
+SOURCE=.\src\eljcolour.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcolourdlg.cpp
+SOURCE=.\src\eljcolourdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcombobox.cpp
+SOURCE=.\src\eljcombobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljconfigbase.cpp
+SOURCE=.\src\eljconfigbase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcontrol.cpp
+SOURCE=.\src\eljcontrol.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljctxhelp.cpp
+SOURCE=.\src\eljctxhelp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcursor.cpp
+SOURCE=.\src\eljcursor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdataformat.cpp
+SOURCE=.\src\eljdataformat.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdatetime.cpp
+SOURCE=.\src\eljdatetime.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdc.cpp
+SOURCE=.\src\eljdc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdialog.cpp
+SOURCE=.\src\eljdialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdialup.cpp
+SOURCE=.\src\eljdialup.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdirdlg.cpp
+SOURCE=.\src\eljdirdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdnd.cpp
+SOURCE=.\src\eljdnd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdrawing.cpp
+SOURCE=.\src\eljdrawing.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfiledialog.cpp
+SOURCE=.\src\eljfiledialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfilehist.cpp
+SOURCE=.\src\eljfilehist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfindrepldlg.cpp
+SOURCE=.\src\eljfindrepldlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfont.cpp
+SOURCE=.\src\eljfont.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfontdata.cpp
+SOURCE=.\src\eljfontdata.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfontdlg.cpp
+SOURCE=.\src\eljfontdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljframe.cpp
+SOURCE=.\src\eljframe.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljgauge.cpp
+SOURCE=.\src\eljgauge.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljgrid.cpp
+SOURCE=.\src\eljgrid.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljhelpcontroller.cpp
+SOURCE=.\src\eljhelpcontroller.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljicnbndl.cpp
+SOURCE=.\src\eljicnbndl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljicon.cpp
+SOURCE=.\src\eljicon.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljimage.cpp
+SOURCE=.\src\eljimage.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljimagelist.cpp
+SOURCE=.\src\eljimagelist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljipc.cpp
+SOURCE=.\src\eljipc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlayoutconstraints.cpp
+SOURCE=.\src\eljlayoutconstraints.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlistbox.cpp
+SOURCE=.\src\eljlistbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlistctrl.cpp
+SOURCE=.\src\eljlistctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlocale.cpp
+SOURCE=.\src\eljlocale.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlog.cpp
+SOURCE=.\src\eljlog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmask.cpp
+SOURCE=.\src\eljmask.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmdi.cpp
+SOURCE=.\src\eljmdi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmenu.cpp
+SOURCE=.\src\eljmenu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmenubar.cpp
+SOURCE=.\src\eljmenubar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmessagedialog.cpp
+SOURCE=.\src\eljmessagedialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljminiframe.cpp
+SOURCE=.\src\eljminiframe.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljnotebook.cpp
+SOURCE=.\src\eljnotebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpalette.cpp
+SOURCE=.\src\eljpalette.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpanel.cpp
+SOURCE=.\src\eljpanel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpen.cpp
+SOURCE=.\src\eljpen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprintdlg.cpp
+SOURCE=.\src\eljprintdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprinting.cpp
+SOURCE=.\src\eljprinting.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprocess.cpp
+SOURCE=.\src\eljprocess.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljradiobox.cpp
+SOURCE=.\src\eljradiobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljradiobutton.cpp
+SOURCE=.\src\eljradiobutton.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljregion.cpp
+SOURCE=.\src\eljregion.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljregioniter.cpp
+SOURCE=.\src\eljregioniter.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsash.cpp
+SOURCE=.\src\eljsash.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscintilla.cpp
+SOURCE=.\src\eljscintilla.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscrollbar.cpp
+SOURCE=.\src\eljscrollbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscrolledwindow.cpp
+SOURCE=.\src\eljscrolledwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsingleinst.cpp
+SOURCE=.\src\eljsingleinst.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsizer.cpp
+SOURCE=.\src\eljsizer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljslider.cpp
+SOURCE=.\src\eljslider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljspinctrl.cpp
+SOURCE=.\src\eljspinctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsplitterwindow.cpp
+SOURCE=.\src\eljsplitterwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstaticbox.cpp
+SOURCE=.\src\eljstaticbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstaticline.cpp
+SOURCE=.\src\eljstaticline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstatictext.cpp
+SOURCE=.\src\eljstatictext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstatusbar.cpp
+SOURCE=.\src\eljstatusbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsystemsettings.cpp
+SOURCE=.\src\eljsystemsettings.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtextctrl.cpp
+SOURCE=.\src\eljtextctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtglbtn.cpp
+SOURCE=.\src\eljtglbtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljthread.cpp
+SOURCE=.\src\eljthread.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtimer.cpp
+SOURCE=.\src\eljtimer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtipwnd.cpp
+SOURCE=.\src\eljtipwnd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtoolbar.cpp
+SOURCE=.\src\eljtoolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljvalidator.cpp
+SOURCE=.\src\eljvalidator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljwindow.cpp
+SOURCE=.\src\eljwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljwizard.cpp
+SOURCE=.\src\eljwizard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\Scintilla.h
+SOURCE=.\src\Scintilla.h
 # End Source File
 # End Group
 # Begin Group "ewxw headers"
@@ -613,11 +613,11 @@
 # PROP Default_Filter "*.h"
 # Begin Source File
 
-SOURCE=.\include\ewxw\wxc_glue.h
+SOURCE=.\include\wxc_glue.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ewxw\wxc_types.h
+SOURCE=.\include\wxc_types.h
 # End Source File
 # End Group
 # End Group
diff --git a/wxc/wxc-2.8.dsp b/wxc/wxc-2.8.dsp
--- a/wxc/wxc-2.8.dsp
+++ b/wxc/wxc-2.8.dsp
@@ -38,12 +38,12 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\out\wxc"
-# PROP Intermediate_Dir "..\out\wxc\release"
+# PROP Output_Dir "..\dist\wxc"
+# PROP Intermediate_Dir "..\dist\wxc\release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxMSW-2.8.7\lib\vc_lib\mswu" /I "..\..\wxMSW-2.8.7\contrib\include" /I "include" /I "src\ewxw" /I "..\..\wxMSW-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\wxMSW-2.8.7\lib\vc_lib\mswu" /I "..\..\wxMSW-2.8.7\contrib\include" /I "include" /I "..\..\wxMSW-2.8.7\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "NDEBUG"
@@ -54,10 +54,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\out\wxc\wxc-msw2.8.7-0.10.1.dll" /libpath:"..\..\wxMSW-2.8.7\lib\vc_lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.7-0.10.3.dll" /libpath:"..\..\wxMSW-2.8.7\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\out\wxc\wxc-msw2.8.7-0.10.1.lib	move libwxc-msw2.8.7-0.10.1.a ..\out\wxc	move wxc-msw2.8.7-0.10.1.def ..\out\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.8.7-0.10.3.lib	move libwxc-msw2.8.7-0.10.3.a ..\dist\wxc	move wxc-msw2.8.7-0.10.3.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "wxc - Win32 Debug"
@@ -69,12 +69,12 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\out\wxc"
-# PROP Intermediate_Dir "..\out\wxc\debug"
+# PROP Output_Dir "..\dist\wxc"
+# PROP Intermediate_Dir "..\dist\wxc\debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxMSW-2.8.7\lib\vc_lib\mswud" /I "include" /I "src\ewxw" /I "..\..\wxMSW-2.8.7\include" /I "..\..\wxMSW-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\wxMSW-2.8.7\lib\vc_lib\mswud" /I "include" /I "..\..\wxMSW-2.8.7\include" /I "..\..\wxMSW-2.8.7\contrib\include" /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXC_EXPORTS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D wxUSE_UNICODE=1 /D wxUSE_STC=1 /D BUILD_WXC=1 /D "_DLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "_DEBUG"
@@ -85,10 +85,10 @@
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw28ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\out\wxc\wxcd-msw2.8.7-0.10.1.dll" /pdbtype:sept /libpath:"..\..\wxMSW-2.8.7\lib\vc_lib"
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw28ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.7-0.10.3.dll" /pdbtype:sept /libpath:"..\..\wxMSW-2.8.7\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\out\wxc\wxcd-msw2.8.7-0.10.1.lib	move libwxcd-msw2.8.7-0.10.1.a ..\out\wxc	move wxcd-msw2.8.7-0.10.1.def ..\out\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.8.7-0.10.3.lib	move libwxcd-msw2.8.7-0.10.3.a ..\dist\wxc	move wxcd-msw2.8.7-0.10.3.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ENDIF 
@@ -253,359 +253,359 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljaccelerator.cpp
+SOURCE=.\src\eljaccelerator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljartprov.cpp
+SOURCE=.\src\eljartprov.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbitmap.cpp
+SOURCE=.\src\eljbitmap.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbrush.cpp
+SOURCE=.\src\eljbrush.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbusyinfo.cpp
+SOURCE=.\src\eljbusyinfo.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljbutton.cpp
+SOURCE=.\src\eljbutton.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcalendarctrl.cpp
+SOURCE=.\src\eljcalendarctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcaret.cpp
+SOURCE=.\src\eljcaret.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcheckbox.cpp
+SOURCE=.\src\eljcheckbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljchecklistbox.cpp
+SOURCE=.\src\eljchecklistbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljchoice.cpp
+SOURCE=.\src\eljchoice.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljclipboard.cpp
+SOURCE=.\src\eljclipboard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcoldata.cpp
+SOURCE=.\src\eljcoldata.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcolour.cpp
+SOURCE=.\src\eljcolour.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcolourdlg.cpp
+SOURCE=.\src\eljcolourdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcombobox.cpp
+SOURCE=.\src\eljcombobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljconfigbase.cpp
+SOURCE=.\src\eljconfigbase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcontrol.cpp
+SOURCE=.\src\eljcontrol.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljctxhelp.cpp
+SOURCE=.\src\eljctxhelp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljcursor.cpp
+SOURCE=.\src\eljcursor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdataformat.cpp
+SOURCE=.\src\eljdataformat.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdatetime.cpp
+SOURCE=.\src\eljdatetime.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdc.cpp
+SOURCE=.\src\eljdc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdialog.cpp
+SOURCE=.\src\eljdialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdialup.cpp
+SOURCE=.\src\eljdialup.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdirdlg.cpp
+SOURCE=.\src\eljdirdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdnd.cpp
+SOURCE=.\src\eljdnd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljdrawing.cpp
+SOURCE=.\src\eljdrawing.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfiledialog.cpp
+SOURCE=.\src\eljfiledialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfilehist.cpp
+SOURCE=.\src\eljfilehist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfindrepldlg.cpp
+SOURCE=.\src\eljfindrepldlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfont.cpp
+SOURCE=.\src\eljfont.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfontdata.cpp
+SOURCE=.\src\eljfontdata.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljfontdlg.cpp
+SOURCE=.\src\eljfontdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljframe.cpp
+SOURCE=.\src\eljframe.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljgauge.cpp
+SOURCE=.\src\eljgauge.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljgrid.cpp
+SOURCE=.\src\eljgrid.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljhelpcontroller.cpp
+SOURCE=.\src\eljhelpcontroller.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljicnbndl.cpp
+SOURCE=.\src\eljicnbndl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljicon.cpp
+SOURCE=.\src\eljicon.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljimage.cpp
+SOURCE=.\src\eljimage.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljimagelist.cpp
+SOURCE=.\src\eljimagelist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljipc.cpp
+SOURCE=.\src\eljipc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlayoutconstraints.cpp
+SOURCE=.\src\eljlayoutconstraints.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlistbox.cpp
+SOURCE=.\src\eljlistbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlistctrl.cpp
+SOURCE=.\src\eljlistctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlocale.cpp
+SOURCE=.\src\eljlocale.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljlog.cpp
+SOURCE=.\src\eljlog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmask.cpp
+SOURCE=.\src\eljmask.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmdi.cpp
+SOURCE=.\src\eljmdi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmenu.cpp
+SOURCE=.\src\eljmenu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmenubar.cpp
+SOURCE=.\src\eljmenubar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljmessagedialog.cpp
+SOURCE=.\src\eljmessagedialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljminiframe.cpp
+SOURCE=.\src\eljminiframe.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljnotebook.cpp
+SOURCE=.\src\eljnotebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpalette.cpp
+SOURCE=.\src\eljpalette.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpanel.cpp
+SOURCE=.\src\eljpanel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljpen.cpp
+SOURCE=.\src\eljpen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprintdlg.cpp
+SOURCE=.\src\eljprintdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprinting.cpp
+SOURCE=.\src\eljprinting.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljprocess.cpp
+SOURCE=.\src\eljprocess.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljradiobox.cpp
+SOURCE=.\src\eljradiobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljradiobutton.cpp
+SOURCE=.\src\eljradiobutton.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljregion.cpp
+SOURCE=.\src\eljregion.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljregioniter.cpp
+SOURCE=.\src\eljregioniter.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsash.cpp
+SOURCE=.\src\eljsash.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscintilla.cpp
+SOURCE=.\src\eljscintilla.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscrollbar.cpp
+SOURCE=.\src\eljscrollbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljscrolledwindow.cpp
+SOURCE=.\src\eljscrolledwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsingleinst.cpp
+SOURCE=.\src\eljsingleinst.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsizer.cpp
+SOURCE=.\src\eljsizer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljslider.cpp
+SOURCE=.\src\eljslider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljspinctrl.cpp
+SOURCE=.\src\eljspinctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsplitterwindow.cpp
+SOURCE=.\src\eljsplitterwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstaticbox.cpp
+SOURCE=.\src\eljstaticbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstaticline.cpp
+SOURCE=.\src\eljstaticline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstatictext.cpp
+SOURCE=.\src\eljstatictext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljstatusbar.cpp
+SOURCE=.\src\eljstatusbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljsystemsettings.cpp
+SOURCE=.\src\eljsystemsettings.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtextctrl.cpp
+SOURCE=.\src\eljtextctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtglbtn.cpp
+SOURCE=.\src\eljtglbtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljthread.cpp
+SOURCE=.\src\eljthread.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtimer.cpp
+SOURCE=.\src\eljtimer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtipwnd.cpp
+SOURCE=.\src\eljtipwnd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljtoolbar.cpp
+SOURCE=.\src\eljtoolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljvalidator.cpp
+SOURCE=.\src\eljvalidator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljwindow.cpp
+SOURCE=.\src\eljwindow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\eljwizard.cpp
+SOURCE=.\src\eljwizard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\ewxw\Scintilla.h
+SOURCE=.\src\Scintilla.h
 # End Source File
 # End Group
 # Begin Group "ewxw headers"
@@ -613,11 +613,11 @@
 # PROP Default_Filter "*.h"
 # Begin Source File
 
-SOURCE=.\include\ewxw\wxc_glue.h
+SOURCE=.\include\wxc_glue.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\ewxw\wxc_types.h
+SOURCE=.\include\wxc_types.h
 # End Source File
 # End Group
 # End Group
diff --git a/wxcore.cabal b/wxcore.cabal
--- a/wxcore.cabal
+++ b/wxcore.cabal
@@ -1,13 +1,13 @@
 Name:           wxcore
-Version:        0.10.2
+Version:        0.10.3
 License:        LGPL
 License-file:   license.txt
 Author:         Daan Leijen
 Build-Type:     Make
 Description:    wxHaskell is a portable and native GUI library for Haskell.  It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X.  At present, it works with wxWidgets 2.6 (and sadly, not with with wxWidgets 2.8)
-Maintainer:     wxhaskell-users@lists.sourceforge.net
+Maintainer:     wxhaskell-devel@lists.sourceforge.net
 Cabal-Version:  >= 1.2
-Category:       GUI
+Category:       GUI, User interfaces
 Synopsis:       wxHaskell core
 
 Flag splitBase
diff --git a/wxcore/src/Graphics/UI/WXCore/Controls.hs b/wxcore/src/Graphics/UI/WXCore/Controls.hs
--- a/wxcore/src/Graphics/UI/WXCore/Controls.hs
+++ b/wxcore/src/Graphics/UI/WXCore/Controls.hs
@@ -41,7 +41,7 @@
 
 -- | Represents the children of a tree control.
 data TreeCookie   = TreeCookie (Var Cookie)
-data Cookie       = Cookie TreeItem CInt
+data Cookie       = Cookie TreeItem
                   | CookieFirst TreeItem
                   | CookieInvalid
 
@@ -60,17 +60,15 @@
          CookieInvalid    -> return Nothing
          CookieFirst item -> with 0 $ \pint ->
                              do first <- treeCtrlGetFirstChild treeCtrl item pint
-                                i     <- peek pint
                                 if (treeItemIsOk first)
-                                 then do varSet pcookie (Cookie item i)
+                                 then do varSet pcookie (Cookie first)
                                          return (Just first)
                                  else do varSet pcookie (CookieInvalid)
                                          return Nothing
-         Cookie parent i  -> with i $ \pint ->
-                             do next <- treeCtrlGetNextChild treeCtrl parent pint
-                                j    <- peek pint
+         Cookie item ->
+                             do next <- treeCtrlGetNextSibling treeCtrl item
                                 if (treeItemIsOk next)
-                                 then do varSet pcookie (Cookie parent j)
+                                 then do varSet pcookie (Cookie next)
                                          return (Just next)
                                  else do varSet pcookie (CookieInvalid)
                                          return Nothing
diff --git a/wxcore/src/Graphics/UI/WXCore/Db.hs b/wxcore/src/Graphics/UI/WXCore/Db.hs
--- a/wxcore/src/Graphics/UI/WXCore/Db.hs
+++ b/wxcore/src/Graphics/UI/WXCore/Db.hs
@@ -767,8 +767,8 @@
                                (if isFirst then wxSQL_FETCH_FIRST else wxSQL_FETCH_NEXT)
        if not ok
         then return Nothing
-        else do dsn  <- peekCString cdsn
-                desc <- peekCString cdesc 
+        else do dsn  <- peekCWString cdsn
+                desc <- peekCWString cdesc 
                 return (Just (dsn,desc))
   where
     dsnLen  = 255
diff --git a/wxcore/src/Graphics/UI/WXCore/Image.hs b/wxcore/src/Graphics/UI/WXCore/Image.hs
--- a/wxcore/src/Graphics/UI/WXCore/Image.hs
+++ b/wxcore/src/Graphics/UI/WXCore/Image.hs
@@ -36,10 +36,12 @@
     , imageGetPixelArray
     , imageCreateFromPixelArray
     , imageGetSize
+    , withImageData
 
     -- ** Pixel buffer
     , imageCreateFromPixelBuffer
     , imageGetPixelBuffer
+    , withPixelBuffer
     , PixelBuffer
     , pixelBufferCreate
     , pixelBufferDelete
@@ -298,19 +300,35 @@
 imageCreateFromPixelBuffer (PixelBuffer owned size buffer) 
   = imageCreateFromDataEx size buffer False
 
+-- | Do something with the pixels of an image
+withImageData :: Image a -> (Ptr () -> IO b) -> IO b
+withImageData image f = do
+    pixels <- imageGetData image
+    x <- f pixels
+    image `seq` return x -- about this seq:
+    -- it's not that we're trying to force evaluation order;
+    -- we merely want to prevent image from being garbage
+    -- collected before we've managed to use the array that
+    -- is being pointed to
+
+withPixelBuffer :: Image a -> (PixelBuffer -> IO b) -> IO b
+withPixelBuffer image f =
+    withImageData image $ \ptr -> do
+       w   <- imageGetWidth image
+       h   <- imageGetHeight image
+       f $ PixelBuffer False (sz w h) (ptrCast ptr)
+
+{-# DEPRECATED imageGetPixelBuffer "Use withPixelBuffer instead" #-}
 -- | Get the pixel buffer of an image.
+--   Note: use 'withPixelBuffer' instead
 imageGetPixelBuffer :: Image a -> IO PixelBuffer
 imageGetPixelBuffer image
-  = do ptr <- imageGetData image
-       w   <- imageGetWidth image
-       h   <- imageGetHeight image
-       return (PixelBuffer False (sz w h) (ptrCast ptr))
+  = withPixelBuffer image return
 
 -- | Get the pixels of an image.
 imageGetPixels :: Image a -> IO [Color]
 imageGetPixels image
-  = do pb <- imageGetPixelBuffer image
-       pixelBufferGetPixels pb
+  = withPixelBuffer image pixelBufferGetPixels
 
 -- | Create an image from a list of pixels.
 imageCreateFromPixels :: Size -> [Color] -> IO (Image ())
diff --git a/wxcore/src/Graphics/UI/WXCore/Layout.hs b/wxcore/src/Graphics/UI/WXCore/Layout.hs
--- a/wxcore/src/Graphics/UI/WXCore/Layout.hs
+++ b/wxcore/src/Graphics/UI/WXCore/Layout.hs
@@ -122,6 +122,7 @@
 -----------------------------------------------------------------------------------------
 module Graphics.UI.WXCore.Layout( -- * Types
                                Layout, sizerFromLayout
+                             , TabPage
                                -- * Window
                              , windowSetLayout, layoutFromWindow
                              , windowReFit, windowReFitMinimal
@@ -835,6 +836,7 @@
            insert (downcastSizer sizer) layout
            when (container /= objectNull) 
              (sizerAddSizerWithOptions container sizer options)
+           windowLower box
            return (downcastSizer sizer)
 
     insert container (Line options (Size w h))
diff --git a/wxcore/src/Graphics/UI/WXCore/Print.hs b/wxcore/src/Graphics/UI/WXCore/Print.hs
--- a/wxcore/src/Graphics/UI/WXCore/Print.hs
+++ b/wxcore/src/Graphics/UI/WXCore/Print.hs
@@ -134,9 +134,15 @@
         bottom= ppmmH * (max minY (toDouble mbottom))
         right = ppmmW * (max minX (toDouble mright))
 
+	dw = round (right + left)
+	dh = round (bottom + top)
+	(dw', dh') = if sizeW (printPageSize printInfo) < sizeH (printPageSize printInfo)
+		     then (dw, dh)
+		     else (dh, dw)
+
         -- the actual printable page size
-        printSize = sz (sizeW (printPageSize printInfo) - round (right + left)) 
-                      (sizeH (printPageSize printInfo) - round (bottom + top))
+        printSize = sz (sizeW (printPageSize printInfo) - dw') 
+                      (sizeH (printPageSize printInfo) - dh')
     in ((left,top),printSize) 
 
 -- | Get the zoom factor from the preview 
diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs
--- a/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs
+++ b/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs
@@ -12,7 +12,7 @@
 Do not edit this file manually!
 This file was automatically generated by wxDirect on: 
 
-  * @2008-02-16 12:00:53.332222 UTC@
+  * @2008-03-21 19:33:11.12887 UTC@
 
 And contains 368 class info definitions.
 -}
diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs
--- a/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs
+++ b/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs
@@ -12,7 +12,7 @@
 Do not edit this file manually!
 This file was automatically generated by wxDirect on: 
 
-  * @2008-02-16 11:57:01.519295 UTC@
+  * @2008-03-21 19:33:09.001001 UTC@
 
 From the files:
 
@@ -2138,7 +2138,7 @@
 import Graphics.UI.WXCore.WxcObject
 
 classTypesVersion :: String
-classTypesVersion  = "2008-02-16 11:57:01.507275 UTC"
+classTypesVersion  = "2008-03-21 19:33:08.987546 UTC"
 
 -- | Pointer to an object of type 'ConfigBase'.
 type ConfigBase a  = Object (CConfigBase a)
diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs b/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs
--- a/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs
+++ b/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs
@@ -12,13 +12,13 @@
 Do not edit this file manually!
 This file was automatically generated by wxDirect on: 
 
-  * @2008-02-16 11:57:06.031944 UTC@
+  * @2008-03-21 19:33:11.11742 UTC@
 
 From the files:
 
   * @wxc\/include\/wxc.h@
 
-And contains 3396 methods for 228 classes.
+And contains 3397 methods for 228 classes.
 -}
 --------------------------------------------------------------------------------
 module Graphics.UI.WXCore.WxcClasses
@@ -35,5 +35,5 @@
 import Graphics.UI.WXCore.WxcClassTypes
 
 versionWxcClasses :: String
-versionWxcClasses  = "2008-02-16 11:57:05.13215 UTC"
+versionWxcClasses  = "2008-03-21 19:33:09.976235 UTC"
 
diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs
--- a/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs
+++ b/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs
@@ -13,7 +13,7 @@
 Do not edit this file manually!
 This file was automatically generated by wxDirect on: 
 
-  * @2008-02-16 11:57:05.132154 UTC@
+  * @2008-03-21 19:33:09.976239 UTC@
 
 From the files:
 
@@ -1606,7 +1606,7 @@
 import Graphics.UI.WXCore.WxcClassTypes
 
 versionWxcClassesAL :: String
-versionWxcClassesAL  = "2008-02-16 11:57:05.13215 UTC"
+versionWxcClassesAL  = "2008-03-21 19:33:09.976235 UTC"
 
 -- | usage: (@acceleratorEntryCreate flags keyCode cmd@).
 acceleratorEntryCreate :: Int -> Int -> Int ->  IO (AcceleratorEntry  ())
diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs
--- a/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs
+++ b/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs
@@ -13,13 +13,13 @@
 Do not edit this file manually!
 This file was automatically generated by wxDirect on: 
 
-  * @2008-02-16 11:57:05.714377 UTC@
+  * @2008-03-21 19:33:10.720083 UTC@
 
 From the files:
 
   * @wxc\/include\/wxc.h@
 
-And contains 1935 methods for 118 classes.
+And contains 1936 methods for 118 classes.
 -}
 --------------------------------------------------------------------------------
 module Graphics.UI.WXCore.WxcClassesMZ
@@ -1058,6 +1058,7 @@
      ,soundIsOk
      ,soundPlay
      ,soundPlayCompatible
+     ,soundStop
      -- ** SpinButton
      ,spinButtonCreate
      ,spinButtonGetMax
@@ -2090,7 +2091,7 @@
 import Graphics.UI.WXCore.WxcClassTypes
 
 versionWxcClassesMZ :: String
-versionWxcClassesMZ  = "2008-02-16 11:57:05.13215 UTC"
+versionWxcClassesMZ  = "2008-03-21 19:33:09.976235 UTC"
 
 -- | usage: (@managedPtrCreateFromBitmap obj@).
 managedPtrCreateFromBitmap :: Bitmap  a ->  IO (WxManagedPtr  ())
@@ -7695,6 +7696,13 @@
     withObjectRef "soundPlayCompatible" self $ \cobj_self -> 
     wxSound_PlayCompatible cobj_self  (toCBool async)  (toCBool looped)  
 foreign import ccall "wxSound_PlayCompatible" wxSound_PlayCompatible :: Ptr (TSound a) -> CBool -> CBool -> IO CBool
+
+-- | usage: (@soundStop self@).
+soundStop :: Sound  a ->  IO ()
+soundStop self 
+  = withObjectRef "soundStop" self $ \cobj_self -> 
+    wxSound_Stop cobj_self  
+foreign import ccall "wxSound_Stop" wxSound_Stop :: Ptr (TSound a) -> IO ()
 
 -- | usage: (@spinButtonCreate prt id lfttopwdthgt stl@).
 spinButtonCreate :: Window  a -> Id -> Rect -> Style ->  IO (SpinButton  ())
diff --git a/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs b/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs
--- a/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs
+++ b/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs
@@ -12,13 +12,13 @@
 Do not edit this file manually!
 This file was automatically generated by wxDirect on: 
 
-  * @2008-02-16 12:01:05.699612 UTC@
+  * @2008-03-21 19:33:11.590823 UTC@
 
 From the files:
 
   * @wxc\/eiffel\/wxc_defs.e@
 
-  * @wxc\/eiffel\/ewxw\/wx_defs.e@
+  * @wxc\/eiffel\/wx_defs.e@
 
   * @wxc\/eiffel\/stc.e@
 
diff --git a/wxdirect/src/CompileClassTypes.hs b/wxdirect/src/CompileClassTypes.hs
--- a/wxdirect/src/CompileClassTypes.hs
+++ b/wxdirect/src/CompileClassTypes.hs
@@ -14,11 +14,19 @@
 
 import qualified Map
 
+#ifdef NO_DATA_TIME
+import Time( getClockTime)
+#else
 import Data.Time( getCurrentTime)
+#endif
 import Types
 import HaskellNames
 import Classes( isClassName, haskellClassDefs )
 import DeriveTypes( ClassName )
+
+#ifdef NO_DATA_TIME
+getCurrentTime = getClockTime
+#endif
 
 {-----------------------------------------------------------------------------------------
   Compile
diff --git a/wxdirect/src/CompileClasses.hs b/wxdirect/src/CompileClasses.hs
--- a/wxdirect/src/CompileClasses.hs
+++ b/wxdirect/src/CompileClasses.hs
@@ -17,7 +17,11 @@
 import qualified Map
 import qualified MultiSet
 
-import Data.Time( getCurrentTime )
+#ifdef NO_DATA_TIME
+import Time( getClockTime)
+#else
+import Data.Time( getCurrentTime)
+#endif
 import Data.Char( toUpper, isUpper, toLower ) --toLower, toUpper, isSpace, isLower, isUpper )
 import Data.List( isPrefixOf, sort, sortBy, intersperse, zipWith4 )
 
@@ -26,6 +30,10 @@
 import Classes( isClassName, haskellClassDefs, objectClassNames, ClassInfo(..), classInfo, classIsManaged )
 import ParseC( parseC )
 import DeriveTypes( deriveTypes, classifyName, Name(..), Method(..), ClassName, MethodName, PropertyName )
+
+#ifdef NO_DATA_TIME
+getCurrentTime = getClockTime
+#endif
 
 {-----------------------------------------------------------------------------------------
   Compile
diff --git a/wxdirect/src/CompileHeader.hs b/wxdirect/src/CompileHeader.hs
--- a/wxdirect/src/CompileHeader.hs
+++ b/wxdirect/src/CompileHeader.hs
@@ -16,7 +16,12 @@
 import qualified Map
 import qualified MultiSet
 
+#ifdef NO_DATA_TIME
+import Time( getClockTime)
+#else
 import Data.Time( getCurrentTime)
+#endif
+import Data.List( isPrefixOf )
 import Data.Char( toUpper, isUpper )
 import Data.List( isPrefixOf, sort, sortBy, intersperse, zipWith4 )
 
@@ -25,6 +30,10 @@
 import Classes( isClassName, classNames, classExtends )
 import ParseC( parseC )
 import DeriveTypes( deriveTypesAll, classifyName, Name(..), Method(..), ClassName, MethodName, PropertyName )
+
+#ifdef NO_DATA_TIME
+getCurrentTime = getClockTime
+#endif
 
 {-----------------------------------------------------------------------------------------
   Compile
diff --git a/wxdirect/src/HaskellNames.hs b/wxdirect/src/HaskellNames.hs
--- a/wxdirect/src/HaskellNames.hs
+++ b/wxdirect/src/HaskellNames.hs
@@ -19,9 +19,16 @@
 
 import qualified Set
 import Data.Char( toLower, toUpper, isLower, isUpper )
-import Data.Time( getCurrentTime )
+#ifdef NO_DATA_TIME
+import Time( getClockTime)
+#else
+import Data.Time( getCurrentTime)
+#endif
 import Data.List( isPrefixOf )
 
+#ifdef NO_DATA_TIME
+getCurrentTime = getClockTime
+#endif
 {-----------------------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------------------}
diff --git a/wxdirect/src/MultiSet.hs b/wxdirect/src/MultiSet.hs
--- a/wxdirect/src/MultiSet.hs
+++ b/wxdirect/src/MultiSet.hs
@@ -99,7 +99,8 @@
 {--------------------------------------------------------------------
   Operators
 --------------------------------------------------------------------}
-infixl 9 \\
+-- Comment on line below can be removed when we drop support for GHC 6.6.
+infixl 9 \\   -- Dummy comment to prevent CPP-preprocessor from seeing \\ as newline continuation
 
 -- | /O(n+m)/. See 'difference'.
 (\\) :: Ord a => MultiSet a -> MultiSet a -> MultiSet a
diff --git a/wxdirect/src/Set.hs b/wxdirect/src/Set.hs
--- a/wxdirect/src/Set.hs
+++ b/wxdirect/src/Set.hs
@@ -134,7 +134,8 @@
 {--------------------------------------------------------------------
   Operators
 --------------------------------------------------------------------}
-infixl 9 \\
+-- Comment on line below can be removed when we drop support for GHC 6.6.
+infixl 9 \\    -- Dummy comment to prevent CPP-preprocessor from seeing \\ as newline continuation
 
 -- | /O(n+m)/. See 'difference'.
 (\\) :: Ord a => Set a -> Set a -> Set a