Avoid conflict between new transparency API and old background support.

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

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index c2607a04def68fa4b9120991e87d5c1fe7574faf..fa7b1e4f175fdb6bfcb1db295996436a78d25d4e 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -129,7 +129,7 @@ protected:
                  *m_subMenu;        // our sub menu or NULL
     wxString      m_text,           // label of the item
                   m_help;           // the help string for the item
                  *m_subMenu;        // our sub menu or NULL
     wxString      m_text,           // label of the item
                   m_help;           // the help string for the item

-    wxItemKind    m_kind;           // seperator/normal/check/radio item?
+    wxItemKind    m_kind;           // separator/normal/check/radio item?

     bool          m_isChecked;      // is checked?
     bool          m_isEnabled;      // is enabled?
 
     bool          m_isChecked;      // is checked?
     bool          m_isEnabled;      // is enabled?
 


@@ -163,8 +163,10 @@ private:
     #include "wx/msw/menuitem.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/menuitem.h"
     #include "wx/msw/menuitem.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/menuitem.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/menuitem.h"
     #include "wx/gtk/menuitem.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/menuitem.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
 #elif defined(__WXCOCOA__)