wxUniv compilation fixes

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

include/wx/frame.h

@@ -105,7 +105,7 @@ public:
     // ------------------
 
 #if wxUSE_MENUS
-    virtual void SetMenuBar(wxMenuBar *menubar) = 0;
+    virtual void SetMenuBar(wxMenuBar *menubar);
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 
@@ -200,6 +200,14 @@ protected:
     // override to update menu bar position when the frame size changes
     virtual void PositionMenuBar() { }
 
+    // override to do something special when the menu bar is being removed
+    // from the frame
+    virtual void DetachMenuBar();
+
+    // override to do something special when the menu bar is attached to the
+    // frame
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+
     wxMenuBar *m_frameMenuBar;
 #endif // wxUSE_MENUS
 

include/wx/gtk/frame.h

@@ -70,10 +70,6 @@ public:
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 
-#if wxUSE_MENUS
-    virtual void SetMenuBar( wxMenuBar *menuBar );
-#endif // wxUSE_MENUS
-
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 
@@ -134,8 +130,13 @@ protected:
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 
+#if wxUSE_MENUS_NATIVE
+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+#endif // wxUSE_MENUS_NATIVE
+
     // is the frame currently iconized?
-    bool          m_isIconized;
+    bool m_isIconized;
 };
 
 #endif // __GTKFRAMEH__

include/wx/gtk/popupwin.h

@@ -4,15 +4,15 @@
 // Author:      Robert Roebling
 // Created:
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Copyright:   (c) 2001 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
 #ifdef __GNUG__
-#pragma interface
+    #pragma interface "popupwin.h"
 #endif
 
 #include "wx/defs.h"

include/wx/gtk/window.h

@@ -85,9 +85,9 @@ public:
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
-#if wxUSE_MENUS
+#if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif // wxUSE_MENUS
+#endif // wxUSE_MENUS_NATIVE
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );

include/wx/gtk1/frame.h

@@ -70,10 +70,6 @@ public:
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
 
-#if wxUSE_MENUS
-    virtual void SetMenuBar( wxMenuBar *menuBar );
-#endif // wxUSE_MENUS
-
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 
@@ -134,8 +130,13 @@ protected:
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 
+#if wxUSE_MENUS_NATIVE
+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+#endif // wxUSE_MENUS_NATIVE
+
     // is the frame currently iconized?
-    bool          m_isIconized;
+    bool m_isIconized;
 };
 
 #endif // __GTKFRAMEH__

include/wx/gtk1/popupwin.h

@@ -4,15 +4,15 @@
 // Author:      Robert Roebling
 // Created:
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Copyright:   (c) 2001 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKPOPUPWINH__
 #define __GTKPOPUPWINH__
 
 #ifdef __GNUG__
-#pragma interface
+    #pragma interface "popupwin.h"
 #endif
 
 #include "wx/defs.h"

include/wx/gtk1/window.h

@@ -85,9 +85,9 @@ public:
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
-#if wxUSE_MENUS
+#if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif // wxUSE_MENUS
+#endif // wxUSE_MENUS_NATIVE
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );

include/wx/msw/frame.h

@@ -50,7 +50,6 @@ public:
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void Restore();
-    virtual void SetMenuBar(wxMenuBar *menubar);
     virtual void SetIcon(const wxIcon& icon);
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };
@@ -134,10 +133,10 @@ protected:
 
     virtual void DoSetClientSize(int width, int height);
 
-    // helper
-    void DetachMenuBar();
-
 #if wxUSE_MENUS_NATIVE
+    // perform MSW-specific action when menubar is changed
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();

include/wx/msw/window.h

@@ -28,14 +28,6 @@
 // a better solution should be found later...
 #define wxUSE_MOUSEEVENT_HACK 0
 
-// when building wxUniv/MSW we don't want the code for native menu use to be
-// compiled in - it should only be used when building real wxMSW
-#ifdef __WXUNIVERSAL__
-    #define wxUSE_MENUS_NATIVE 0
-#else // __WXMSW__
-    #define wxUSE_MENUS_NATIVE wxUSE_MENUS
-#endif // __WXUNIVERSAL__/__WXMSW__
-
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------

include/wx/popupwin.h

@@ -13,7 +13,7 @@
 #define _WX_POPUPWIN_H_BASE_
 
 #ifdef __GNUG__
-    #pragma interface "popupwin.h"
+    #pragma interface "popupwinbase.h"
 #endif
 
 #include "wx/window.h"

include/wx/univ/menu.h

@@ -278,11 +278,7 @@ private:
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()
-#ifdef __WXMAC__
     friend class wxPopupMenuWindow;
-#else
-    friend wxPopupMenuWindow;
-#endif
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)

include/wx/window.h

@@ -36,6 +36,14 @@
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 
+// when building wxUniv/Foo we don't want the code for native menu use to be
+// compiled in - it should only be used when building real wxFoo
+#ifdef __WXUNIVERSAL__
+    #define wxUSE_MENUS_NATIVE 0
+#else // __WXMSW__
+    #define wxUSE_MENUS_NATIVE wxUSE_MENUS
+#endif // __WXUNIVERSAL__/__WXMSW__
+
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------