Interface fixes for Phoenix

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

diff --git a/interface/wx/menu.h b/interface/wx/menu.h
index d1df2b809fa4cd88ed222e0f23d2d9b074604ee2..7b2e50d3ccb5354d0178bf848deb57ea1c919be6 100644 (file)
--- a/interface/wx/menu.h
+++ b/interface/wx/menu.h
@@ -394,7 +394,12 @@ public:
         @remarks Only exists on Mac, other platforms do not have this method. 
     */
     static wxMenuBar* MacGetCommonMenuBar();
-    
+
+    wxFrame *GetFrame() const;
+    bool IsAttached() const;
+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();
+
 };
 
 
@@ -994,5 +999,18 @@ public:
         but the application may call it at other times if required.
     */
     void UpdateUI(wxEvtHandler* source = NULL);
+
+    
+    void SetInvokingWindow(wxWindow *win);
+    wxWindow *GetInvokingWindow() const;
+    wxWindow *GetWindow() const;
+    long GetStyle() const;
+    void SetParent(wxMenu *parent);
+    wxMenu *GetParent() const;
+
+    virtual void Attach(wxMenuBar *menubar);
+    virtual void Detach();
+    bool IsAttached() const;
+
 };
 

diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h
index 6c1efd28d077cad1631da060b8ed76517d12fc91..577db5498cfd6a41f463cb94af7cde22cce80a52 100644 (file)
--- a/interface/wx/menuitem.h
+++ b/interface/wx/menuitem.h
@@ -157,7 +157,7 @@ public:
         
         @onlyfor{wxmsw}
     */
-    wxColour GetBackgroundColour() const;
+    wxColour& GetBackgroundColour() const;
 
     /**
         Returns the checked or unchecked bitmap.
@@ -171,7 +171,7 @@ public:
         
         @onlyfor{wxmsw}
     */
-    wxFont GetFont() const;
+    wxFont& GetFont() const;
 
     /**
         Returns the help string associated with the menu item.
@@ -257,7 +257,7 @@ public:
         
         @onlyfor{wxmsw}
     */
-    wxColour GetTextColour() const;
+    wxColour& GetTextColour() const;
     
     //@}