diff --git a/src/cpp/eljtextctrl.cpp b/src/cpp/eljtextctrl.cpp --- a/src/cpp/eljtextctrl.cpp +++ b/src/cpp/eljtextctrl.cpp @@ -20,6 +20,11 @@ self->SetValue(*value); } +EWXWEXPORT(void,wxTextCtrl_ChangeValue)(wxTextCtrl* self, wxString* value) +{ + self->ChangeValue(*value); +} + EWXWEXPORT(int,wxTextCtrl_GetLineLength)(wxTextCtrl* self,long lineNo) { return self->GetLineLength(lineNo); diff --git a/src/haskell/Graphics/UI/WXCore/Events.hs b/src/haskell/Graphics/UI/WXCore/Events.hs --- a/src/haskell/Graphics/UI/WXCore/Events.hs +++ b/src/haskell/Graphics/UI/WXCore/Events.hs @@ -237,6 +237,7 @@ import Foreign.StablePtr import Foreign.Ptr import Foreign.C.String +import Foreign.C.Types import Foreign.Marshal.Alloc import Foreign.Marshal.Array import Foreign.Marshal.Utils diff --git a/src/haskell/Graphics/UI/WXCore/WxcClassInfo.hs b/src/haskell/Graphics/UI/WXCore/WxcClassInfo.hs --- a/src/haskell/Graphics/UI/WXCore/WxcClassInfo.hs +++ b/src/haskell/Graphics/UI/WXCore/WxcClassInfo.hs @@ -12,7 +12,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2012-02-07 07:27:02.6451722 UTC@ + * @2012-09-30 09:56:34.7301176 UTC@ And contains 382 class info definitions. -} diff --git a/src/haskell/Graphics/UI/WXCore/WxcClassTypes.hs b/src/haskell/Graphics/UI/WXCore/WxcClassTypes.hs --- a/src/haskell/Graphics/UI/WXCore/WxcClassTypes.hs +++ b/src/haskell/Graphics/UI/WXCore/WxcClassTypes.hs @@ -12,7 +12,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2012-02-07 07:27:02.4226688 UTC@ + * @2012-09-30 09:56:34.6101174 UTC@ From the files: @@ -2170,7 +2170,7 @@ import Graphics.UI.WXCore.WxcObject classTypesVersion :: String -classTypesVersion = "2012-02-07 07:27:02.4226688 UTC" +classTypesVersion = "2012-09-30 09:56:34.6101174 UTC" -- | Pointer to an object of type 'ConfigBase'. type ConfigBase a = Object (CConfigBase a) diff --git a/src/haskell/Graphics/UI/WXCore/WxcClasses.hs b/src/haskell/Graphics/UI/WXCore/WxcClasses.hs --- a/src/haskell/Graphics/UI/WXCore/WxcClasses.hs +++ b/src/haskell/Graphics/UI/WXCore/WxcClasses.hs @@ -12,13 +12,13 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2012-02-07 07:27:03.3726834 UTC@ + * @2012-09-30 09:56:35.3593185 UTC@ From the files: * @src\/include\/wxc.h@ -And contains 3788 methods for 239 classes. +And contains 3789 methods for 239 classes. -} -------------------------------------------------------------------------------- module Graphics.UI.WXCore.WxcClasses diff --git a/src/haskell/Graphics/UI/WXCore/WxcClassesAL.hs b/src/haskell/Graphics/UI/WXCore/WxcClassesAL.hs --- a/src/haskell/Graphics/UI/WXCore/WxcClassesAL.hs +++ b/src/haskell/Graphics/UI/WXCore/WxcClassesAL.hs @@ -13,7 +13,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2012-02-07 07:27:03.0926791 UTC@ + * @2012-09-30 09:56:35.0901181 UTC@ From the files: @@ -1614,6 +1614,7 @@ import qualified Data.ByteString as B (ByteString, useAsCStringLen) import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack) +import Foreign.C.Types import System.IO.Unsafe( unsafePerformIO ) import Graphics.UI.WXCore.WxcTypes import Graphics.UI.WXCore.WxcClassTypes diff --git a/src/haskell/Graphics/UI/WXCore/WxcClassesMZ.hs b/src/haskell/Graphics/UI/WXCore/WxcClassesMZ.hs --- a/src/haskell/Graphics/UI/WXCore/WxcClassesMZ.hs +++ b/src/haskell/Graphics/UI/WXCore/WxcClassesMZ.hs @@ -13,13 +13,13 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2012-02-07 07:27:03.2701818 UTC@ + * @2012-09-30 09:56:35.2593184 UTC@ From the files: * @src\/include\/wxc.h@ -And contains 2320 methods for 123 classes. +And contains 2321 methods for 123 classes. -} -------------------------------------------------------------------------------- module Graphics.UI.WXCore.WxcClassesMZ @@ -1848,6 +1848,7 @@ ,textCtrlCanPaste ,textCtrlCanRedo ,textCtrlCanUndo + ,textCtrlChangeValue ,textCtrlClear ,textCtrlCopy ,textCtrlCreate @@ -2475,6 +2476,7 @@ import qualified Data.ByteString as B (ByteString, useAsCStringLen) import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack) +import Foreign.C.Types import System.IO.Unsafe( unsafePerformIO ) import Graphics.UI.WXCore.WxcTypes import Graphics.UI.WXCore.WxcClassTypes @@ -11982,6 +11984,14 @@ withObjectRef "textCtrlCanUndo" _obj $ \cobj__obj -> wxTextCtrl_CanUndo cobj__obj foreign import ccall "wxTextCtrl_CanUndo" wxTextCtrl_CanUndo :: Ptr (TTextCtrl a) -> IO CBool + +-- | usage: (@textCtrlChangeValue obj text@). +textCtrlChangeValue :: TextCtrl a -> String -> IO () +textCtrlChangeValue _obj text + = withObjectRef "textCtrlChangeValue" _obj $ \cobj__obj -> + withStringPtr text $ \cobj_text -> + wxTextCtrl_ChangeValue cobj__obj cobj_text +foreign import ccall "wxTextCtrl_ChangeValue" wxTextCtrl_ChangeValue :: Ptr (TTextCtrl a) -> Ptr (TWxString b) -> IO () -- | usage: (@textCtrlClear obj@). textCtrlClear :: TextCtrl a -> IO () diff --git a/src/haskell/Graphics/UI/WXCore/WxcDefs.hs b/src/haskell/Graphics/UI/WXCore/WxcDefs.hs --- a/src/haskell/Graphics/UI/WXCore/WxcDefs.hs +++ b/src/haskell/Graphics/UI/WXCore/WxcDefs.hs @@ -12,7 +12,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2012-02-07 07:27:03.4251842 UTC@ + * @2012-09-30 09:56:35.4193186 UTC@ From the files: diff --git a/src/include/wxc_glue.h b/src/include/wxc_glue.h --- a/src/include/wxc_glue.h +++ b/src/include/wxc_glue.h @@ -4538,6 +4538,7 @@ TBool wxTextCtrl_CanPaste( TSelf(wxTextCtrl) _obj ); TBool wxTextCtrl_CanRedo( TSelf(wxTextCtrl) _obj ); TBool wxTextCtrl_CanUndo( TSelf(wxTextCtrl) _obj ); +void wxTextCtrl_ChangeValue( TSelf(wxTextCtrl) _obj, TClass(wxString) text ); void wxTextCtrl_Clear( TSelf(wxTextCtrl) _obj ); void wxTextCtrl_Copy( TSelf(wxTextCtrl) _obj ); TClass(wxTextCtrl) wxTextCtrl_Create( TClass(wxWindow) _prt, int _id, TClass(wxString) _txt, TRect(_lft,_top,_wdt,_hgt), long _stl ); diff --git a/wxcore.cabal b/wxcore.cabal --- a/wxcore.cabal +++ b/wxcore.cabal @@ -1,5 +1,5 @@ name: wxcore -version: 0.13.2.1 +version: 0.13.2.3 license: OtherLicense license-file: LICENSE author: Daan Leijen @@ -201,7 +201,7 @@ filepath, parsec, stm, - wxdirect > 0.12.1.2, + wxdirect > 0.12.1.2 && < 0.90, directory, time @@ -209,7 +209,7 @@ build-depends: array >= 0.2 && < 0.5, base >= 4 && < 5, - containers >= 0.2 && < 0.5 + containers >= 0.2 && < 0.6 else build-depends: array >= 0.1 && < 0.3,