wx 0.12.1.4 → 0.12.1.5

raw patch · 2 files changed

+6/−7 lines, 2 files

Files

• src/Graphics/UI/WX/Controls.hs +4/−5
• wx.cabal +2/−2

@@ -318,7 +318,7 @@ -- entry :: Window a -> [Prop (TextCtrl ())] -> IO (TextCtrl ()) entry parent props-  = textCtrlEx parent 0 props+  = textCtrlEx parent wxTE_RICH props  -- | Create a single-line text entry control. Note: 'alignment' has to -- be set at creation time (or the entry has default alignment (=left) ).@@ -328,7 +328,7 @@ -- textEntry :: Window a -> [Prop (TextCtrl ())] -> IO (TextCtrl ()) textEntry parent props-  = textCtrlEx parent 0 props+  = textCtrlEx parent wxTE_RICH props  -- | Create a multi-line text control. Note: the 'wrap' and 'alignment' -- have to be set at creation time or the default to 'WrapNone' and 'AlignLeft' respectively.@@ -338,7 +338,7 @@ -- textCtrl :: Window a -> [Prop (TextCtrl ())] -> IO (TextCtrl ()) textCtrl parent props-  = textCtrlEx parent wxTE_MULTILINE props+  = textCtrlEx parent (wxTE_MULTILINE .+. wxTE_RICH) props   -- | Create a multi-line text rich-text control with a certain wrap mode@@ -362,10 +362,9 @@ textCtrlEx parent stl props   = feed2 props stl $     initialWindow    $ \id rect ->-    initialText      $ \txt ->     initialWrap      $     initialAlignment $ \props flags ->-    do e <- textCtrlCreate parent id txt rect flags+    do e <- textCtrlCreate parent id "" rect flags        set e props        return e 

@@ -1,5 +1,5 @@ Name:           wx-Version:        0.12.1.4+Version:        0.12.1.5 License:        LGPL License-file:   license.txt Homepage:       http://haskell.org/haskellwiki/WxHaskell@@ -29,7 +29,7 @@             build-depends:                 base >= 3 && < 4     else-        build-depends: base <  3,+        build-depends: base <  3,                         wxcore >= 0.12.1.4,                        stm