[wxhaskell-from-cvs @ 2004-05-27 14:35:39 by dleijen]

Only add resize gripper to statusbar when the frame is resizeable.

darcs-hash:20040527143543-deb31-0c317945b04f914ec821b9b20f983fe14da87442.gz

changes.txt

@@ -15,6 +15,7 @@ Not backward compatible changes:
 - 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.
 
 Backward compatible additions:
 - Added "changes.txt" file :-)

wx/src/Graphics/UI/WX/Frame.hs

@@ -64,9 +64,9 @@ frameEx :: Style -> [Prop (Frame ())]  -> Window a -> IO (Frame ())
 frameEx style props parent
   = do f <- frameCreate parent idAny "" rectNull 
               ( minimizeableFlags props 
-              $ maximizeableFlags props 
               $ clipChildrenFlags props 
               $ resizeableFlags props   
+              $ maximizeableFlags props 
               $ closeableFlags props
               $ fullRepaintOnResizeFlags props style)
        wxcAppSetTopWindow f
@@ -194,7 +194,8 @@ tile = mdiParentFrameTile
 {--------------------------------------------------------------------------
   Framed instances
 --------------------------------------------------------------------------}
--- | Display a resize border on a 'Frame' or 'Dialog' window.
+-- | Display a resize border on a 'Frame' or 'Dialog' window.  Also enables or
+-- disables the the maximize box.
 -- This attribute must be set at creation time.
 windowResizeable :: Attr (Window a) Bool
 windowResizeable
@@ -205,16 +206,16 @@ windowResizeable
            return (bitsSet wxRESIZE_BORDER s)
     setFlag w resize
       = set w [style :~ \stl -> if resize 
-                                 then stl .+. wxRESIZE_BORDER
-                                 else stl .-. wxRESIZE_BORDER]
+                                 then stl .+. wxRESIZE_BORDER .+. wxMAXIMIZE_BOX
+                                 else stl .-. wxRESIZE_BORDER .-. wxMAXIMIZE_BOX]
 
 -- | Helper function that transforms the style accordding
 -- to the 'resizeable' flag out of the properties
 resizeableFlags :: [Prop (Window a)] -> Int -> Int
 resizeableFlags props stl
   = case getPropValue windowResizeable props of
-      Just True  -> stl .+. wxRESIZE_BORDER
-      Just False -> stl .-. wxRESIZE_BORDER
+      Just True  -> stl .+. wxRESIZE_BORDER .+. wxMAXIMIZE_BOX
+      Just False -> stl .-. wxRESIZE_BORDER .-. wxMAXIMIZE_BOX
       Nothing    -> stl
 
 

wx/src/Graphics/UI/WX/Menu.hs

@@ -376,13 +376,16 @@ toolBar parent props
 -- above the toolbar.
 toolBarEx :: Frame a -> Bool -> Bool -> [Prop (ToolBar ())] -> IO (ToolBar ())
 toolBarEx parent showText showDivider props
-  = do t <- toolBarCreate parent idAny rectNull 
-              ( wxTB_DOCKABLE .+. wxTB_FLAT
-                .+. (if showText then wxTB_TEXT else 0)
-                .+. (if showDivider then 0 else 0x200 {- wxTB_NODIVIDER -})
-              )
-       set t props
+  = do let style = ( wxTB_DOCKABLE .+. wxTB_FLAT
+                   .+. (if showText then wxTB_TEXT else 0)
+                   .+. (if showDivider then 0 else 0x200) -- wxTB_NODIVIDER                   
+                   )
+       t <- toolBarCreate parent idAny rectNull style
        frameSetToolBar parent t
+       {-
+       t <- frameCreateToolBar parent style 
+       -}
+       set t props
        return t
 
 -- | A tool in a toolbar.

wxcore/src/Graphics/UI/WXCore/Frame.hs

@@ -108,7 +108,9 @@ windowGetScreenPosition w
 ------------------------------------------------------------------------------------------
 statusBarCreateFields :: Frame a -> [Int] -> IO (StatusBar ())
 statusBarCreateFields parent widths
-  = do sb <- frameCreateStatusBar parent (length widths) wxST_SIZEGRIP
+  = do pst <- windowGetWindowStyleFlag parent
+       let st = if (bitsSet wxRESIZE_BORDER pst) then wxST_SIZEGRIP else 0
+       sb <- frameCreateStatusBar parent (length widths) st
        let len = length widths
        if (len <= 1)
         then return sb