When handling accelerators in wxWebView make sure that we do not block right-alt...

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index ba4c245a9d8c1480f284bf0a45a72a9d88492b6a..c2841074ef870a7205cdf70a7ff7b117f178c440 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKMENUH__
-#define __GTKMENUH__
+#ifndef _WX_GTKMENU_H_
+#define _WX_GTKMENU_H_

 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 
 //-----------------------------------------------------------------------------
 // wxMenuBar


@@ -21,7 +21,7 @@ public:
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);

-    virtual ~wxMenuBar();
+    ~wxMenuBar();

 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );
 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );


@@ -34,32 +34,28 @@ 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;
+    virtual bool IsEnabledTop(size_t pos) const;
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;

 
     void SetLayoutDirection(wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
 
     void SetLayoutDirection(wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 

-    // wxMenuBar is not a top level window but it still doesn't need a parent
-    // window
-    virtual bool GTKNeedsParent() const { return false; }
-
-    void Attach(wxFrame *frame);
-
-    // implementation only from now on
-    void SetInvokingWindow( wxWindow *win );
-    void UnsetInvokingWindow( wxWindow *win );
+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();

 
 

+private:

     // common part of Append and Insert
     // common part of Append and Insert

-    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
+    void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);

 
 

-    GtkWidget       *m_menubar;
-    long             m_style;
-    wxWindow        *m_invokingWindow;
-
-private:

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

+    // wxMenuBar is not a top level window but it still doesn't need a parent
+    // window
+    virtual bool GTKNeedsParent() const { return false; }
+
+    GtkWidget* m_menubar;
+

     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 


@@ -83,15 +79,16 @@ public:
     void SetLayoutDirection(const wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
     void SetLayoutDirection(const wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 

-    // TODO: virtual void SetTitle(const wxString& title);
+    // Returns the title, with mnemonics translated to wx format
+    wxString GetTitle() const;

 
 

-    // implementation
-    int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
+    // TODO: virtual void SetTitle(const wxString& title);

 
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
 
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;

+    bool m_popupShown;

 
 protected:
     virtual wxMenuItem* DoAppend(wxMenuItem *item);
 
 protected:
     virtual wxMenuItem* DoAppend(wxMenuItem *item);


@@ -103,12 +100,11 @@ private:
     void Init();
 
     // common part of Append (if pos == -1)  and Insert
     void Init();
 
     // common part of Append (if pos == -1)  and Insert

-    bool GtkAppend(wxMenuItem *item, int pos=-1);
+    void GtkAppend(wxMenuItem* item, int pos = -1);

 
 

-    GtkWidget *m_prevRadio;

 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
 #endif

-    // __GTKMENUH__
+    // _WX_GTKMENU_H_