X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 085dc6e47f..25958f2c6e 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -26,21 +26,19 @@ #if wxUSE_MENUS -#include "wx/menu.h" +#include "wx/menuitem.h" #ifndef WX_PRECOMP #include "wx/font.h" #include "wx/bitmap.h" #include "wx/settings.h" - #include "wx/font.h" #include "wx/window.h" #include "wx/accel.h" #include "wx/string.h" #include "wx/log.h" + #include "wx/menu.h" #endif -#include "wx/menuitem.h" - #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL @@ -79,7 +77,7 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ; bool wxMenuItemStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & ) { const wxMenuItem * mitem = dynamic_cast(object) ; - if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().IsEmpty() ) + if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() ) { // we don't stream out the first two items for menus with a title, they will be reconstructed if ( mitem->GetMenu()->FindItemByPosition(0) == mitem || mitem->GetMenu()->FindItemByPosition(1) == mitem )