Added wxListCtrl to derive from wxGenericListCtrl,

[wxWidgets.git] / include / wx / univ / menu.h

diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index c8f14231eb37c7fd2cc766f6185de09e230ba83e..3daa74e772f5c3673b1d4d3d20ee26aaf2d4a0b8 100644 (file)
--- a/include/wx/univ/menu.h
+++ b/include/wx/univ/menu.h
@@ -26,24 +26,10 @@
 class WXDLLEXPORT wxMenuInfo;
 WX_DECLARE_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
 
 class WXDLLEXPORT wxMenuInfo;
 WX_DECLARE_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
 

-class wxPopupMenuWindow;
-
+class WXDLLEXPORT wxMenuGeometryInfo;
+class WXDLLEXPORT wxPopupMenuWindow;

 class WXDLLEXPORT wxRenderer;
 
 class WXDLLEXPORT wxRenderer;
 

-// ----------------------------------------------------------------------------
-// wxMenu helper classes, used in implementation only
-// ----------------------------------------------------------------------------
-
-// used by wxRenderer
-class WXDLLEXPORT wxMenuGeometryInfo
-{
-public:
-    // get the total size of the menu
-    virtual wxSize GetSize() const = 0;
-
-    virtual ~wxMenuGeometryInfo();
-};
-

 // ----------------------------------------------------------------------------
 // wxMenu
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMenu
 // ----------------------------------------------------------------------------


@@ -142,11 +128,7 @@ private:
 #endif // wxUSE_ACCEL
 
     // it calls out OnDismiss()
 #endif // wxUSE_ACCEL
 
     // it calls out OnDismiss()

-#ifdef __WXMAC__

     friend class wxPopupMenuWindow;
     friend class wxPopupMenuWindow;

-#else
-    friend wxPopupMenuWindow;
-#endif

     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 


@@ -278,11 +260,7 @@ private:
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()

-#ifdef __WXMAC__

     friend class wxPopupMenuWindow;
     friend class wxPopupMenuWindow;

-#else
-    friend wxPopupMenuWindow;
-#endif

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)