Update msw files to use the new definitions

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 80e6156acc242434c60cd1a7eea08ec898f2a01d..506d1986c0e9c2f52607a0e25ab0c15ab34c36c1 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -43,19 +43,16 @@ public:
     // window
     virtual bool GTKNeedsParent() const { return false; }
 
     // window
     virtual bool GTKNeedsParent() const { return false; }
 

-    void Attach(wxFrame *frame);
+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();

 
     // implementation only from now on
 
     // implementation only from now on

-    void SetInvokingWindow( wxWindow *win );
-    void UnsetInvokingWindow( wxWindow *win );

     GtkWidget       *m_menubar; // Public for hildon support
 
 private:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
     GtkWidget       *m_menubar; // Public for hildon support
 
 private:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 

-    wxWindow        *m_invokingWindow;
-

     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)


@@ -81,6 +78,9 @@ public:
     void SetLayoutDirection(const wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
     void SetLayoutDirection(const wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 

+    // Returns the title, with mnemonics translated to wx format
+    wxString GetTitle() const;
+

     // TODO: virtual void SetTitle(const wxString& title);
 
     // implementation GTK only
     // TODO: virtual void SetTitle(const wxString& title);
 
     // implementation GTK only