Warning fixes for Cygwin

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

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index f89f733d11f5ec8bdcd188a84c8b615e5991b398..b4f94426d16a6118082c68de7d16a01d54ce40fa 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -6,193 +6,174 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

-#ifndef _WX_MENU_H_
-#define _WX_MENU_H_
+#ifndef _WX_MOTIF_MENU_H_
+#define _WX_MOTIF_MENU_H_

 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "menu.h"
 #endif
 
 #pragma interface "menu.h"
 #endif
 

-#include "wx/defs.h"
-#include "wx/event.h"
+#include "wx/colour.h"
+#include "wx/font.h"
+#include "wx/arrstr.h"

 
 

-class WXDLLEXPORT wxMenuItem;
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxMenu;
-
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+class wxFrame;

 
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxMenu: public wxEvtHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxMenu)

 
 

+class wxMenu : public wxMenuBase
+{

 public:
 public:

-  // ctor & dtor
-  wxMenu(const wxString& title = wxEmptyString, const wxFunction func = NULL);
-  ~wxMenu();
-
-  // construct menu
-    // append items to the menu
-      // separator line
-  void AppendSeparator();
-      // normal item
-  void Append(int id, const wxString& Label, const wxString& helpString = wxEmptyString,
-              bool checkable = FALSE);
-      // a submenu
-  void Append(int id, const wxString& Label, wxMenu *SubMenu, 
-              const wxString& helpString = wxEmptyString);
-      // the most generic form (create wxMenuItem first and use it's functions)
-  void Append(wxMenuItem *pItem);
-    // insert a break in the menu
-  void Break();
-    // delete an item
-  void Delete(int id);
-
-  // menu item control
-  void Enable(int id, bool Flag);
-  bool Enabled(int id) const;
-  inline bool IsEnabled(int id) const { return Enabled(id); };
-  void Check(int id, bool Flag);
-  bool Checked(int id) const;
-  inline bool IsChecked(int id) const { return IsChecked(id); };
-
-  // item properties
-    // title
-  void SetTitle(const wxString& label);
-  const wxString GetTitle() const;
-    // label
-  void SetLabel(int id, const wxString& label);
-  wxString GetLabel(int id) const;
-    // help string
-  virtual void SetHelpString(int id, const wxString& helpString);
-  virtual wxString GetHelpString(int id) const ;
-
-  // find item
-    // Finds the item id matching the given string, -1 if not found.
-  virtual int FindItem(const wxString& itemString) const ;
-    // Find wxMenuItem by ID, and item's menu too if itemMenu is !NULL.
-  wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const;
-
-  void ProcessCommand(wxCommandEvent& event);
-  inline void Callback(const wxFunction func) { m_callback = func; }
-
-  virtual void SetParent(wxEvtHandler *parent) { m_parent = parent; }
-  inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
-  inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
-
-  inline wxList& GetItems() const { return (wxList&) m_menuItems; }
-
-  //// Motif-specific
-  inline WXWidget GetButtonWidget() const { return m_buttonWidget; }
-  inline void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }
-  inline WXWidget GetMainWidget() const { return m_menuWidget; }
-  inline wxMenu* GetParent() const { return m_menuParent; }
-  inline int GetId() const { return m_menuId; }
-  inline void SetId(int id) { m_menuId = id; }
-  inline void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }
-  inline wxMenuBar* GetMenuBar() const { return m_menuBar; }
-
-  void CreatePopup (WXWidget logicalParent, int x, int y);
-  void DestroyPopup (void);
-  void ShowPopup (int x, int y);
-  void HidePopup (void);
-
-  WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
-            const wxString& title = "", bool isPulldown = FALSE);
-
-  // For popups, need to destroy, then recreate menu for a different (or
-  // possibly same) window, since the parent may change.
-  void DestroyMenu(bool full);
-  WXWidget FindMenuItem(int id, wxMenuItem **it = NULL) const;
-
+    // ctors & dtor
+    wxMenu(const wxString& title, long style = 0)
+        : wxMenuBase(title, style) { Init(); }
+    
+    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
+    
+    virtual ~wxMenu();
+    
+    // implement base class virtuals
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+    
+    virtual void Break();
+    
+    virtual void SetTitle(const wxString& title);
+    
+    bool ProcessCommand(wxCommandEvent& event);
+    
+    //// Motif-specific
+    WXWidget GetButtonWidget() const { return m_buttonWidget; }
+    void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }
+    
+    WXWidget GetMainWidget() const { return m_menuWidget; }
+    
+    int GetId() const { return m_menuId; }
+    void SetId(int id) { m_menuId = id; }
+    
+    void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }
+    wxMenuBar* GetMenuBar() const { return m_menuBar; }
+    
+    void CreatePopup(WXWidget logicalParent, int x, int y);
+    void DestroyPopup();
+    void ShowPopup(int x, int y);
+    void HidePopup();
+    
+    WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
+        const wxString& title = wxEmptyString,
+        bool isPulldown = false);
+    
+    // For popups, need to destroy, then recreate menu for a different (or
+    // possibly same) window, since the parent may change.
+    void DestroyMenu(bool full);
+    WXWidget FindMenuItem(int id, wxMenuItem **it = NULL) const;
+    
+    const wxColour& GetBackgroundColour() const { return m_backgroundColour; }
+    const wxColour& GetForegroundColour() const { return m_foregroundColour; }
+    const wxFont& GetFont() const { return m_font; }
+    
+    void SetBackgroundColour(const wxColour& colour);
+    void SetForegroundColour(const wxColour& colour);
+    void SetFont(const wxFont& colour);
+    void ChangeFont(bool keepOriginalSize = false);
+    
+    WXWidget GetHandle() const { return m_menuWidget; }
+    
+    bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }
+
+    void DestroyWidgetAndDetach();

 public:
 public:

-  wxFunction        m_callback;
-
-  int               m_noItems;
-  wxString          m_title;
-  wxMenuBar *       m_menuBar;
-  wxList            m_menuItems;
-  wxEvtHandler *    m_parent;
-  wxEvtHandler *    m_eventHandler;
-
-  //// Motif-specific
-  int               m_numColumns;
-  WXWidget          m_menuWidget;
-  WXWidget          m_popupShell;   // For holding the popup shell widget
-  WXWidget          m_buttonWidget; // The actual string, so we can grey it etc.
-  int               m_menuId;
-  wxMenu*           m_topLevelMenu ;
-  wxMenu*           m_menuParent;
-  bool              m_ownedByMenuBar;
+    // Motif-specific data
+    int               m_numColumns;
+    WXWidget          m_menuWidget;
+    WXWidget          m_popupShell;   // For holding the popup shell widget
+    WXWidget          m_buttonWidget; // The actual string, so we can grey it etc.
+    int               m_menuId;
+    wxMenu*           m_topLevelMenu ;
+    bool              m_ownedByMenuBar;
+    wxColour          m_foregroundColour;
+    wxColour          m_backgroundColour;
+    wxFont            m_font;
+    
+private:
+    // common code for both constructors:
+    void Init();
+    
+    DECLARE_DYNAMIC_CLASS(wxMenu)

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

-// Menu Bar (a la Windows)
+// Menu Bar

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxMenuBar: public wxEvtHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxMenuBar)
-
-  wxMenuBar();
-  wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
-  ~wxMenuBar();
-
-  void Append(wxMenu *menu, const wxString& title);
-  // Must only be used AFTER menu has been attached to frame,
-  // otherwise use individual menus to enable/disable items
-  void Enable(int Id, bool Flag);
-  bool Enabled(int Id) const ;
-  inline bool IsEnabled(int Id) const { return Enabled(Id); };
-  void EnableTop(int pos, bool Flag);
-  void Check(int id, bool Flag);
-  bool Checked(int id) const ;
-  inline bool IsChecked(int Id) const { return Checked(Id); };
-  void SetLabel(int id, const wxString& label) ;
-  wxString GetLabel(int id) const ;
-  void SetLabelTop(int pos, const wxString& label) ;
-  wxString GetLabelTop(int pos) const ;
-  virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */
-  virtual bool OnAppend(wxMenu *menu, const char *title);
-  virtual bool OnDelete(wxMenu *menu, int index);
-
-  virtual void SetHelpString(int Id, const wxString& helpString);
-  virtual wxString GetHelpString(int Id) const ;
-
-  virtual int FindMenuItem(const wxString& menuString, const wxString& itemString) const ;
-
-  // Find wxMenuItem for item ID, and return item's
-  // menu too if itemMenu is non-NULL.
-  wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const ;
-
-  inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
-  inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
-
-  inline int GetMenuCount() const { return m_menuCount; }
-  inline wxMenu* GetMenu(int i) const { return m_menus[i]; }
-
-  //// Motif-specific
-  inline wxFrame* GetMenuBarFrame() const { return m_menuBarFrame; }
-  inline void SetMenuBarFrame(wxFrame* frame) { m_menuBarFrame = frame; }
-  inline WXWidget GetMainWidget() const { return m_mainWidget; }
-  inline void SetMainWidget(WXWidget widget) { m_mainWidget = widget; }
-
- public:
-  wxEvtHandler *            m_eventHandler;
-  int                       m_menuCount;
-  wxMenu **                 m_menus;
-  wxString *                m_titles;
-  wxFrame *                 m_menuBarFrame;
-
-  //// Motif-specific
-  WXWidget                  m_mainWidget;

 
 

+class wxMenuBar : public wxMenuBarBase
+{
+public:
+    wxMenuBar() { Init(); }
+    wxMenuBar(long WXUNUSED(style)) { Init(); }
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long style = 0);
+    virtual ~wxMenuBar();
+    
+    // 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);
+    
+    virtual int FindMenuItem(const wxString& menuString,
+        const wxString& itemString) const;
+    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
+    // -------------------------------
+    
+    wxFrame* GetMenuBarFrame() const { return m_menuBarFrame; }
+    void SetMenuBarFrame(wxFrame* frame) { m_menuBarFrame = frame; }
+    WXWidget GetMainWidget() const { return m_mainWidget; }
+    void SetMainWidget(WXWidget widget) { m_mainWidget = widget; }
+    
+    // Create menubar
+    bool CreateMenuBar(wxFrame* frame);
+    
+    // Destroy menubar, but keep data structures intact so we can recreate it.
+    bool DestroyMenuBar();
+    
+    const wxColour& GetBackgroundColour() const { return m_backgroundColour; }
+    const wxColour& GetForegroundColour() const { return m_foregroundColour; }
+    const wxFont& GetFont() const { return m_font; }
+    
+    virtual bool SetBackgroundColour(const wxColour& colour);
+    virtual bool SetForegroundColour(const wxColour& colour);
+    virtual bool SetFont(const wxFont& colour);
+    void ChangeFont(bool keepOriginalSize = false);
+    
+public:
+    // common part of all ctors
+    void Init();
+    
+    wxArrayString m_titles;
+    wxFrame      *m_menuBarFrame;
+    
+    WXWidget      m_mainWidget;
+    
+    wxColour      m_foregroundColour;
+    wxColour      m_backgroundColour;
+    wxFont        m_font;
+    
+    DECLARE_DYNAMIC_CLASS(wxMenuBar)

 };
 
 };
 

-#endif // _WX_MENU_H_
+#endif // _WX_MOTIF_MENU_H_