Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 50ed50f32b814b44acd751cac61bd4daad320c93..9e2f53f5a29b740a706f075e1438e7767fe63bd1 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -1,128 +1,110 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        menu.h
+// Name:        wx/gtk/menu.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTKMENU_H_
+#define _WX_GTKMENU_H_

 
 

-#ifndef __GTKMENUH__
-#define __GTKMENUH__
+//-----------------------------------------------------------------------------
+// wxMenuBar
+//-----------------------------------------------------------------------------

 
 

-#ifdef __GNUG__
-#pragma interface
-#endif
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
+{
+public:
+    // ctors
+    wxMenuBar();
+    wxMenuBar(long style);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);

 
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/window.h"
+    // implement base class (pure) virtuals
+    virtual bool Append( wxMenu *menu, const wxString &title );
+    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
+    virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
+    virtual wxMenu *Remove(size_t pos);

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+    virtual int FindMenuItem(const wxString& menuString,
+                             const wxString& itemString) const;
+    virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;

 
 

-class wxMenuBar;
-class wxMenuItem;
-class wxMenu;
+    virtual void EnableTop( size_t pos, bool flag );
+    virtual bool IsEnabledTop(size_t pos) const;
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;

 
 

-//-----------------------------------------------------------------------------
-// const
-//-----------------------------------------------------------------------------
+    void SetLayoutDirection(wxLayoutDirection dir);
+    wxLayoutDirection GetLayoutDirection() const;

 
 

-#define   ID_SEPARATOR    (-1)
+    // wxMenuBar is not a top level window but it still doesn't need a parent
+    // window
+    virtual bool GTKNeedsParent() const { return false; }

 
 

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

 
 

-class wxMenuBar: public wxWindow
-{
-  DECLARE_DYNAMIC_CLASS(wxMenuBar)
-
-  public:
-
-    wxMenuBar(void);
-    void Append( wxMenu *menu, const wxString &title );
-    int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
-    wxMenuItem* FindMenuItemById( int id ) const;
-    bool IsChecked( int id ) const;
-    bool IsEnabled( int id ) const;
-    
-    wxList       m_menus;
-    GtkWidget   *m_menubar;
+    // implementation only from now on
+    GtkWidget       *m_menubar; // Public for hildon support
+
+private:
+    // common part of Append and Insert
+    void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);
+
+    void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+
+    DECLARE_DYNAMIC_CLASS(wxMenuBar)

 };
 
 //-----------------------------------------------------------------------------
 // wxMenu
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 // wxMenu
 //-----------------------------------------------------------------------------
 

-class wxMenuItem: public wxObject
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMenuItem)
-
-  public:
-  
-    wxMenuItem(void);
-  
-    int           m_id;
-    wxString      m_text;
-    bool          m_isCheckMenu;
-    bool          m_checked;
-    bool          m_isSubMenu;
-    bool          m_isEnabled;
-    wxMenu       *m_subMenu;
-    wxString      m_helpStr;
-    
-    GtkWidget    *m_menuItem;  // GtkMenuItem
-    
-    bool IsCheckable()         const { return m_isCheckMenu; }
-    bool IsSeparator()         const { return m_id == ID_SEPARATOR;  }
-    bool IsEnabled()           const { return m_isEnabled;  }
-    int  GetId()               const { return m_id; }
-    const wxString& GetHelp()  const { return m_helpStr; }
-    wxMenu *GetSubMenu()       const { return m_subMenu; }
-    
-    void Check( bool check );
-    bool IsChecked() const;
-    void Enable( bool enable );
-};
+public:
+    // ctors & dtor
+    wxMenu(const wxString& title, long style = 0)
+        : wxMenuBase(title, style) { Init(); }

 
 

-class wxMenu: public wxEvtHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxMenu)
-
-  public:
-
-    wxMenu( const wxString &title = "" );
-    void AppendSeparator(void);
-    void Append( int id, const wxString &item, 
-      const wxString &helpStr = "", bool checkable = FALSE );
-    void Append( int id, const wxString &item,
-      wxMenu *subMenu, const wxString &helpStr = "" );
-    int FindItem( const wxString itemString ) const;
-    wxMenuItem* FindItemForId( int id ) const;
-    void Break(void) {};
-    void Check(int id, bool Flag);
-    void Enable( int id, bool enable );
-    bool Enabled( int id ) const;
-    void SetLabel( int id, const wxString &label );
-
-  public:
-      
-    int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
-    void SetInvokingWindow( wxWindow *win );
-    wxWindow *GetInvokingWindow(void);
-
-    wxString    m_title;
-    wxList      m_items;
-    wxWindow   *m_invokingWindow;
-    
-    GtkWidget  *m_menu;  // GtkMenu
-      
+    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
+
+    virtual ~wxMenu();
+
+    void Attach(wxMenuBarBase *menubar);
+
+    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
+    GtkWidget       *m_menu;  // GtkMenu
+    GtkWidget       *m_owner;
+    GtkAccelGroup   *m_accel;
+    bool m_popupShown;
+
+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();
+
+    // common part of Append (if pos == -1)  and Insert
+    void GtkAppend(wxMenuItem* item, int pos = -1);
+
+
+    DECLARE_DYNAMIC_CLASS(wxMenu)

 };
 
 };
 

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