10.2 fix for CG

[wxWidgets.git] / src / msw / ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 785db7f39e67c17954ef9a962c54c1f6a5f7904e..4f07892a37ed70d98c236e54c71db3f9837f3878 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -107,8 +107,8 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
     // menu icons and checkmarks
     if (ms_nDefaultMarginWidth == 0)
     {
-       ms_nDefaultMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth;
-       ms_nLastMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth;
+       ms_nDefaultMarginWidth = ::GetSystemMetrics(SM_CXMENUCHECK) + wxSystemSettings::GetMetric(wxSYS_EDGE_X);
+       ms_nLastMarginWidth = ms_nDefaultMarginWidth;
     }
 
     if (wxMSWSystemMenuFontModule::ms_systemMenuFont->Ok() && bMenuItem)
@@ -167,7 +167,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
   // this will also allow offsetting the accel string from the right edge
   *pwidth += GetDefaultMarginWidth() + 16;
 
-  // increase size to accomodate bigger bitmaps if necessary
+  // increase size to accommodate bigger bitmaps if necessary
   if (m_bmpChecked.Ok())
   {
       // Is BMP height larger then text height?