atsu for textctrl

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 9a2d3a80f91a5dfe66836bb0be7291638e19b5e1..eda3f5a5b16c6f67654afc84d5280afd4c5eb12f 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -34,8 +34,17 @@ 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 void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) 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 );
 
     // implementation only from now on
     void SetInvokingWindow( wxWindow *win );


@@ -44,9 +53,6 @@ public:
     // 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);
 

-#ifndef __WXGTK20__
-    GtkAccelGroup   *m_accel;
-#endif

     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;


@@ -72,10 +78,10 @@ public:
 
     virtual ~wxMenu();
 
 
     virtual ~wxMenu();
 

-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+    void Attach(wxMenuBarBase *menubar);
+
+    void SetLayoutDirection(const wxLayoutDirection dir);
+    wxLayoutDirection GetLayoutDirection() const;

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


@@ -87,6 +93,11 @@ public:
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
 
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
 

+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+

 private:
     // common code for all constructors:
     void Init();
 private:
     // common code for all constructors:
     void Init();


@@ -94,9 +105,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__