fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-05-01 12:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/tmenusys.prg
  * src/rtl/tmenuitm.prg
    ! accept extended popupmenu
This commit is contained in:
Viktor Szakats
2011-05-01 10:07:36 +00:00
parent 55fa4140e4
commit f4c3ddbf34
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-05-01 12:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/tmenusys.prg
* src/rtl/tmenuitm.prg
! accept extended popupmenu
2011-05-01 09:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbpgsql/tests/simple.prg
! typo

4
harbour/src/rtl/tmenuitm.prg
View File

@@ -124,7 +124,7 @@ METHOD data( boData ) CLASS MENUITEM
IF ISBLOCK( boData )
::boData := boData
ELSE
::boData := __eInstVar53( Self, "DATA", boData, "O", 1001, {|| boData:ClassName() == "POPUPMENU" } )
::boData := __eInstVar53( Self, "DATA", boData, "O", 1001, {|| boData:ClassName() $ "POPUPMENU|HB_POPUPMENU" } )
ENDIF
ENDIF
@@ -171,7 +171,7 @@ METHOD style( cStyle ) CLASS MENUITEM
RETURN ::cStyle
METHOD isPopUp() CLASS MENUITEM
RETURN ISOBJECT( ::data ) .AND. ::data:ClassName() == "POPUPMENU"
RETURN ISOBJECT( ::data ) .AND. ::data:ClassName() $ "POPUPMENU|HB_POPUPMENU"
METHOD New( cCaption, boData, nShortcut, cMessage, nID ) CLASS MENUITEM

12
harbour/src/rtl/tmenusys.prg
View File

@@ -321,7 +321,7 @@ METHOD Modal( nSelection, nMsgRow, nMsgLeft, nMsgRight, cMsgColor, GetList ) CLA
::ShowMsg( .T. )
ELSE
IF ::oMenu:ClassName() == "POPUPMENU"
IF ::oMenu:ClassName() $ "POPUPMENU|HB_POPUPMENU"
::oMenu:close()
ENDIF
@@ -337,14 +337,14 @@ METHOD Modal( nSelection, nMsgRow, nMsgLeft, nMsgRight, cMsgColor, GetList ) CLA
IF GetList != NIL .AND. HitTest( GetList, MRow(), MCol(), ::GetMsgArray() ) != 0
GetActive():ExitState := GE_MOUSEHIT
ReadStats( SNLASTEXIT, GE_MOUSEHIT ) // Reset Get System values
IF ::oMenu:ClassName() == "POPUPMENU"
IF ::oMenu:ClassName() $ "POPUPMENU|HB_POPUPMENU"
::PopMenu()
ENDIF
nReturn := -1
EXIT
ENDIF
IF ::oMenu:ClassName() == "POPUPMENU"
IF ::oMenu:ClassName() $ "POPUPMENU|HB_POPUPMENU"
::PopMenu()
ENDIF
@@ -417,7 +417,7 @@ METHOD Modal( nSelection, nMsgRow, nMsgLeft, nMsgRight, cMsgColor, GetList ) CLA
GetActive():ExitState := GE_SHORTCUT
ReadStats( SNNEXTGET, nNewItem ) // Reset Get System values
IF ::oMenu:ClassName() == "POPUPMENU"
IF ::oMenu:ClassName() $ "POPUPMENU|HB_POPUPMENU"
::PopMenu()
ENDIF
@@ -547,7 +547,7 @@ METHOD Execute() CLASS HBMenuSys
// Execute the Data block if selected MenuItem is !IsPopUp:
IF ISOBJECT( oNewMenu ) .AND. !oNewMenu:IsPopUp
IF ::oMenu:ClassName() $ "TOPBARMENU|POPUPMENU"
IF ::oMenu:ClassName() $ "TOPBARMENU|POPUPMENU|HB_POPUPMENU"
SetPos( ::nOldRow, ::nOldCol )
SetCursor( ::nOldCursor )
Eval( oNewMenu:data, oNewMenu )
@@ -559,7 +559,7 @@ METHOD Execute() CLASS HBMenuSys
::oMenu:select( iif( ::PopMenu(), ::oMenu:current, 0 ) )
// Display newly selected current menu item:
IF ::oMenu:ClassName() == "POPUPMENU" .AND. ;
IF ::oMenu:ClassName() $ "POPUPMENU|HB_POPUPMENU" .AND. ;
::nMenuLevel == 1 .AND. ;
!::oMenu:isOpen