diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -3,9 +3,7 @@ Fltkhs aims to be a complete Haskell binding to the [FLTK GUI library] [1]. -NOTE: As of version 0.5.0.1 only FLTK 1.3.4-1 is supported. Old code written against FLTK 1.3.3 will still work, 1.3.4 does not remove any functionality. - -NOTE: As of version 0.4.0.0, due to the introduction of closed type families, only GHC >= 7.8.1 is supported. +While the current recommended version of FLTK is 1.3.4, the previous version 1.3.3. is also supported since some Linux distributions haven't upgraded yet. Quick Install ------------- diff --git a/c-src/Fl_C.cpp b/c-src/Fl_C.cpp --- a/c-src/Fl_C.cpp +++ b/c-src/Fl_C.cpp @@ -594,6 +594,7 @@ Fl_Widget* refPtr = &ref; Fl::release_widget_pointer(refPtr); } +#if FL_API_VERSION == 10304 FL_EXPORT_C(void,Fl_set_box_color)(Fl_Color c) { Fl::set_box_color(c); } @@ -618,6 +619,8 @@ FL_EXPORT_C(const char*,Fl_local_shift)(){ return fl_local_shift; } +#endif + #ifdef __cplusplus } #endif diff --git a/c-src/Fl_C.h b/c-src/Fl_C.h --- a/c-src/Fl_C.h +++ b/c-src/Fl_C.h @@ -257,6 +257,7 @@ FL_EXPORT_C(void ,Fl_release_widget_pointer)(fl_Widget w); FL_EXPORT_C(void ,Fl_clear_widget_pointer)(fl_Widget w); FL_EXPORT_C(void ,Fl_clear_widget_pointer)(fl_Widget w); +#if FL_API_VERSION == 10304 FL_EXPORT_C(void ,Fl_set_box_color)(Fl_Color c); FL_EXPORT_C(Fl_Color ,Fl_box_color)(Fl_Color c); FL_EXPORT_C(int ,Fl_abi_version)(); @@ -265,6 +266,7 @@ FL_EXPORT_C(const char* ,Fl_local_meta)(); FL_EXPORT_C(const char* ,Fl_local_alt)(); FL_EXPORT_C(const char* ,Fl_local_shift)(); +#endif #ifdef __cplusplus } #endif diff --git a/c-src/Fl_DeviceC.cpp b/c-src/Fl_DeviceC.cpp --- a/c-src/Fl_DeviceC.cpp +++ b/c-src/Fl_DeviceC.cpp @@ -43,10 +43,12 @@ Fl_Font_Descriptor* _d = static_cast(d); return (static_cast(graphics_driver))->font_descriptor(_d); } +#if FL_API_VERSION == 10304 FL_EXPORT_C(int, fl_Graphics_Driver_draw_scaled)(fl_Graphics_Driver graphics_driver, fl_Image i, int X, int Y, int W, int H) { return (static_cast(graphics_driver))->draw_scaled(static_cast(i),X,Y,W,H); } +#endif FL_EXPORT_C(void,Fl_Graphics_Driver_Destroy)(fl_Graphics_Driver graphics_driver){ delete (static_cast(graphics_driver)); } diff --git a/c-src/Fl_DeviceC.h b/c-src/Fl_DeviceC.h --- a/c-src/Fl_DeviceC.h +++ b/c-src/Fl_DeviceC.h @@ -25,7 +25,9 @@ FL_EXPORT_C(Fl_Color, Fl_Graphics_Driver_color)(fl_Graphics_Driver graphics_driver); FL_EXPORT_C(fl_Font_Descriptor, Fl_Graphics_Driver_font_descriptor)(fl_Graphics_Driver graphics_driver); FL_EXPORT_C(void, Fl_Graphics_Driver_set_font_descriptor)(fl_Graphics_Driver graphics_driver,fl_Font_Descriptor d); +#if FL_API_VERSION == 10304 FL_EXPORT_C(int, fl_Graphics_Driver_draw_scaled)(fl_Graphics_Driver graphics_driver, fl_Image i,int X, int Y, int W, int H); +#endif FL_EXPORT_C(void, Fl_Graphics_Driver_Destroy)(fl_Graphics_Driver graphics_driver); // Fl_Surface_Device diff --git a/c-src/Fl_ImageC.cpp b/c-src/Fl_ImageC.cpp --- a/c-src/Fl_ImageC.cpp +++ b/c-src/Fl_ImageC.cpp @@ -147,9 +147,11 @@ FL_EXPORT_C(void,Fl_Image_uncache)(fl_Image image){ return (static_cast(image))->uncache(); } +#if FL_API_VERSION == 10304 FL_EXPORT_C(int, Fl_Image_fail)(fl_Image image){ return (static_cast(image))->fail(); } +#endif #ifdef __cplusplus } diff --git a/c-src/Fl_ImageC.h b/c-src/Fl_ImageC.h --- a/c-src/Fl_ImageC.h +++ b/c-src/Fl_ImageC.h @@ -61,7 +61,9 @@ FL_EXPORT_C(void,Fl_Image_draw_with)(fl_Image image,int X,int Y,int W,int H); FL_EXPORT_C(void, Fl_Image_draw)(fl_Image image,int X, int Y); FL_EXPORT_C(void, Fl_Image_uncache)(fl_Image image); +#if FL_API_VERSION == 10304 FL_EXPORT_C(int, Fl_Image_fail)(fl_Image image); +#endif #ifdef __cplusplus } #endif diff --git a/c-src/Fl_Menu_C.cpp b/c-src/Fl_Menu_C.cpp --- a/c-src/Fl_Menu_C.cpp +++ b/c-src/Fl_Menu_C.cpp @@ -615,9 +615,11 @@ FL_EXPORT_C(void,Fl_Menu__set_down_color)(fl_Menu_ menu_,unsigned c){ (static_cast(menu_))->down_color(c); } +#if FL_API_VERSION == 10304 FL_EXPORT_C(void, Fl_Menu__set_only)(fl_Menu_ menu_, fl_Menu_Item m){ (static_cast(menu_))->setonly(static_cast(m)); } +#endif #ifdef __cplusplus } #endif diff --git a/c-src/Fl_Menu_C.h b/c-src/Fl_Menu_C.h --- a/c-src/Fl_Menu_C.h +++ b/c-src/Fl_Menu_C.h @@ -207,7 +207,9 @@ FL_EXPORT_C(void, Fl_Menu__set_down_box)(fl_Menu_ menu_, Fl_Boxtype b); FL_EXPORT_C(Fl_Color, Fl_Menu__down_color)(fl_Menu_ menu_); FL_EXPORT_C(void, Fl_Menu__set_down_color)(fl_Menu_ menu_, unsigned c); +#if FL_API_VERSION == 10304 FL_EXPORT_C(void, Fl_Menu__set_only)(fl_Menu_ menu_, fl_Menu_Item m); +#endif #ifdef __cplusplus } #endif diff --git a/fltkhs.cabal b/fltkhs.cabal --- a/fltkhs.cabal +++ b/fltkhs.cabal @@ -1,5 +1,5 @@ name : fltkhs -version : 0.5.1.0 +version : 0.5.1.1 synopsis : FLTK bindings description: Low level bindings for the FLTK GUI toolkit. For installation and quick start instruction please scroll all the way down to the README. @@ -9,9 +9,9 @@ author : Aditya Siram maintainer: aditya.siram@gmail.com homepage: http://github.com/deech/fltkhs --- bug-reports: --- copyright: -category: UI,Graphics +bug-reports: https://github.com/deech/fltkhs/issues +copyright: © 2017 Aditya Siram All Rights Reserved +category: UI,Graphics,GUI,User Interfaces build-type: Custom cabal-version: >=1.24 source-repository head diff --git a/scripts/doc-parser.hs b/scripts/doc-parser.hs --- a/scripts/doc-parser.hs +++ b/scripts/doc-parser.hs @@ -16,15 +16,25 @@ spacesOrNewLines = skipMany $ (char ' ') <|> (char '\n') <|> crlf -parseInstances = go (return []) +parseInstances = go False (return ([],[])) where - go accum = ((try (eof >> accum)) <|> - (try (do - newline >> string "instance" - soFar <- accum - opInstance <- parseInstance - go (return (soFar ++ [opInstance])))) <|> - (anyChar >> go accum)) + go inIfdef accum = ((try (eof >> accum)) <|> + (try (do + newline >> string "#if FL_API_VERSION == 10304" >> endOfLine + go True accum)) <|> + (try (do + newline >> string "#endif" >> endOfLine + go False accum)) <|> + (try (do + newline >> string "instance" + (soFar, newVersionOnly)<- accum + opInstance <- parseInstance + go inIfdef + (return + (if inIfdef + then (soFar, newVersionOnly ++ [opInstance]) + else (soFar ++ [opInstance], newVersionOnly))))) <|> + (anyChar >> go inIfdef accum)) parseInstance = do spaces char '(' @@ -140,7 +150,7 @@ let parseWidgetFile contents = case (parse parseInstances "" contents) of Left err -> error (show err) - Right instances -> Just instances + Right (functions, newVersionOnly) -> (Just functions, Just newVersionOnly) let hier' = map (\o -> case (parse runHierarchyParser "" o) of Left err -> Nothing @@ -158,8 +168,10 @@ putStr "\n" (Just (Functions w)) -> do contents <- readWidgetFile w - let parsed = parseWidgetFile contents - let instances = maybe [] (sort . map (\(c, sig, mName, wType) -> pprint ((c, sig), mName, wType))) - parsed - putStr $ intercalate "\n--\n" (map ((++) "-- ") instances) + let (functions, inNewVersionOnly) = parseWidgetFile contents + let rendered = maybe [] (sort . map (\(c, sig, mName, wType) -> pprint ((c, sig), mName, wType))) + putStr $ intercalate "\n--\n" (map ((++) "-- ") (rendered functions)) + putStr "\n" + putStr $ "\n-- Available in FLTK 1.3.4 only: \n" + putStr $ intercalate "\n--\n" (map ((++) "-- ") (rendered inNewVersionOnly)) putStr "\n" diff --git a/src/Fluid/Generate.hs b/src/Fluid/Generate.hs --- a/src/Fluid/Generate.hs +++ b/src/Fluid/Generate.hs @@ -44,9 +44,9 @@ lookup flWidgetType buttonType | flClassName == "Fl_Browser" = lookup flWidgetType browserType - | flClassName == "Fl_MenuItem" = + | flClassName == "MenuItem" = lookup flWidgetType menuItemType - | flClassName == "Fl_MenuButton" = + | flClassName == "Fl_Menu_Button" = lookup flWidgetType menuButtonType | flClassName == "Fl_Dial" = lookup flWidgetType dialType @@ -148,7 +148,7 @@ Types.Tooltip t -> apply "setTooltip" name (Just $ show $ collapseString t) Types.When w -> - apply "setWhen" name (Just $ "[" ++ (snd (whenType !! w)) ++ "]") + apply "setWhen" name (Just $ "[" ++ (whenType !! w) ++ "]") Types.Hotspot -> (apply "getWindow" name Nothing) ++ " >>= " ++ @@ -240,12 +240,18 @@ in (maybe menuItemName (\(Label l) -> (collapseString l)) label , attrsWithoutLabel) -menuItemCode :: String -> String -> String -> [String] -> [Attribute] -> ([String], [Attribute]) -menuItemCode mn menuItemName label menuPath restAttrs = - let callbackCode callback = [ +menuItemCode :: String -> String -> String -> [String] -> [String] -> [Attribute] -> ([String], [Attribute]) +menuItemCode mn menuItemName label flags menuPath restAttrs = + let labelCode l = [ + "let { label = \"" ++ (concat (intersperse "/" ((reverse menuPath) ++ [l]))) ++ "\"}" + ] + callbackCode callback = [ "let { callback :: Maybe (Ref MenuItem -> IO ()); callback = " ++ callback ++ "}" ] - (((), attrs), haskellCode) + shortcutCode sc = [ + "let { shortcut :: Maybe Shortcut ; shortcut = " ++ sc ++ "}" + ] + (((), (attrs, _)), haskellCode) = (runIdentity (runWriterT (runStateT @@ -253,32 +259,45 @@ let attrCode :: (Attribute -> Bool) -> (Attribute -> [String]) -> [String] -> - StateT [Attribute] (WriterT [String] Identity) () - attrCode findAttr toCode fallback = do - currentAttrs <- get + Bool -> + StateT ([Attribute], [String]) (WriterT [String] Identity) () + attrCode findAttr toCode fallback isFlag = do + (currentAttrs, flags) <- get let (attr, restAttrs') = findDrop currentAttrs findAttr - modify (\_ -> restAttrs') - tell (maybe fallback toCode attr) + modify (\_ -> (restAttrs', flags)) + if isFlag then modify (\(attrs, flags) -> (attrs, flags ++ (maybe [] toCode attr))) + else tell (maybe fallback toCode attr) + tell (labelCode label) + attrCode (\a -> case a of Divider -> True; _ -> False) + (\_ -> ["MenuItemDivider"]) + [] + True + attrCode (\a -> case a of Types.WidgetType _ -> True; _ -> False) + (\(WidgetType w) -> maybe [] (\t -> [t]) (typeToHs "MenuItem" (collapseString w))) + [] + True attrCode (\a -> case a of Callback _ -> True; _ -> False) (\(Callback c) -> callbackCode (collapseString c)) (callbackCode "(Nothing :: Maybe (Ref MenuItem -> IO ())) ") - tell ["let { label = \"" ++ (concat (intersperse "/" ((reverse menuPath) ++ [label]))) ++ "\"}" ] + False + attrCode (\a -> case a of Shortcut _ -> True; _ -> False) + (\(Shortcut s) -> + maybe + (shortcutCode "Nothing") + (\ks -> shortcutCode (show ks)) + (cIntToKeySequence ((read s) :: CInt))) + (shortcutCode "Nothing") + False + (_,newFlags) <- get tell ["(MenuItemIndex idx) <- add " ++ mn ++ " label " ++ - "(Nothing :: Maybe Shortcut) " ++ + "shortcut " ++ "callback " ++ - "(MenuItemFlags [])", + "(MenuItemFlags [" ++ (concat (intersperse "," (flags ++ newFlags))) ++ "])", mn ++ "_menuItems <- getMenu " ++ mn, "let {" ++ menuItemName ++ " = fromJust (" ++ mn ++ "_menuItems !! idx)}" ] - attrCode (\a -> case a of Shortcut _ -> True; _ -> False) - (\(Shortcut s) -> - maybe - [] - (\ks -> ["setShortcut " ++ mn ++ " idx (" ++ (show ks) ++ ")"]) - (cIntToKeySequence ((read s) :: CInt))) - [] - ) restAttrs))) + ) (restAttrs, [])))) in (haskellCode, attrs) determineClassName :: String -> [Attribute] -> (Maybe (String, String, String), [Attribute]) @@ -352,6 +371,8 @@ }) (case flClassName of { "Fl_Choice" -> []; + "Fl_Menu_Bar" -> []; + "Fl_Menu_Button" -> []; _ -> ([newLabel] ++ menuPath) }) tree) @@ -364,14 +385,10 @@ "Submenu" -> case menuName of Just mn -> - let (haskellCode, newAttrs) = menuItemCode mn newName newLabel menuPath attrsWithoutLabel + let flags = ["Submenu"] + (haskellCode, newAttrs) = menuItemCode mn newName newLabel flags menuPath attrsWithoutLabel in haskellCode ++ - [ - "flags " ++ " <- getFlags " ++ newName, - "let {newFlags = maybe (MenuItemFlags [Submenu]) (\\(MenuItemFlags fs)-> (MenuItemFlags (fs ++ [Submenu]))) flags}", - "setMode " ++ mn ++ " idx newFlags" - ] ++ (map (attributeG newFlClassName newName) newAttrs) ++ innerTreeOutput _ -> @@ -383,11 +400,11 @@ (constructorG newFlClassName hsConstructor (Just newName) posSize) ++ (map (attributeG newFlClassName newName) attrsWithoutLabel) ++ innerTreeOutput - "Fl_Choice" -> + m | m == "Fl_Choice" || m == "Fl_Menu_Button"-> (constructorG newFlClassName hsConstructor (Just newName) posSize) ++ (map (attributeG newFlClassName newName) restAttrs) ++ - ["setMenu " ++ newName ++ " ([] :: [Ref MenuItem])"] ++ - innerTreeOutput + innerTreeOutput ++ + ["setValue " ++ newName ++ " (MenuItemByIndex (MenuItemIndex " ++ (show 0) ++ "))"] _ -> (constructorG newFlClassName hsConstructor (Just newName) posSize) ++ (map (attributeG newFlClassName newName) attrsWithoutLabel) ++ @@ -413,7 +430,7 @@ case menuName of Just mn -> let (label, attrsWithoutLabel) = menuLabel newName restAttrs - (haskellCode, newAttrs) = menuItemCode mn newName label menuPath attrsWithoutLabel + (haskellCode, newAttrs) = menuItemCode mn newName label [] menuPath attrsWithoutLabel in haskellCode ++ (map (attributeG newFlClassName newName) newAttrs) _ -> [] _ -> (constructorG newFlClassName hsConstructor (Just newName) posSize) ++ diff --git a/src/Fluid/Lookup.hs b/src/Fluid/Lookup.hs --- a/src/Fluid/Lookup.hs +++ b/src/Fluid/Lookup.hs @@ -29,7 +29,7 @@ labelType :: [(String, String)] alignmentType :: [(String, String)] sliderType :: [(String, String)] -whenType :: [(String, String)] +whenType :: [String] inputType :: [(String, String)] outputType :: [(String, String)] packType :: [(String, String)] @@ -143,11 +143,16 @@ ("Vert Knob" ,"VertNiceSliderType"), ("Horz Knob" ,"HorNiceSliderType") ] + whenType = [ - ("Never" ,"WhenNever"), - ("Release" ,"WhenRelease"), - ("Changed" ,"WhenChanged"), - ("Enter key" ,"WhenEnterKey") + "WhenNever" + ,"WhenChanged" + ,"WhenNotChanged" + ,"WhenRelease" + ,"WhenReleaseAlways" + ,"WhenEnterKey" + ,"WhenEnterKeyAlways" + ,"WhenEnterKeyChanged" ] inputType = [ ("Normal", "FlNormalInput"), @@ -284,7 +289,7 @@ ,("Fl_Table",("Table", "tableNew")) ,("Fl_Scroll",("Scroll", "scrollNew")) ,("Fl_Menu_Bar",("MenuBar", "sysMenuBarNew")) - ,("Menu_Button",("MenuButton", "menuButtonNew")) + ,("Fl_Menu_Button",("MenuButton", "menuButtonNew")) ,("Fl_Choice",("Choice", "choiceNew")) ,("Fl_Browser",("Browser", "browserNew" )) ,("Fl_Tabs",("Tabs", "tabsNew")) @@ -293,6 +298,7 @@ ,("Fl_Text_Display", ("TextDisplay", "textDisplayNew")) ,("Fl_Text_Editor", ("TextEditor", "textEditorNew")) ,("Fl_Tile", ("Tile", "tileNew")) + ,("Fl_File_Browser", ("FileBrowser", "fileBrowserNew")) ] imageExtensions = diff --git a/src/Fluid/Migrate.hs b/src/Fluid/Migrate.hs --- a/src/Fluid/Migrate.hs +++ b/src/Fluid/Migrate.hs @@ -3,7 +3,7 @@ import Graphics.UI.FLTK.LowLevel.Utils import Fluid.Types import Fluid.Lookup -import Foreign.C.Types + import Data.List import Data.Ord diff --git a/src/Graphics/UI/FLTK/LowLevel/Adjuster.chs b/src/Graphics/UI/FLTK/LowLevel/Adjuster.chs --- a/src/Graphics/UI/FLTK/LowLevel/Adjuster.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Adjuster.chs @@ -17,7 +17,6 @@ #include "Fl_Types.h" #include "Fl_AdjusterC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Ask.chs b/src/Graphics/UI/FLTK/LowLevel/Ask.chs --- a/src/Graphics/UI/FLTK/LowLevel/Ask.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Ask.chs @@ -13,7 +13,7 @@ #include "Fl_Types.h" #include "Fl_AskC.h" import C2HS hiding (cFromEnum, cToBool,cToEnum) -import Foreign.C.Types + import qualified Data.Text as T import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Bitmap.chs b/src/Graphics/UI/FLTK/LowLevel/Bitmap.chs --- a/src/Graphics/UI/FLTK/LowLevel/Bitmap.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Bitmap.chs @@ -16,7 +16,6 @@ #include "Fl_Types.h" #include "Fl_BitmapC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Box.chs b/src/Graphics/UI/FLTK/LowLevel/Box.chs --- a/src/Graphics/UI/FLTK/LowLevel/Box.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Box.chs @@ -20,7 +20,7 @@ #include "Fl_Types.h" #include "Fl_BoxC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Browser.chs b/src/Graphics/UI/FLTK/LowLevel/Browser.chs --- a/src/Graphics/UI/FLTK/LowLevel/Browser.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Browser.chs @@ -19,7 +19,7 @@ #include "Fl_BrowserC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Button.chs b/src/Graphics/UI/FLTK/LowLevel/Button.chs --- a/src/Graphics/UI/FLTK/LowLevel/Button.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Button.chs @@ -21,7 +21,7 @@ #include "Fl_ExportMacros.h" #include "Fl_Types.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Widget import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types diff --git a/src/Graphics/UI/FLTK/LowLevel/CheckButton.chs b/src/Graphics/UI/FLTK/LowLevel/CheckButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/CheckButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/CheckButton.chs @@ -16,7 +16,6 @@ #include "Fl_Check_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Choice.chs b/src/Graphics/UI/FLTK/LowLevel/Choice.chs --- a/src/Graphics/UI/FLTK/LowLevel/Choice.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Choice.chs @@ -18,7 +18,6 @@ #include "Fl_ChoiceC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.MenuItem import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types diff --git a/src/Graphics/UI/FLTK/LowLevel/Clock.chs b/src/Graphics/UI/FLTK/LowLevel/Clock.chs --- a/src/Graphics/UI/FLTK/LowLevel/Clock.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Clock.chs @@ -24,7 +24,6 @@ #include "Fl_Types.h" #include "Fl_ClockC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/ColorChooser.chs b/src/Graphics/UI/FLTK/LowLevel/ColorChooser.chs --- a/src/Graphics/UI/FLTK/LowLevel/ColorChooser.chs +++ b/src/Graphics/UI/FLTK/LowLevel/ColorChooser.chs @@ -20,7 +20,7 @@ #include "Fl_Types.h" #include "Fl_Color_ChooserC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/CopySurface.chs b/src/Graphics/UI/FLTK/LowLevel/CopySurface.chs --- a/src/Graphics/UI/FLTK/LowLevel/CopySurface.chs +++ b/src/Graphics/UI/FLTK/LowLevel/CopySurface.chs @@ -16,7 +16,6 @@ #include "Fl_Types.h" #include "Fl_Copy_SurfaceC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Counter.chs b/src/Graphics/UI/FLTK/LowLevel/Counter.chs --- a/src/Graphics/UI/FLTK/LowLevel/Counter.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Counter.chs @@ -20,7 +20,6 @@ #include "Fl_CounterC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Dial.chs b/src/Graphics/UI/FLTK/LowLevel/Dial.chs --- a/src/Graphics/UI/FLTK/LowLevel/Dial.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Dial.chs @@ -19,7 +19,6 @@ #include "Fl_DialC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/DoubleWindow.chs b/src/Graphics/UI/FLTK/LowLevel/DoubleWindow.chs --- a/src/Graphics/UI/FLTK/LowLevel/DoubleWindow.chs +++ b/src/Graphics/UI/FLTK/LowLevel/DoubleWindow.chs @@ -25,8 +25,6 @@ import Graphics.UI.FLTK.LowLevel.Hierarchy import Graphics.UI.FLTK.LowLevel.Widget import Graphics.UI.FLTK.LowLevel.Window -import C2HS hiding (cFromEnum, toBool,cToEnum) - {# fun Fl_OverriddenDouble_Window_New as overriddenWindowNew' {`Int',`Int', id `Ptr ()'} -> `Ptr ()' id #} {# fun Fl_OverriddenDouble_Window_NewXY as overriddenWindowNewXY' {`Int',`Int', `Int', `Int', id `Ptr ()'} -> `Ptr ()' id #} diff --git a/src/Graphics/UI/FLTK/LowLevel/Draw.chs b/src/Graphics/UI/FLTK/LowLevel/Draw.chs --- a/src/Graphics/UI/FLTK/LowLevel/Draw.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Draw.chs @@ -120,7 +120,6 @@ #include "Fl_C.h" #include "Fl_DrawC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/FL.chs b/src/Graphics/UI/FLTK/LowLevel/FL.chs --- a/src/Graphics/UI/FLTK/LowLevel/FL.chs +++ b/src/Graphics/UI/FLTK/LowLevel/FL.chs @@ -157,6 +157,7 @@ setEventDispatch, eventText, eventLength, +#if FL_API_VERSION == 10304 setBoxColor, boxColor, abiVersion, @@ -165,12 +166,13 @@ localMeta, localAlt, localShift +#endif ) where #include "Fl_C.h" import C2HS hiding (cFromEnum, cToBool,cToEnum) import Data.IORef -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils @@ -834,6 +836,7 @@ releaseWidgetPointer wp = withRef wp {#call Fl_release_widget_pointer as fl_release_widget_pointer #} clearWidgetPointer :: (Parent a Widget) => Ref a -> IO () clearWidgetPointer wp = withRef wp {#call Fl_clear_widget_pointer as fl_Clear_Widget_Pointer #} +#if FL_API_VERSION == 10304 setBoxColor :: Color -> IO () setBoxColor c = {#call Fl_set_box_color as fl_set_box_color #} (cFromColor c) boxColor :: Color -> IO Color @@ -850,3 +853,4 @@ localMeta = {#call Fl_local_meta as fl_local_meta #} >>= cStringToText localShift :: IO T.Text localShift = {#call Fl_local_shift as fl_local_shift #} >>= cStringToText +#endif diff --git a/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs b/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs --- a/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs +++ b/src/Graphics/UI/FLTK/LowLevel/FLTKHS.hs @@ -320,90 +320,21 @@ -- library is considered usable. And most of these issues are being aggressively -- addressed but in the interests of full disclosure ... -- --- == Look & Feel (All users) --- The look and feel of FLTK apps can be charitably described as /retro/. And since --- FLTK has no support for theming it is also baked in. FLTK was designed for the +-- == Look & Feel +-- The default look FLTK apps can be charitably described as /retro/. And +-- FLTK has no support for theming since it was designed for the -- embedded domain and trades off slickness for speed, portability and --- binary size. This is unlikely to change. --- --- == Compile Times (All users) --- Currently a dense app (~ 160-180 widgets crammed into the same window) takes --- 9-12 seconds to compile on a 32GB quad-core machine. Surprisingly it only goes up --- to 10-15 seconds on a 8GB machine indicating that GHC pegs one processor and RAM --- does not matter. Educated guess, most of the time is being spent traversing type-level lists --- and chasing down orphan instances. The hope is that this will all go away once GHC 8 has settled --- in and all the type-level gymnastics can been replaced with OverloadedRecordFields. --- --- == GHCi (Linux, *BSD & OSX Yosemite) --- The GHC 7.10.x series has an unfortunate --- that causes GHCi to --- crash when loading the shared library that contains the C bindings to the C++ --- API. The REPL loads fine in GHC 7.8.x. This means that each FLTKHS app needs a --- special GHC environment just for running the REPL. This is achieved by bundling --- another Stack file (arbitrarily called 'stack-repl.yaml') with sample apps --- and skeletons specially for loading an app into GHCi but also means that users --- have to do the following to load a GUI app into the REPL: --- --- @ --- > STACK_YAML=stack-repl.yaml stack ghci ... --- @ --- --- Furthermore once an app is launched via the REPL closing the main app window --- brings the REPL back to a prompt as it should but does not go away. The window --- stays around ghosted for the life of the session. The user has to `:quit` GHCi in --- order to get rid of it. So while the REPL is still useful for querying functions etc. --- and trying things out it leaves a lot of trash behind. Hopefully the fix is simply a --- case of the author knowing how GHCi and the FFI interact. --- --- == GHCi + Stack (OSX El Capitan) --- Running FLTKHS in GHCi via Stack on El Capitan is broken. The reason is that --- the @Setup.hs@ that comes with FLTKHS requires Cabal-1.2.x. So before running the repl we need to do: --- --- @ --- > STACK_YAML=stack-repl.yaml stack setup --upgrade-cabal --- @ --- --- This breaks on El Capitan with an error: --- --- @ --- > Setup: \/usr\/bin\/ar: permission denied --- @ --- --- This is a known and unfortunately the --- is --- pretty horrific. Barring that there is no hope for FLTKHS and GHCi on El Capitan. --- --- To see why it's necessary to use `stack-repl.yaml` please see the previous section --- "GHCi (Linux, *BSD & OSD Yosemite)". --- --- == GHC 7.10.3 And Beyond (Windows only) --- _UPDATE_: This issue has been resolved by updates to 'language-c' and 'c2hs'. This --- section will be removed in a subsequent release. --- --- FLTKHS does not work with GHC 7.10.3 on Windows. Period. GHC 7.10.2 and 7.8.4 on --- Windows work fine. The problem is the MinGW environment that comes bundled with --- GHC 7.10.3 has brought to a light and unfortunate --- in the `language-c` package --- that C2HS depends on. Until this is fixed FLTKHS will not build. --- --- The workaround is bundling yet another special Stack file (arbitrarily called --- "stack-windows.yaml") that allows Windows users to run FLTKHS with GHC 7.10.2. --- Most importantly this pins all Windows users to 7.10.2 until the issue is --- resolved and as an added inconvenience all Stack commands in Windows have to be --- prefixed with the cheesy: +-- binary size. -- --- @ --- > STACK_YAML= stack-windows.yaml stack ... --- @ +-- But that doesn't mean the user is limited to the default! FLTK is quite flexible +-- and it is pretty easy to change the way a widget looks and behaves but there is no +-- "theme file" that applies uniformly to all widgets in the app. -- --- == GHCi (Windows only) --- GHCi does not work with FLTKHS on Windows at all. At least on Windows 7, attempting --- load an app into the REPL generates a weird error message about not being able to --- find `uuid.dll`. +-- == Compile Times +-- Currently a dense app (~ 160-180 widgets crammed into the same window) takes +-- 9-12 seconds to compile with GHC 7.10.3 on a 32GB quad-core machine. +-- The good news is that this is a . -- --- Hopefully this is just an issue of the author not understand GHCi on Windows and --- will be resolved quickly. - -- $StackTrace -- -- In a traditional callback-heavy API such as FLTKHS null pointers happen which @@ -1018,24 +949,7 @@ -- @ -- > stack build --flag fltkhs-hello-world:fastCompile -- @ - --- $CabalREPLIssues -- --- The recommended way to load FLTKHS app into GHCi is the use the --- `stack-repl.yaml` that comes bundled with the --- . The --- reasons are outlined in the "GHCi (All Users)" subsection of "Obstacles" above. --- --- The REPL in the skeleton, for example, be run with: --- --- @ --- > STACK_YAML=stack-repl.yaml stack setup --upgrade-cabal --- > STACK_YAML=stack-repl.yaml stack ghci fltkhs-hello-world:exe:fltkhs-hello-world --- @ --- --- The '--upgrade-cabal' flag above tells GHC to use the version in --- 'stack-repl.yaml' (7.8.4) but upgrade the Cabal to 1.2.2. - -- =File Layout -- @ -- Root diff --git a/src/Graphics/UI/FLTK/LowLevel/FileBrowser.chs b/src/Graphics/UI/FLTK/LowLevel/FileBrowser.chs --- a/src/Graphics/UI/FLTK/LowLevel/FileBrowser.chs +++ b/src/Graphics/UI/FLTK/LowLevel/FileBrowser.chs @@ -26,7 +26,7 @@ #include "Fl_WidgetC.h" #include "FL/filename.H" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/FileInput.chs b/src/Graphics/UI/FLTK/LowLevel/FileInput.chs --- a/src/Graphics/UI/FLTK/LowLevel/FileInput.chs +++ b/src/Graphics/UI/FLTK/LowLevel/FileInput.chs @@ -16,7 +16,6 @@ #include "Fl_Types.h" #include "Fl_File_InputC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/FillDial.chs b/src/Graphics/UI/FLTK/LowLevel/FillDial.chs --- a/src/Graphics/UI/FLTK/LowLevel/FillDial.chs +++ b/src/Graphics/UI/FLTK/LowLevel/FillDial.chs @@ -11,7 +11,6 @@ #include "Fl_Types.h" #include "Fl_DialC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/FillSlider.chs b/src/Graphics/UI/FLTK/LowLevel/FillSlider.chs --- a/src/Graphics/UI/FLTK/LowLevel/FillSlider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/FillSlider.chs @@ -13,7 +13,6 @@ #include "Fl_Types.h" #include "Fl_SliderC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Gl.chs b/src/Graphics/UI/FLTK/LowLevel/Gl.chs --- a/src/Graphics/UI/FLTK/LowLevel/Gl.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Gl.chs @@ -24,7 +24,6 @@ #include "Fl_C.h" #include "glC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/GlWindow.chs b/src/Graphics/UI/FLTK/LowLevel/GlWindow.chs --- a/src/Graphics/UI/FLTK/LowLevel/GlWindow.chs +++ b/src/Graphics/UI/FLTK/LowLevel/GlWindow.chs @@ -18,7 +18,6 @@ #include "Fl_Double_WindowC.h" #include "Fl_Gl_WindowC.h" import Foreign -import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Group.chs b/src/Graphics/UI/FLTK/LowLevel/Group.chs --- a/src/Graphics/UI/FLTK/LowLevel/Group.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Group.chs @@ -20,7 +20,6 @@ #include "Fl_WidgetC.h" #include "Fl_GroupC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Dispatch import qualified Data.Text as T import Graphics.UI.FLTK.LowLevel.Fl_Types diff --git a/src/Graphics/UI/FLTK/LowLevel/Hierarchy.hs b/src/Graphics/UI/FLTK/LowLevel/Hierarchy.hs --- a/src/Graphics/UI/FLTK/LowLevel/Hierarchy.hs +++ b/src/Graphics/UI/FLTK/LowLevel/Hierarchy.hs @@ -534,8 +534,10 @@ setTextcolor, DownBox, downBox, +#if FL_API_VERSION == 10304 SetOnly, setOnly, +#endif -- * MenuBar MenuBar, -- * SysMenuBar @@ -562,8 +564,10 @@ drawResize, Uncache, uncache, +#if FL_API_VERSION == 10304 Fail, fail, +#endif -- * Bitmap Bitmap, -- * Pixmap @@ -2278,8 +2282,13 @@ (SetDownBox (GetDownColor (SetDownColor +#if FL_API_VERSION == 10304 (SetOnly - ())))))))))))))))))))))))))))))))))))))))))))))) +#endif + ()))))))))))))))))))))))))))))))))))))))))))))) +#if FL_API_VERSION == 10304 + ) +#endif type instance Functions MenuPrim = MenuPrimFuncs @@ -2308,7 +2317,9 @@ MAKE_METHOD(GetTextcolor,getTextcolor) MAKE_METHOD(SetTextcolor,setTextcolor) MAKE_METHOD(DownBox,downBox) +#if FL_API_VERSION == 10304 MAKE_METHOD(SetOnly,setOnly) +#endif data CMenuBar parent type MenuBar = CMenuBar MenuPrim @@ -2379,8 +2390,13 @@ (DrawResize (Draw (Uncache +#if FL_API_VERSION == 10304 (Fail - ())))))))))))))) +#endif + ()))))))))))))) +#if FL_API_VERSION == 10304 + ) +#endif type instance Functions Image = ImageFuncs @@ -2392,7 +2408,9 @@ MAKE_METHOD(Desaturate,desaturate) MAKE_METHOD(DrawResize,drawResize) MAKE_METHOD(Uncache,uncache) +#if FL_API_VERSION == 10304 MAKE_METHOD(Fail,fail) +#endif data CBitmap parent type Bitmap = CBitmap Image @@ -3992,7 +4010,8 @@ (GetTextsize (GetFiletype (SetFiletype - ())))))))) + (Load + ()))))))))) type instance Functions FileBrowser = FileBrowserFuncs MAKE_METHOD(SetIconsize, setIconsize) diff --git a/src/Graphics/UI/FLTK/LowLevel/HorFillSlider.chs b/src/Graphics/UI/FLTK/LowLevel/HorFillSlider.chs --- a/src/Graphics/UI/FLTK/LowLevel/HorFillSlider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/HorFillSlider.chs @@ -13,7 +13,6 @@ #include "Fl_Types.h" #include "Fl_SliderC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/HorNiceSlider.chs b/src/Graphics/UI/FLTK/LowLevel/HorNiceSlider.chs --- a/src/Graphics/UI/FLTK/LowLevel/HorNiceSlider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/HorNiceSlider.chs @@ -13,7 +13,6 @@ #include "Fl_Types.h" #include "Fl_SliderC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/HorSlider.chs b/src/Graphics/UI/FLTK/LowLevel/HorSlider.chs --- a/src/Graphics/UI/FLTK/LowLevel/HorSlider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/HorSlider.chs @@ -13,7 +13,6 @@ #include "Fl_Types.h" #include "Fl_SliderC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/HorValueSlider.chs b/src/Graphics/UI/FLTK/LowLevel/HorValueSlider.chs --- a/src/Graphics/UI/FLTK/LowLevel/HorValueSlider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/HorValueSlider.chs @@ -13,7 +13,6 @@ #include "Fl_Types.h" #include "Fl_Value_SliderC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Image.chs b/src/Graphics/UI/FLTK/LowLevel/Image.chs --- a/src/Graphics/UI/FLTK/LowLevel/Image.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Image.chs @@ -2,7 +2,9 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} module Graphics.UI.FLTK.LowLevel.Image ( +#if FL_API_VERSION == 10304 ImageFail(..), +#endif ImageFuncs(..), defaultImageFuncs, imageNew, @@ -25,13 +27,13 @@ #include "Fl_Types.h" #include "Fl_ImageC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy import Graphics.UI.FLTK.LowLevel.Dispatch +#if FL_API_VERSION == 10304 #c enum ImageFail { ImageErrNoImage = ERR_NO_IMAGE, @@ -40,6 +42,7 @@ }; #endc {#enum ImageFail {} deriving (Show, Eq, Ord) #} +#endif type ColorAverageCallback = Ref Image -> Color -> Float -> IO () type ImageDrawCallback = Ref Image -> Position -> Size -> Maybe X -> Maybe Y -> IO () @@ -181,6 +184,7 @@ instance (impl ~ ( IO ())) => Op (Uncache ()) Image orig impl where runOp _ _ image = withRef image $ \imagePtr -> uncache' imagePtr +#if FL_API_VERSION == 10304 {#fun Fl_Image_fail as fail' { id `Ptr ()'} -> `CInt' #} instance (impl ~ (IO (Either ImageFail ()))) => Op (Fail ()) Image orig impl where runOp _ _ image = withRef image $ \imagePtr -> do @@ -188,6 +192,7 @@ if (res == 0) then return (Right ()) else return (Left (cToEnum res)) +#endif -- $functions -- @ @@ -203,8 +208,6 @@ -- -- drawResize :: 'Ref' 'Image' -> 'Position' -> 'Size' -> 'Maybe' 'X' -> 'Maybe' 'Y' -> 'IO' () -- --- fail :: 'Ref' 'Image' -> 'IO' ('Either' 'ImageFail' ()) --- -- getCount :: 'Ref' 'Image' -> 'IO' ('Int') -- -- getD :: 'Ref' 'Image' -> 'IO' ('Int') @@ -218,6 +221,9 @@ -- inactive :: 'Ref' 'Image' -> 'IO' () -- -- uncache :: 'Ref' 'Image' -> 'IO' () +-- +-- Available in FLTK 1.3.4 only: +-- fail :: 'Ref' 'Image' -> 'IO' ('Either' 'ImageFail' ()) -- @ -- $hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/ImageSurface.chs b/src/Graphics/UI/FLTK/LowLevel/ImageSurface.chs --- a/src/Graphics/UI/FLTK/LowLevel/ImageSurface.chs +++ b/src/Graphics/UI/FLTK/LowLevel/ImageSurface.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_Image_SurfaceC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Input.chs b/src/Graphics/UI/FLTK/LowLevel/Input.chs --- a/src/Graphics/UI/FLTK/LowLevel/Input.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Input.chs @@ -26,7 +26,6 @@ #include "Fl_Multiline_OutputC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/IntInput.chs b/src/Graphics/UI/FLTK/LowLevel/IntInput.chs --- a/src/Graphics/UI/FLTK/LowLevel/IntInput.chs +++ b/src/Graphics/UI/FLTK/LowLevel/IntInput.chs @@ -12,7 +12,6 @@ #include "Fl_Types.h" #include "Fl_Int_InputC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/LightButton.chs b/src/Graphics/UI/FLTK/LowLevel/LightButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/LightButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/LightButton.chs @@ -17,7 +17,6 @@ #include "Fl_Light_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/LineDial.chs b/src/Graphics/UI/FLTK/LowLevel/LineDial.chs --- a/src/Graphics/UI/FLTK/LowLevel/LineDial.chs +++ b/src/Graphics/UI/FLTK/LowLevel/LineDial.chs @@ -11,7 +11,6 @@ #include "Fl_Types.h" #include "Fl_DialC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/MenuBar.chs b/src/Graphics/UI/FLTK/LowLevel/MenuBar.chs --- a/src/Graphics/UI/FLTK/LowLevel/MenuBar.chs +++ b/src/Graphics/UI/FLTK/LowLevel/MenuBar.chs @@ -16,14 +16,13 @@ #include "Fl_Types.h" #include "Fl_Menu_BarC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Dispatch import qualified Data.Text as T import Graphics.UI.FLTK.LowLevel.Hierarchy -import Graphics.UI.FLTK.LowLevel.MenuItem {# fun Fl_Menu_Bar_New as widgetNew' { `Int',`Int',`Int',`Int' } -> `Ptr ()' id #} {# fun Fl_Menu_Bar_New_WithLabel as widgetNewWithLabel' { `Int',`Int',`Int',`Int',unsafeToCString `T.Text'} -> `Ptr ()' id #} diff --git a/src/Graphics/UI/FLTK/LowLevel/MenuButton.chs b/src/Graphics/UI/FLTK/LowLevel/MenuButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/MenuButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/MenuButton.chs @@ -19,7 +19,6 @@ #include "Fl_Menu_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/MenuPrim.chs b/src/Graphics/UI/FLTK/LowLevel/MenuPrim.chs --- a/src/Graphics/UI/FLTK/LowLevel/MenuPrim.chs +++ b/src/Graphics/UI/FLTK/LowLevel/MenuPrim.chs @@ -19,7 +19,7 @@ #include "Fl_Menu_C.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Widget import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types @@ -297,10 +297,12 @@ {# fun Fl_Menu__set_down_color as setDownColor' { id `Ptr ()',`Int' } -> `()' #} instance (impl ~ (Int -> IO ())) => Op (SetDownColor ()) MenuPrim orig impl where runOp _ _ menu_ c = withRef menu_ $ \menu_Ptr -> setDownColor' menu_Ptr c +#if FL_API_VERSION == 10304 {# fun Fl_Menu__set_only as setonly' { id `Ptr ()', id `Ptr ()' } -> `()' #} instance (Parent a MenuItem, impl ~ (Ref a -> IO ())) => Op (SetOnly ()) MenuPrim orig impl where runOp _ _ menu_ item = withRef menu_ $ \menu_Ptr -> withRef item $ \item_Ptr -> setonly' menu_Ptr item_Ptr +#endif -- $functions -- @ @@ -377,8 +379,6 @@ -- -- setMode :: 'Ref' 'MenuPrim' -> 'Int' -> 'MenuItemFlags' -> 'IO' () -- --- setOnly:: ('Parent' a 'MenuItem') => 'Ref' 'MenuPrim' -> 'Ref' a -> 'IO' () --- -- setShortcut :: 'Ref' 'MenuPrim' -> 'Int' -> 'ShortcutKeySequence' -> 'IO' () -- -- setSize :: 'Ref' 'MenuPrim' -> 'Int' -> 'Int' -> 'IO' () @@ -396,6 +396,9 @@ -- showWidgetSuper :: 'Ref' 'MenuPrim' -> 'IO' () -- -- testShortcut:: ('Parent' a 'MenuItem') => 'Ref' 'MenuPrim' -> 'IO' ('Maybe' ('Ref' a)) +-- +-- Available in FLTK 1.3.4 only: +-- setOnly:: ('Parent' a 'MenuItem') => 'Ref' 'MenuPrim' -> 'Ref' a -> 'IO' () -- -- @ diff --git a/src/Graphics/UI/FLTK/LowLevel/NativeFileChooser.chs b/src/Graphics/UI/FLTK/LowLevel/NativeFileChooser.chs --- a/src/Graphics/UI/FLTK/LowLevel/NativeFileChooser.chs +++ b/src/Graphics/UI/FLTK/LowLevel/NativeFileChooser.chs @@ -21,7 +21,7 @@ #include "Fl_Types.h" #include "Fl_Native_File_ChooserC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/NiceSlider.chs b/src/Graphics/UI/FLTK/LowLevel/NiceSlider.chs --- a/src/Graphics/UI/FLTK/LowLevel/NiceSlider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/NiceSlider.chs @@ -12,7 +12,6 @@ #include "Fl_Types.h" #include "Fl_SliderC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Output.chs b/src/Graphics/UI/FLTK/LowLevel/Output.chs --- a/src/Graphics/UI/FLTK/LowLevel/Output.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Output.chs @@ -21,7 +21,6 @@ #include "Fl_Multiline_OutputC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/OverlayWindow.chs b/src/Graphics/UI/FLTK/LowLevel/OverlayWindow.chs --- a/src/Graphics/UI/FLTK/LowLevel/OverlayWindow.chs +++ b/src/Graphics/UI/FLTK/LowLevel/OverlayWindow.chs @@ -20,7 +20,6 @@ import Graphics.UI.FLTK.LowLevel.Hierarchy import Graphics.UI.FLTK.LowLevel.Dispatch import qualified Data.Text as T -import C2HS hiding (cFromEnum, toBool,cToEnum) {# fun Fl_Overlay_Window_New_WithLabel as windowNewWithLabel' { `Int', `Int', unsafeToCString `T.Text', id `FunPtr CallbackPrim' } -> `Ptr ()' id #} {# fun Fl_Overlay_Window_New as windowNew' { `Int', `Int', id `FunPtr CallbackPrim' } -> `Ptr ()' id #} diff --git a/src/Graphics/UI/FLTK/LowLevel/Pack.chs b/src/Graphics/UI/FLTK/LowLevel/Pack.chs --- a/src/Graphics/UI/FLTK/LowLevel/Pack.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Pack.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_PackC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Pixmap.chs b/src/Graphics/UI/FLTK/LowLevel/Pixmap.chs --- a/src/Graphics/UI/FLTK/LowLevel/Pixmap.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Pixmap.chs @@ -16,7 +16,6 @@ #include "Fl_Types.h" #include "Fl_PixmapC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Positioner.chs b/src/Graphics/UI/FLTK/LowLevel/Positioner.chs --- a/src/Graphics/UI/FLTK/LowLevel/Positioner.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Positioner.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_PositionerC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Progress.chs b/src/Graphics/UI/FLTK/LowLevel/Progress.chs --- a/src/Graphics/UI/FLTK/LowLevel/Progress.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Progress.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_ProgressC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/RGBImage.chs b/src/Graphics/UI/FLTK/LowLevel/RGBImage.chs --- a/src/Graphics/UI/FLTK/LowLevel/RGBImage.chs +++ b/src/Graphics/UI/FLTK/LowLevel/RGBImage.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_RGB_ImageC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/RadioLightButton.chs b/src/Graphics/UI/FLTK/LowLevel/RadioLightButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/RadioLightButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/RadioLightButton.chs @@ -13,7 +13,7 @@ #include "Fl_Radio_Light_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/RepeatButton.chs b/src/Graphics/UI/FLTK/LowLevel/RepeatButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/RepeatButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/RepeatButton.chs @@ -17,7 +17,7 @@ #include "Fl_Repeat_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/ReturnButton.chs b/src/Graphics/UI/FLTK/LowLevel/ReturnButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/ReturnButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/ReturnButton.chs @@ -17,7 +17,7 @@ #include "Fl_Return_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Roller.chs b/src/Graphics/UI/FLTK/LowLevel/Roller.chs --- a/src/Graphics/UI/FLTK/LowLevel/Roller.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Roller.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_RollerC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/RoundButton.chs b/src/Graphics/UI/FLTK/LowLevel/RoundButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/RoundButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/RoundButton.chs @@ -17,7 +17,7 @@ #include "Fl_Round_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Scrollbar.chs b/src/Graphics/UI/FLTK/LowLevel/Scrollbar.chs --- a/src/Graphics/UI/FLTK/LowLevel/Scrollbar.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Scrollbar.chs @@ -18,7 +18,7 @@ #include "Fl_ScrollbarC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Scrolled.chs b/src/Graphics/UI/FLTK/LowLevel/Scrolled.chs --- a/src/Graphics/UI/FLTK/LowLevel/Scrolled.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Scrolled.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_ScrollC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/SelectBrowser.chs b/src/Graphics/UI/FLTK/LowLevel/SelectBrowser.chs --- a/src/Graphics/UI/FLTK/LowLevel/SelectBrowser.chs +++ b/src/Graphics/UI/FLTK/LowLevel/SelectBrowser.chs @@ -12,7 +12,7 @@ #include "Fl_Types.h" #include "Fl_Select_BrowserC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/SimpleCounter.chs b/src/Graphics/UI/FLTK/LowLevel/SimpleCounter.chs --- a/src/Graphics/UI/FLTK/LowLevel/SimpleCounter.chs +++ b/src/Graphics/UI/FLTK/LowLevel/SimpleCounter.chs @@ -11,7 +11,7 @@ #include "Fl_Types.h" #include "Fl_CounterC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/SingleWindow.chs b/src/Graphics/UI/FLTK/LowLevel/SingleWindow.chs --- a/src/Graphics/UI/FLTK/LowLevel/SingleWindow.chs +++ b/src/Graphics/UI/FLTK/LowLevel/SingleWindow.chs @@ -25,7 +25,6 @@ import Graphics.UI.FLTK.LowLevel.Hierarchy import Graphics.UI.FLTK.LowLevel.Widget import Graphics.UI.FLTK.LowLevel.Window -import C2HS hiding (cFromEnum, toBool,cToEnum) {# fun Fl_OverriddenSingle_Window_New as overriddenWindowNew' {`Int',`Int', id `Ptr ()'} -> `Ptr ()' id #} {# fun Fl_OverriddenSingle_Window_NewXY as overriddenWindowNewXY' {`Int',`Int', `Int', `Int', id `Ptr ()'} -> `Ptr ()' id #} diff --git a/src/Graphics/UI/FLTK/LowLevel/Slider.chs b/src/Graphics/UI/FLTK/LowLevel/Slider.chs --- a/src/Graphics/UI/FLTK/LowLevel/Slider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Slider.chs @@ -17,7 +17,7 @@ #include "Fl_SliderC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Spinner.chs b/src/Graphics/UI/FLTK/LowLevel/Spinner.chs --- a/src/Graphics/UI/FLTK/LowLevel/Spinner.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Spinner.chs @@ -20,7 +20,7 @@ #include "Fl_SpinnerC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/SysMenuBar.chs b/src/Graphics/UI/FLTK/LowLevel/SysMenuBar.chs --- a/src/Graphics/UI/FLTK/LowLevel/SysMenuBar.chs +++ b/src/Graphics/UI/FLTK/LowLevel/SysMenuBar.chs @@ -17,7 +17,7 @@ #include "Fl_Sys_Menu_BarC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Table.chs b/src/Graphics/UI/FLTK/LowLevel/Table.chs --- a/src/Graphics/UI/FLTK/LowLevel/Table.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Table.chs @@ -27,7 +27,7 @@ #include "Fl_Types.h" #include "Fl_TableC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Widget import Graphics.UI.FLTK.LowLevel.Fl_Types diff --git a/src/Graphics/UI/FLTK/LowLevel/TableRow.chs b/src/Graphics/UI/FLTK/LowLevel/TableRow.chs --- a/src/Graphics/UI/FLTK/LowLevel/TableRow.chs +++ b/src/Graphics/UI/FLTK/LowLevel/TableRow.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_Table_RowC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Widget diff --git a/src/Graphics/UI/FLTK/LowLevel/Tabs.chs b/src/Graphics/UI/FLTK/LowLevel/Tabs.chs --- a/src/Graphics/UI/FLTK/LowLevel/Tabs.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Tabs.chs @@ -18,7 +18,7 @@ #include "Fl_Types.h" #include "Fl_TabsC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/TextBuffer.chs b/src/Graphics/UI/FLTK/LowLevel/TextBuffer.chs --- a/src/Graphics/UI/FLTK/LowLevel/TextBuffer.chs +++ b/src/Graphics/UI/FLTK/LowLevel/TextBuffer.chs @@ -16,7 +16,7 @@ #include "Fl_Types.h" #include "Fl_Text_BufferC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/TextDisplay.chs b/src/Graphics/UI/FLTK/LowLevel/TextDisplay.chs --- a/src/Graphics/UI/FLTK/LowLevel/TextDisplay.chs +++ b/src/Graphics/UI/FLTK/LowLevel/TextDisplay.chs @@ -18,7 +18,7 @@ #include "Fl_Types.h" #include "Fl_Text_DisplayC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import qualified Foreign.Concurrent as FC import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations diff --git a/src/Graphics/UI/FLTK/LowLevel/TextEditor.chs b/src/Graphics/UI/FLTK/LowLevel/TextEditor.chs --- a/src/Graphics/UI/FLTK/LowLevel/TextEditor.chs +++ b/src/Graphics/UI/FLTK/LowLevel/TextEditor.chs @@ -23,7 +23,7 @@ #include "Fl_Types.h" #include "Fl_Text_EditorC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/TextSelection.chs b/src/Graphics/UI/FLTK/LowLevel/TextSelection.chs --- a/src/Graphics/UI/FLTK/LowLevel/TextSelection.chs +++ b/src/Graphics/UI/FLTK/LowLevel/TextSelection.chs @@ -15,7 +15,7 @@ #include "Fl_Types.h" #include "Fl_Text_SelectionC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/Tile.chs b/src/Graphics/UI/FLTK/LowLevel/Tile.chs --- a/src/Graphics/UI/FLTK/LowLevel/Tile.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Tile.chs @@ -18,7 +18,7 @@ #include "Fl_Types.h" #include "Fl_TileC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Timer.chs b/src/Graphics/UI/FLTK/LowLevel/Timer.chs --- a/src/Graphics/UI/FLTK/LowLevel/Timer.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Timer.chs @@ -19,7 +19,7 @@ #include "Fl_Types.h" #include "Fl_TimerC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/ToggleButton.chs b/src/Graphics/UI/FLTK/LowLevel/ToggleButton.chs --- a/src/Graphics/UI/FLTK/LowLevel/ToggleButton.chs +++ b/src/Graphics/UI/FLTK/LowLevel/ToggleButton.chs @@ -17,7 +17,7 @@ #include "Fl_Toggle_ButtonC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy diff --git a/src/Graphics/UI/FLTK/LowLevel/TreePrefs.chs b/src/Graphics/UI/FLTK/LowLevel/TreePrefs.chs --- a/src/Graphics/UI/FLTK/LowLevel/TreePrefs.chs +++ b/src/Graphics/UI/FLTK/LowLevel/TreePrefs.chs @@ -16,7 +16,7 @@ #include "Fl_Types.h" #include "Fl_Tree_PrefsC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Valuator.chs b/src/Graphics/UI/FLTK/LowLevel/Valuator.chs --- a/src/Graphics/UI/FLTK/LowLevel/Valuator.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Valuator.chs @@ -20,7 +20,7 @@ #include "Fl_ValuatorC.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/ValueInput.chs b/src/Graphics/UI/FLTK/LowLevel/ValueInput.chs --- a/src/Graphics/UI/FLTK/LowLevel/ValueInput.chs +++ b/src/Graphics/UI/FLTK/LowLevel/ValueInput.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_Value_InputC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/ValueOutput.chs b/src/Graphics/UI/FLTK/LowLevel/ValueOutput.chs --- a/src/Graphics/UI/FLTK/LowLevel/ValueOutput.chs +++ b/src/Graphics/UI/FLTK/LowLevel/ValueOutput.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_Value_OutputC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/ValueSlider.chs b/src/Graphics/UI/FLTK/LowLevel/ValueSlider.chs --- a/src/Graphics/UI/FLTK/LowLevel/ValueSlider.chs +++ b/src/Graphics/UI/FLTK/LowLevel/ValueSlider.chs @@ -17,7 +17,7 @@ #include "Fl_Types.h" #include "Fl_Value_SliderC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Widget.chs b/src/Graphics/UI/FLTK/LowLevel/Widget.chs --- a/src/Graphics/UI/FLTK/LowLevel/Widget.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Widget.chs @@ -23,7 +23,7 @@ #include "Fl_Types.h" #include "Fl_WidgetC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Enumerations import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils diff --git a/src/Graphics/UI/FLTK/LowLevel/Wizard.chs b/src/Graphics/UI/FLTK/LowLevel/Wizard.chs --- a/src/Graphics/UI/FLTK/LowLevel/Wizard.chs +++ b/src/Graphics/UI/FLTK/LowLevel/Wizard.chs @@ -16,7 +16,7 @@ #include "Fl_Types.h" #include "Fl_WizardC.h" import C2HS hiding (cFromEnum, cFromBool, cToBool,cToEnum) -import Foreign.C.Types + import Graphics.UI.FLTK.LowLevel.Fl_Types import Graphics.UI.FLTK.LowLevel.Utils import Graphics.UI.FLTK.LowLevel.Hierarchy