double wxMenuItem definition problem fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 00ceb8bfe38c61075778826fe33ca25956c44f26..e76404c9c9f512e4d637bd908d5cf665e6eef521 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -17,7 +17,12 @@
 
 #include "wx/frame.h"
 #include "wx/menu.h"
 
 #include "wx/frame.h"
 #include "wx/menu.h"

-#include "wx/menuitem.h"
+
+// wxGTK is a special case because it doesn't use the generic wxMenuItem
+// class, but it's own (already defined in wx/menu.h) one
+#ifndef __WXGTK__
+  #include "wx/menuitem.h"
+#endif //WXGTK

 
 void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
 {
 
 void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
 {