From 5b43e2debd73eb9ee0114fb3dec8277e6a4b4b3c Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Tue, 3 Apr 2012 18:30:46 +0000 Subject: [PATCH] 2012-04-03 11:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/tests/demoxbp.prg ! Fixed: visibility of sub-menu's was off and thus main menu was not being displayed, reported by Zoran. --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbxbp/tests/demoxbp.prg | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8c9a2b8213..1354858481 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-03 11:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/tests/demoxbp.prg + ! Fixed: visibility of sub-menu's was off and thus main menu was + not being displayed, reported by Zoran. + 2012-04-03 19:02 UTC+0200 Viktor Szakats (harbour syenar.net) * package/harb_win.mft ! managed to mess up an UTF8 char in prev commit diff --git a/harbour/contrib/hbxbp/tests/demoxbp.prg b/harbour/contrib/hbxbp/tests/demoxbp.prg index 207c61b3b3..de8ade6d20 100644 --- a/harbour/contrib/hbxbp/tests/demoxbp.prg +++ b/harbour/contrib/hbxbp/tests/demoxbp.prg @@ -327,14 +327,13 @@ STATIC FUNCTION GuiStdDialog( cTitle ) STATIC FUNCTION Build_MenuBar( oDlg ) LOCAL oMenuBar, oSubMenu - //oMenuBar := XbpMenuBar():new( oDlg ):create() oMenuBar := SetAppWindow():MenuBar() /* Define submenu in procedural style. * The numeric index of the selected menu item * is passed to the Callback code block -> mp1 */ - oSubMenu := XbpMenu():new( oMenuBar ):create() + oSubMenu := XbpMenu():new( oMenuBar ):create( , , .t. ) // oSubMenu:title := "~Procedural" oSubMenu:addItem( { "Play Charge ~1", } ) @@ -348,7 +347,7 @@ STATIC FUNCTION Build_MenuBar( oDlg ) /* Define submenu in the functional style: * A menu item executes a code block that calls a function */ - oSubMenu := XbpMenu():new( oMenuBar ):create() + oSubMenu := XbpMenu():new( oMenuBar ):create( , , .t. ) oSubMenu:title := "~Functional" oSubMenu:addItem( { "Play Opening ~1"+chr(K_TAB)+"Ctrl+U", {|| MyFunctionXbp( 1 ) } } ) oSubMenu:addItem( { "Play Closing ~2" , {|| MyFunctionXbp( 2 ) } } ) @@ -377,7 +376,7 @@ STATIC FUNCTION Build_MenuBar( oDlg ) #endif oMenuBar:addItem( { oSubMenu, NIL } ) - oSubMenu := XbpMenu():new( oMenuBar ):create() + oSubMenu := XbpMenu():new( oMenuBar ):create( , , .t. ) oSubMenu:title := "~Miscellaneous" oSubMenu:addItem( { "Convert Images - XbpBitmap()", {|| Build_Bitmap( oDlg ) } } ) oSubMenu:addItem( { "ConfirmBox()" , {|| Build_ConfirmBox( oDlg ) } } )