Two bugs in buttonbar [Solved]

[Enrico Maria Giordano]

1. Move the mouse pointer over the button: the bitmap slightly shifts down.

2. Comment out the 2007 clause and you will get an error.

The sample:

Code: Select all  Expand view

#include "Fivewin.ch"


FUNCTION MAIN()

    LOCAL oDlg

    DEFINE DIALOG oDlg

    ACTIVATE DIALOG oDlg;
             ON INIT TOOLBAR( oDlg );
             CENTER

    RETURN NIL


STATIC FUNCTION TOOLBAR( oDlg )

    LOCAL oBtn

    DEFINE BUTTONBAR SIZE 40, 45 OF oDlg 2007

    DEFINE BUTTON oBtn;
           OF oDlg:oBar;
           FILE "C:\FWH\BITMAPS\CLOSE.BMP";
           PROMPT "Test";
           ACTION oDlg:End()

    RETURN NIL

EMG

[Enrico Maria Giordano]

A possible solution to the first bug is to move up the following code:

Code: Select all  Expand view

  if ::l2007
      if ! Empty( ::cCaption )
         if ::oFont == nil
            ::SetFont( ::oWnd:oFont )
            if ::oFont == nil .and. ! Empty( ::oWnd )
               ::SetFont( ::oWnd:oWnd:oFont )
            endif
         endif
      endif
   endif

as ::nGetChrHeight() needs that the font is already assigned.

EMG

[Enrico Maria Giordano]

A possible fix for the second bug:

Code: Select all  Expand view

hOldFont = SelectObject( ::hDC, If( ::lBarBtn, ::oWnd:oWnd:oFont:hFont, ::oFont:hFont ) )

EMG

[carlos vargas]

Enrico,

podrias ayudarme a ubicar donde realizar los cambios indicados,

[Enrico Maria Giordano]

Yes. Locate this:

Code: Select all  Expand view

  if ::l2007
      if ! Empty( ::cCaption )
         if ::oFont == nil
            ::SetFont( ::oWnd:oFont )
            if ::oFont == nil .and. ! Empty( ::oWnd )
               ::SetFont( ::oWnd:oWnd:oFont )
            endif
         endif
      endif
      if ::lPressed
         nBmpTop++
         nBmpLeft++
         nAdjust := 1
      endif

and replace with:

Code: Select all  Expand view

  if ::l2007
      if ::lPressed
         nBmpTop++
         nBmpLeft++
         nAdjust := 1
      endif

Then locate this:

Code: Select all  Expand view

  if ::lBarBtn
      ::lRound = .F.
   endif

and replace with:

Code: Select all  Expand view

  if ::lBarBtn
      ::lRound = .F.
   endif

   if ::l2007
      if ! Empty( ::cCaption )
         if ::oFont == nil
            ::SetFont( ::oWnd:oFont )
            if ::oFont == nil .and. ! Empty( ::oWnd )
               ::SetFont( ::oWnd:oWnd:oFont )
            endif
         endif
      endif
   endif

Finally, locate this:

Code: Select all  Expand view

hOldFont = SelectObject( ::hDC, If( ::lBarBtn, ::oWnd:oFont:hFont, ::oFont:hFont ) )

and replace with:

Code: Select all  Expand view

hOldFont = SelectObject( ::hDC, If( ::lBarBtn, ::oWnd:oWnd:oFont:hFont, ::oFont:hFont ) )

But I'd wait for Antonio's ok.

EMG

[carlos vargas]

thanks you.

[Antonio Linares]

Dear Enrico,

If it is working fine then please upload it to the repository, thanks

[Enrico Maria Giordano]

Done.

EMG