- mii.cch = itemText.length();
- mii.dwTypeData = wx_const_cast(wxChar *, itemText.c_str());
-
- // we can't pass HBITMAP directly as hbmpItem for 2 reasons:
- // 1. we can't draw it with transparency then (this is not
- // very important now but would be with themed menu bg)
- // 2. worse, Windows inverses the bitmap for the selected
- // item and this looks downright ugly
- //
- // so instead draw it ourselves in MSWOnDrawItem()
- mii.dwItemData = wx_reinterpret_cast(ULONG_PTR, pItem);
- mii.hbmpItem = HBMMENU_CALLBACK;
-
- ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
- if ( !ok )
- {
- wxLogLastError(wxT("InsertMenuItem()"));
- }
- else // InsertMenuItem() ok
+ }
+
+ // we can't pass HBITMAP directly as hbmpItem for 2 reasons:
+ // 1. we can't draw it with transparency then (this is not
+ // very important now but would be with themed menu bg)
+ // 2. worse, Windows inverts the bitmap for the selected
+ // item and this looks downright ugly
+ //
+ // so instead draw it ourselves in MSWOnDrawItem()
+ mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
+ if ( pItem->IsCheckable() )
+ {
+ mii.hbmpChecked =
+ mii.hbmpUnchecked = HBMMENU_CALLBACK;
+ }
+ mii.hbmpItem = HBMMENU_CALLBACK;
+
+ ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
+ if ( !ok )
+ {
+ wxLogLastError(wxT("InsertMenuItem()"));
+ }
+ else // InsertMenuItem() ok
+ {
+ // we need to remove the extra indent which is reserved for
+ // the checkboxes by default as it looks ugly unless check
+ // boxes are used together with bitmaps and this is not the
+ // case in wx API
+ WinStruct<MENUINFO> mi;
+
+ // don't call SetMenuInfo() directly, this would prevent
+ // the app from starting up under Windows 95/NT 4
+ typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
+
+ wxDynamicLibrary dllUser(_T("user32"));
+ wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
+ if ( pfnSetMenuInfo )
projects / wxWidgets.git / blobdiff