Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index afc6828886d87c23e21653cbe849a8b00e2fbda1..aca498bcc29b92957842a038a007e418e9e08768 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -34,20 +34,18 @@ public:
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );

-    virtual void SetLabelTop( size_t pos, const wxString& label );
-    virtual wxString GetLabelTop( size_t pos ) const;
-
-    // implementation only from now on
-    void SetInvokingWindow( wxWindow *win );
-    void UnsetInvokingWindow( wxWindow *win );
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;

 
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
 
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 

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

     GtkAccelGroup   *m_accel;
     GtkWidget       *m_menubar;
     long             m_style;
     GtkAccelGroup   *m_accel;
     GtkWidget       *m_menubar;
     long             m_style;

-    wxWindow        *m_invokingWindow;

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


@@ -75,6 +73,9 @@ public:
     virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
     virtual wxMenuItem* DoRemove(wxMenuItem *item);
 
     virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
     virtual wxMenuItem* DoRemove(wxMenuItem *item);
 

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

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


@@ -92,9 +93,10 @@ private:
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 

-       GtkWidget *m_prevRadio;
+    GtkWidget *m_prevRadio;

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

-#endif // __GTKMENUH__
+#endif
+    // __GTKMENUH__