diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-10-08 17:33:55 +0200 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-10-08 17:33:55 +0200 |
| commit | 95433a2374cae162aa2856b7c52a76d44ebd4509 (patch) | |
| tree | a8a7a4076a8f3a845f846e3622c5e5e7b4b33094 /vcl/win | |
| parent | 6b2736fed5bb3c5e7949be2baa4a50c9a9c9b3e2 (diff) | |
vcl116: #i114993# fix assertion, native menu cleanup
Diffstat (limited to 'vcl/win')
| -rwxr-xr-x[-rw-r--r--] | vcl/win/inc/salinst.h | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | vcl/win/source/window/salmenu.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/inc/salinst.h b/vcl/win/inc/salinst.h index 95aad02b3678..1ab59f8f7f9f 100644..100755 --- a/vcl/win/inc/salinst.h +++ b/vcl/win/inc/salinst.h @@ -81,7 +81,7 @@ public: virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); virtual bool AnyInput( USHORT nType ); - virtual SalMenu* CreateMenu( BOOL bMenuBar ); + virtual SalMenu* CreateMenu( BOOL bMenuBar, Menu* ); virtual void DestroyMenu( SalMenu* ); virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); virtual void DestroyMenuItem( SalMenuItem* ); diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 1eb75969ea38..47da911b012e 100644..100755 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -59,7 +59,7 @@ BOOL SalData::IsKnownMenuHandle( HMENU hMenu ) // WinSalInst factory methods -SalMenu* WinSalInstance::CreateMenu( BOOL bMenuBar ) +SalMenu* WinSalInstance::CreateMenu( BOOL bMenuBar, Menu* ) { WinSalMenu *pSalMenu = new WinSalMenu(); |