Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
09aa0d14
Kaydet (Commit)
09aa0d14
authored
Tem 29, 2015
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
This OWNERDRAW thing has been commented-out since 2003
Change-Id: I3170dec0578e0e54a2edb85e0a3a8fcd796b94ae
üst
a33e0379
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
18 deletions
+1
-18
salmenu.cxx
vcl/win/source/window/salmenu.cxx
+1
-18
No files found.
vcl/win/source/window/salmenu.cxx
Dosyayı görüntüle @
09aa0d14
...
...
@@ -31,11 +31,6 @@
#include <impbmp.hxx>
#include <salgdi.hxx>
// uncomment the following line to have ownerdrawn menus, ie, with bitmaps
// however, this is incompatible with OLE inplace editing
// so it is not activated by default
//#define OWNERDRAW
static
DWORD
myerr
=
0
;
bool
SalData
::
IsKnownMenuHandle
(
HMENU
hMenu
)
...
...
@@ -98,11 +93,6 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData )
pSalMenuItem
->
mInfo
.
fMask
=
MIIM_TYPE
|
MIIM_STATE
|
MIIM_ID
|
MIIM_DATA
;
pSalMenuItem
->
mInfo
.
fType
=
MFT_STRING
;
#ifdef OWNERDRAW
if
(
pItemData
->
pMenu
&&
!
pItemData
->
pMenu
->
IsMenuBar
()
)
pSalMenuItem
->
mInfo
.
fType
|=
MFT_OWNERDRAW
;
pSalMenuItem
->
mInfo
.
fState
=
MFS_ENABLED
;
#endif
pSalMenuItem
->
mInfo
.
dwTypeData
=
(
LPWSTR
)
pSalMenuItem
->
mText
.
getStr
();
pSalMenuItem
->
mInfo
.
cch
=
pSalMenuItem
->
mText
.
getLength
();
...
...
@@ -310,10 +300,6 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU
pWItem
->
mText
=
pWItem
->
mText
.
replaceAll
(
"~"
,
"&"
);
pWItem
->
mInfo
.
fMask
=
MIIM_TYPE
|
MIIM_DATA
;
pWItem
->
mInfo
.
fType
=
MFT_STRING
;
#ifdef OWNERDRAW
if
(
pWItem
->
mpMenu
&&
!
((
Menu
*
)
pWItem
->
mpMenu
)
->
IsMenuBar
()
)
pWItem
->
mInfo
.
fType
|=
MFT_OWNERDRAW
;
#endif
// combine text and accelerator text
OUString
aStr
(
pWItem
->
mText
);
...
...
@@ -339,10 +325,7 @@ void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const
pWItem
->
mAccelText
=
rKeyName
;
pWItem
->
mInfo
.
fMask
=
MIIM_TYPE
|
MIIM_DATA
;
pWItem
->
mInfo
.
fType
=
MFT_STRING
;
#ifdef OWNERDRAW
if
(
pWItem
->
mpMenu
&&
!
((
Menu
*
)
pWItem
->
mpMenu
)
->
IsMenuBar
()
)
pWItem
->
mInfo
.
fType
|=
MFT_OWNERDRAW
;
#endif
// combine text and accelerator text
OUString
aStr
(
pWItem
->
mText
);
if
(
pWItem
->
mAccelText
.
getLength
()
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment