X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51d2fa37c431389260d70805f06e0158d85bdb3a..a340b80d8a692f5308d26c1c1b95fd689a1d7eb3:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index f60a9e14d7..085dc6e47f 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.cpp +// Name: src/msw/menuitem.cpp // Purpose: wxMenuItem implementation // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "menuitem.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,6 +26,8 @@ #if wxUSE_MENUS +#include "wx/menu.h" + #ifndef WX_PRECOMP #include "wx/font.h" #include "wx/bitmap.h" @@ -37,12 +35,11 @@ #include "wx/font.h" #include "wx/window.h" #include "wx/accel.h" - #include "wx/menu.h" #include "wx/string.h" + #include "wx/log.h" #endif #include "wx/menuitem.h" -#include "wx/log.h" #if wxUSE_ACCEL #include "wx/accel.h" @@ -177,7 +174,7 @@ void wxMenuItem::Init() if ( GetId() != wxID_SEPARATOR ) SetMarginWidth(GetMarginWidth()); - // tell the owner drawing code to to show the accel string as well + // tell the owner drawing code to show the accel string as well SetAccelString(m_text.AfterFirst(_T('\t'))); #endif // wxUSE_OWNER_DRAWN } @@ -403,7 +400,7 @@ void wxMenuItem::SetText(const wxString& text) info.cbSize = sizeof(info); info.fMask = MIIM_TYPE; info.fType = MFT_STRING; - info.cch = text.Length(); + info.cch = text.length(); info.dwTypeData = (LPTSTR) data ; if ( !::SetMenuItemInfo(hMenu, id, FALSE, & info) ) {