Adding MSVC makefile support for building the TIFF library

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 66157cb2cf38ad25fd41a23a258692bc89313b20..f9e310d9a9994cc8a42def673c56bf4420b16ca1 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -70,13 +70,11 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

-#if     !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY

     #if wxUSE_OWNER_DRAWN
         IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
     #else   //!USE_OWNER_DRAWN
         IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
     #endif  //USE_OWNER_DRAWN
     #if wxUSE_OWNER_DRAWN
         IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
     #else   //!USE_OWNER_DRAWN
         IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
     #endif  //USE_OWNER_DRAWN

-#endif  //USE_SHARED_LIBRARY

 
 // ----------------------------------------------------------------------------
 // wxMenuItem
 
 // ----------------------------------------------------------------------------
 // wxMenuItem


@@ -90,9 +88,9 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        const wxString& text,
                        const wxString& strHelp,
                        bool bCheckable,
                        const wxString& text,
                        const wxString& strHelp,
                        bool bCheckable,

-                       wxMenu *pSubMenu) :
+                       wxMenu *pSubMenu)

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-                        wxOwnerDrawn(text, bCheckable)
+                       : wxOwnerDrawn(text, bCheckable)

 #endif // owner drawn
 {
     wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
 #endif // owner drawn
 {
     wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );