// ----------------------------------------------------------------------------
// the (popup) menu title has this special id
-static const UINT idMenuTitle = (UINT)-3;
+static const int idMenuTitle = wxID_NONE;
// ----------------------------------------------------------------------------
// private functions
{
wxLogLastError(wxT("SetMenuItemInfo"));
}
-#endif
+#endif // !__WXWINCE__
+}
+
+// make the given menu item owner-drawn
+void SetOwnerDrawnMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
+ UINT WXUNUSED_IN_WINCE(id),
+ ULONG_PTR WXUNUSED_IN_WINCE(data),
+ BOOL WXUNUSED_IN_WINCE(byPositon = FALSE))
+{
+#ifndef __WXWINCE__
+ MENUITEMINFO mii;
+ wxZeroMemory(mii);
+ mii.cbSize = sizeof(MENUITEMINFO);
+ mii.fMask = MIIM_FTYPE | MIIM_DATA;
+ mii.fType = MFT_OWNERDRAW;
+ mii.dwItemData = data;
+
+ if ( reinterpret_cast<wxMenuItem*>(data)->IsSeparator() )
+ mii.fType |= MFT_SEPARATOR;
+
+ if ( !::SetMenuItemInfo(hmenu, id, byPositon, &mii) )
+ {
+ wxLogLastError(wxT("SetMenuItemInfo"));
+ }
+#endif // !__WXWINCE__
}
#ifdef __WXWINCE__
}
#endif // __WXWINCE__
-bool IsLessThanStdSize(const wxBitmap& bmp)
+inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
{
- // FIXME: these +4 are chosen so that 16*16 bitmaps pass this test with
- // default SM_CXMENUCHECK value but I have no idea what do we really
- // need to use here
- return bmp.GetWidth() < ::GetSystemMetrics(SM_CXMENUCHECK) + 4 &&
- bmp.GetHeight() < ::GetSystemMetrics(SM_CYMENUCHECK) + 4;
+ return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
+ bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
}
} // anonymous namespace
m_doBreak = false;
m_startRadioGroup = -1;
+#if wxUSE_OWNER_DRAWN
+ m_ownerDrawn = false;
+ m_maxBitmapWidth = 0;
+ m_maxAccelWidth = -1;
+#endif // wxUSE_OWNER_DRAWN
+
// create the menu
m_hMenu = (WXHMENU)CreatePopupMenu();
if ( !m_hMenu )
// if we have a title, insert it in the beginning of the menu
if ( !m_title.empty() )
{
- Append(idMenuTitle, m_title);
- AppendSeparator();
+ const wxString title = m_title;
+ m_title.clear(); // so that SetTitle() knows there was no title before
+ SetTitle(title);
}
}
{
GetMenuBar()->RebuildAccelTable();
}
+
+ ResetMaxAccelWidth();
}
//else: it is a separator, they can't have accels, nothing to do
}
pItem->SetBitmap(img, checked);
}
- return GetHbitmapOf(pItem->GetBitmap());
+ return GetHbitmapOf(pItem->GetBitmap(checked));
}
+ //else: bitmap is not set
+
+ return NULL;
}
#endif // wxUSE_IMAGE
#if wxUSE_OWNER_DRAWN
// Under older systems mixing owner-drawn and non-owner-drawn items results
// in inconsistent margins, so we force this one to be owner-drawn if any
- // other items already are. Later we might want to use a boolean in the
- // wxMenu to avoid search. Also we might make this fix unnecessary by
- // getting the correct margin using NONCLIENTMETRICS.
- static const wxWinVersion winver = wxGetWinVersion();
- if ( winver < wxWinVersion_XP &&
- !pItem->IsOwnerDrawn() && !pItem->IsSeparator() )
- {
- // Check if any other items are ownerdrawn, and make ownerdrawn if so
- wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
- while (node)
- {
- if (node->GetData()->IsOwnerDrawn())
- {
- pItem->SetOwnerDrawn(true);
- break;
- }
- node = node->GetNext();
- }
- }
+ // other items already are.
+ if ( m_ownerDrawn )
+ pItem->SetOwnerDrawn(true);
#endif // wxUSE_OWNER_DRAWN
// check if we have something more than a simple text item
if ( pItem->IsOwnerDrawn() )
{
#ifndef __DMC__
- // MIIM_BITMAP only works under WinME/2000+ so we always use owner
- // drawn item under the previous versions and we also have to use them
- // in any case if the item has custom colours or font
- bool mustUseOwnerDrawn = winver < wxWinVersion_98 ||
- pItem->GetTextColour().Ok() ||
- pItem->GetBackgroundColour().Ok() ||
- pItem->GetFont().Ok();
- if ( !mustUseOwnerDrawn )
- {
- const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
- bmpChecked = pItem->GetBitmap(true);
- if ( (bmpUnchecked.Ok() && !IsLessThanStdSize(bmpUnchecked)) ||
- (bmpChecked.Ok() && !IsLessThanStdSize(bmpChecked)) )
- {
- mustUseOwnerDrawn = true;
- }
- }
- // use InsertMenuItem() if possible as it's guaranteed to look correct
- // while our owner-drawn code is not
- if ( !mustUseOwnerDrawn )
+ if ( !m_ownerDrawn && !pItem->IsSeparator() )
{
- WinStruct<MENUITEMINFO> mii;
- mii.fMask = MIIM_STRING | MIIM_DATA;
-
- if ( pItem->GetBitmap().IsOk() )
+ // MIIM_BITMAP only works under WinME/2000+ so we always use owner
+ // drawn item under the previous versions and we also have to use
+ // them in any case if the item has custom colours or font
+ static const wxWinVersion winver = wxGetWinVersion();
+ bool mustUseOwnerDrawn = winver < wxWinVersion_98 ||
+ pItem->GetTextColour().Ok() ||
+ pItem->GetBackgroundColour().Ok() ||
+ pItem->GetFont().Ok();
+
+ if ( !mustUseOwnerDrawn )
{
- mii.fMask |= MIIM_BITMAP;
- mii.hbmpItem = GetHBitmapForMenu(pItem);
+ const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
+ bmpChecked = pItem->GetBitmap(true);
+
+ if ( (bmpUnchecked.Ok() && IsGreaterThanStdSize(bmpUnchecked)) ||
+ (bmpChecked.Ok() && IsGreaterThanStdSize(bmpChecked)) )
+ {
+ mustUseOwnerDrawn = true;
+ }
}
- if ( pItem->IsCheckable() )
+ // use InsertMenuItem() if possible as it's guaranteed to look
+ // correct while our owner-drawn code is not
+ if ( !mustUseOwnerDrawn )
{
- mii.fMask |= MIIM_CHECKMARKS;
- mii.hbmpChecked = GetHBitmapForMenu(pItem, true);
- mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false);
- }
+ WinStruct<MENUITEMINFO> mii;
+ mii.fMask = MIIM_STRING | MIIM_DATA;
- mii.cch = itemText.length();
- mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());
+ // don't set hbmpItem for the checkable items as it would
+ // be used for both checked and unchecked state
+ if ( pItem->IsCheckable() )
+ {
+ mii.fMask |= MIIM_CHECKMARKS;
+ mii.hbmpChecked = GetHBitmapForMenu(pItem, true);
+ mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false);
+ }
+ else if ( pItem->GetBitmap().IsOk() )
+ {
+ mii.fMask |= MIIM_BITMAP;
+ mii.hbmpItem = GetHBitmapForMenu(pItem);
+ }
- if ( flags & MF_POPUP )
- {
- mii.fMask |= MIIM_SUBMENU;
- mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());
- }
- else
- {
- mii.fMask |= MIIM_ID;
- mii.wID = id;
- }
+ mii.cch = itemText.length();
+ mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());
- mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
+ if ( flags & MF_POPUP )
+ {
+ mii.fMask |= MIIM_SUBMENU;
+ mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());
+ }
+ else
+ {
+ mii.fMask |= MIIM_ID;
+ mii.wID = id;
+ }
- 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(wxT("user32"));
- wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
- if ( pfnSetMenuInfo )
+ mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
+
+ ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
+ if ( !ok )
{
- mi.fMask = MIM_STYLE;
- mi.dwStyle = MNS_CHECKORBMP;
- if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
+ 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(wxT("user32"));
+ wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
+ if ( pfnSetMenuInfo )
{
- wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
+ mi.fMask = MIM_STYLE;
+ mi.dwStyle = MNS_CHECKORBMP;
+ if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
+ {
+ wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
+ }
}
- }
- // tell the item that it's not really owner-drawn but only
- // needs to draw its bitmap, the rest is done by Windows
- pItem->ResetOwnerDrawn();
+ // tell the item that it's not really owner-drawn but only
+ // needs to draw its bitmap, the rest is done by Windows
+ pItem->SetOwnerDrawn(false);
+ }
}
}
#endif // __DMC__
// item draws itself, pass pointer to it in data parameter
flags |= MF_OWNERDRAW;
pData = (LPCTSTR)pItem;
+
+ bool updateAllMargins = false;
+
+ // get size of bitmap always return valid value (0 for invalid bitmap),
+ // so we don't needed check if bitmap is valid ;)
+ int uncheckedW = pItem->GetBitmap(false).GetWidth();
+ int checkedW = pItem->GetBitmap(true).GetWidth();
+
+ if ( m_maxBitmapWidth < uncheckedW )
+ {
+ m_maxBitmapWidth = uncheckedW;
+ updateAllMargins = true;
+ }
+
+ if ( m_maxBitmapWidth < checkedW )
+ {
+ m_maxBitmapWidth = checkedW;
+ updateAllMargins = true;
+ }
+
+ // make other item ownerdrawn and update margin width for equals alignment
+ if ( !m_ownerDrawn || updateAllMargins )
+ {
+ // we must use position in SetOwnerDrawnMenuItem because
+ // all separators have the same id
+ int pos = 0;
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem* item = node->GetData();
+
+ if ( !item->IsOwnerDrawn())
+ {
+ item->SetOwnerDrawn(true);
+ SetOwnerDrawnMenuItem(GetHmenu(), pos,
+ reinterpret_cast<ULONG_PTR>(item), TRUE);
+ }
+
+ item->SetMarginWidth(m_maxBitmapWidth);
+
+ node = node->GetNext();
+ pos++;
+ }
+
+ // set menu as ownerdrawn
+ m_ownerDrawn = true;
+
+ ResetMaxAccelWidth();
+ }
+ // only update our margin for equals alignment to other item
+ else if ( !updateAllMargins )
+ {
+ pItem->SetMarginWidth(m_maxBitmapWidth);
+ }
}
}
else
// if we just appended the title, highlight it
- if ( id == idMenuTitle )
+ if ( id == (UINT_PTR)idMenuTitle )
{
// visually select the menu title
SetDefaultMenuItem(GetHmenu(), id);
delete m_accels[n];
m_accels.RemoveAt(n);
+
+ ResetMaxAccelWidth();
}
//else: this item doesn't have an accel, nothing to do
#endif // wxUSE_ACCEL
#endif // wxUSE_ACCEL
+// ---------------------------------------------------------------------------
+// ownerdrawn helpers
+// ---------------------------------------------------------------------------
+
+#if wxUSE_OWNER_DRAWN
+
+void wxMenu::CalculateMaxAccelWidth()
+{
+ wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
+
+ wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+ while (node)
+ {
+ wxMenuItem* item = node->GetData();
+
+ if ( item->IsOwnerDrawn() )
+ {
+ int width = item->MeasureAccelWidth();
+ if (width > m_maxAccelWidth )
+ m_maxAccelWidth = width;
+ }
+
+ node = node->GetNext();
+ }
+}
+
+#endif // wxUSE_OWNER_DRAWN
+
// ---------------------------------------------------------------------------
// set wxMenu title
// ---------------------------------------------------------------------------
if ( !label.empty() )
{
if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
- idMenuTitle, m_title.wx_str()) ||
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) ||
!::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
{
wxLogLastError(wxT("InsertMenu"));
#else
if ( !ModifyMenu(hMenu, 0u,
MF_BYPOSITION | MF_STRING,
- idMenuTitle, m_title.wx_str()) )
+ (UINT_PTR)idMenuTitle, m_title.wx_str()) )
{
wxLogLastError(wxT("ModifyMenu"));
}
// put the title string in bold face
if ( !m_title.empty() )
{
- SetDefaultMenuItem(GetHmenu(), idMenuTitle);
+ SetDefaultMenuItem(GetHmenu(), (UINT_PTR)idMenuTitle);
}
#endif // Win32
}
const int id = (signed short)id_;
// ignore commands from the menu title
- if ( id != (int)idMenuTitle )
+ if ( id != idMenuTitle )
{
// update the check item when it's clicked
wxMenuItem * const item = FindItem(id);
return true;
}
-// ---------------------------------------------------------------------------
-// other
-// ---------------------------------------------------------------------------
-
-wxWindow *wxMenu::GetWindow() const
-{
- if ( m_invokingWindow != NULL )
- return m_invokingWindow;
- else if ( GetMenuBar() != NULL)
- return GetMenuBar()->GetFrame();
-
- return NULL;
-}
-
// ---------------------------------------------------------------------------
// Menu Bar
// ---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff