Reverted corrupt file (may not be in line with Vadim's changes)

[wxWidgets.git] / include / wx / stubs / menuitem.h

diff --git a/include/wx/stubs/menuitem.h b/include/wx/stubs/menuitem.h
index 6536ac08056275bbff3b2e5f6056243b302a3611..9c912967f1208e186ae59dc5dc58249fcb789b1d 100644 (file)
--- a/include/wx/stubs/menuitem.h
+++ b/include/wx/stubs/menuitem.h
@@ -25,7 +25,7 @@
 // an exception to the general rule that a normal header doesn't include other
 // headers - only because ownerdrw.h is not always included and I don't want
 // to write #ifdef's everywhere...
 // an exception to the general rule that a normal header doesn't include other
 // headers - only because ownerdrw.h is not always included and I don't want
 // to write #ifdef's everywhere...

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

 #include  "wx/ownerdrw.h"
 #endif
 
 #include  "wx/ownerdrw.h"
 #endif
 


@@ -40,7 +40,7 @@
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxMenuItem: public wxObject
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxMenuItem: public wxObject

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

                             , public wxOwnerDrawn
 #endif
 {
                             , public wxOwnerDrawn
 #endif
 {


@@ -79,7 +79,7 @@ private:
   bool        m_bEnabled,       // enabled or greyed?
               m_bChecked;       // checked? (only if checkable)
 
   bool        m_bEnabled,       // enabled or greyed?
               m_bChecked;       // checked? (only if checkable)
 

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

   // wxOwnerDrawn base class already has these variables - nothing to do
 
 #else   //!owner drawn
   // wxOwnerDrawn base class already has these variables - nothing to do
 
 #else   //!owner drawn