From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 26 Jul 1998 00:10:52 +0000 (+0000)
Subject: double wxMenuItem definition problem fixed
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e6688c3fd28581a9f438cb2c56030e107593bb5e

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 00ceb8bfe3..e76404c9c9 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -17,7 +17,12 @@
 
 #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) )
 {