Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/menu.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-18 07:13:20 +00:00
parent 85855db1c4
commit 3b3dc8019a
43 changed files with 99 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/menuitem.cpp
View File

@@ -26,7 +26,7 @@
#if wxUSE_MENUS
#include "wx/menu.h"
#include "wx/menuitem.h"
#ifndef WX_PRECOMP
#include "wx/font.h"
@@ -37,10 +37,9 @@
#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 +78,7 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ;
bool wxMenuItemStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & )
{
const wxMenuItem * mitem = dynamic_cast<const wxMenuItem*>(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 )