fixed calling Union() or Offset() on a previously Clear()ed region, also removed...

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index f69a0a01f9fd07c4bb1bd77c76d81166754bd678..aae20373f74350125bdef85cdb5715c5b7801717 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -89,7 +89,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        wxMenu *pSubMenu)
           : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
 #if wxUSE_OWNER_DRAWN
                        wxMenu *pSubMenu)
           : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
 #if wxUSE_OWNER_DRAWN

-            , wxOwnerDrawn(GetLabelFromText(text), kind == wxITEM_CHECK)
+            , wxOwnerDrawn(text, kind == wxITEM_CHECK)

 #endif // owner drawn
 {
     Init();
 #endif // owner drawn
 {
     Init();


@@ -104,7 +104,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 #if wxUSE_OWNER_DRAWN
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 #if wxUSE_OWNER_DRAWN

-            , wxOwnerDrawn(GetLabelFromText(text), isCheckable)
+            , wxOwnerDrawn(text, isCheckable)

 #endif // owner drawn
 {
     Init();
 #endif // owner drawn
 {
     Init();


@@ -255,7 +255,7 @@ void wxMenuItem::Check(bool check)
                                    start,   // the first radio group item
                                    end,     // the last one
                                    pos,     // the one to check
                                    start,   // the first radio group item
                                    end,     // the last one
                                    pos,     // the one to check

-                                   MF_BYPOSITION | flags) )
+                                   MF_BYPOSITION) )

         {
             wxLogLastError(_T("CheckMenuRadioItem"));
         }
         {
             wxLogLastError(_T("CheckMenuRadioItem"));
         }


@@ -283,7 +283,7 @@ void wxMenuItem::Check(bool check)
     {
         if ( ::CheckMenuItem(hmenu,
                              GetRealId(),
     {
         if ( ::CheckMenuItem(hmenu,
                              GetRealId(),

-                             MF_BYCOMMAND | flags) == -1 )
+                             MF_BYCOMMAND | flags) == (DWORD)-1 )

         {
             wxLogLastError(wxT("CheckMenuItem"));
         }
         {
             wxLogLastError(wxT("CheckMenuItem"));
         }