X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c089c47f344926e2f95a8aa342992ed844fe609..17dff81c7141e142765b168ab225e5c61475669f:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 4641f7d0dc..293ae51608 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -9,9 +9,9 @@ // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// headers & declarations -// ============================================================================ +#ifdef __GNUG__ +#pragma implementation "menuitem.h" +#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -38,7 +38,7 @@ // ---------------------------------------------------------------------------- #if !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY -#if USE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn) #else //!USE_OWNER_DRAWN IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) @@ -54,10 +54,10 @@ // ----------- wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, - const wxTString& strName, const wxTString& strHelp, + const wxString& strName, const wxString& strHelp, bool bCheckable, wxMenu *pSubMenu) : -#if USE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN wxOwnerDrawn(strName, bCheckable), #else //no owner drawn support m_bCheckable(bCheckable), @@ -67,7 +67,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, { wxASSERT( pParentMenu != NULL ); -#if USE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN // set default menu colors #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))