Distrib changes.

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

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index e0b40fc05ba2cf9f96a321b1259fa6096f5f0c82..97c694329e8bd01917fceffed7fd4f3af622279b 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -6,36 +6,42 @@
 // 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__
 
 #ifdef __GNUG__

-#pragma interface "menu.h"
+    #pragma interface "menu.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/event.h"
+#include "wx/colour.h"
+#include "wx/font.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
+
+class wxMenu : public wxEvtHandler

 {
   DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
   // ctor & dtor
 {
   DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
   // ctor & dtor

-  wxMenu(const wxString& title = wxEmptyString, const wxFunction func = NULL);
-  ~wxMenu();
+#ifdef WXWIN_COMPATIBILITY
+    wxMenu( const wxString& title, const wxFunction func)
+    {
+        Init(title, 0, func);
+    }
+#endif // WXWIN_COMPATIBILITY
+    wxMenu( const wxString& title = wxEmptyString, long style = 0 )
+    {
+        Init(title, style);
+    }
+  virtual ~wxMenu();

 
   // construct menu
     // append items to the menu
 
   // construct menu
     // append items to the menu


@@ -45,7 +51,7 @@ public:
   void Append(int id, const wxString& Label, const wxString& helpString = wxEmptyString,
               bool checkable = FALSE);
       // a submenu
   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, 
+  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);
               const wxString& helpString = wxEmptyString);
       // the most generic form (create wxMenuItem first and use it's functions)
   void Append(wxMenuItem *pItem);


@@ -57,14 +63,14 @@ public:
   // menu item control
   void Enable(int id, bool Flag);
   bool Enabled(int id) const;
   // menu item control
   void Enable(int id, bool Flag);
   bool Enabled(int id) const;

-  inline bool IsEnabled(int id) const { return Enabled(id); };
+  bool IsEnabled(int id) const { return Enabled(id); };

   void Check(int id, bool Flag);
   bool Checked(int id) const;
   void Check(int id, bool Flag);
   bool Checked(int id) const;

-  inline bool IsChecked(int id) const { return IsChecked(id); };
+  bool IsChecked(int id) const { return IsChecked(id); };

 
   // Client data
 
   // Client data

-  inline void SetClientData(void* clientData) { m_clientData = clientData; }
-  inline void* GetClientData() const { return m_clientData; }
+  void SetClientData(void* clientData) { m_clientData = clientData; }
+  void* GetClientData() const { return m_clientData; }

 
   // item properties
     // title
 
   // item properties
     // title


@@ -83,24 +89,35 @@ public:
     // Find wxMenuItem by ID, and item's menu too if itemMenu is !NULL.
   wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const;
 
     // Find wxMenuItem by ID, and item's menu too if itemMenu is !NULL.
   wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const;
 

+  // Updates the UI for a menu and all submenus recursively.
+  // source is the object that has the update event handlers
+  // defined for it. If NULL, the menu or associated window
+  // will be used.
+  void UpdateUI(wxEvtHandler* source = (wxEvtHandler*) NULL);
+

   void ProcessCommand(wxCommandEvent& event);
   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; }
+#ifdef WXWIN_COMPATIBILITY
+  void Callback(const wxFunction func) { m_callback = func; }
+#endif // WXWIN_COMPATIBILITY

 
 

-  inline wxList& GetItems() const { return (wxList&) m_menuItems; }
+  void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
+  wxEvtHandler *GetEventHandler() { return m_eventHandler; }
+
+  wxList& GetItems() const { return (wxList&) m_menuItems; }
+
+  void      SetInvokingWindow(wxWindow *pWin) { m_pInvokingWindow = pWin; }
+  wxWindow *GetInvokingWindow()         const { return m_pInvokingWindow; }

 
   //// Motif-specific
 
   //// 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; }
+  WXWidget GetButtonWidget() const { return m_buttonWidget; }
+  void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }
+  WXWidget GetMainWidget() const { return m_menuWidget; }
+  wxMenu* GetParent() const { return m_menuParent; }
+  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);
 
   void CreatePopup (WXWidget logicalParent, int x, int y);
   void DestroyPopup (void);


@@ -115,16 +132,33 @@ public:
   void DestroyMenu(bool full);
   WXWidget FindMenuItem(int id, wxMenuItem **it = NULL) const;
 
   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);
+
+  // implementation from now on
+  WXWidget GetHandle() const { return m_menuWidget; }
+  bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }
+

 public:
 public:

+#ifdef WXWIN_COMPATIBILITY

   wxFunction        m_callback;
   wxFunction        m_callback;

+#endif // WXWIN_COMPATIBILITY

 
   int               m_noItems;
   wxString          m_title;
   wxMenuBar *       m_menuBar;
   wxList            m_menuItems;
 
   int               m_noItems;
   wxString          m_title;
   wxMenuBar *       m_menuBar;
   wxList            m_menuItems;

-  wxEvtHandler *    m_parent;

   wxEvtHandler *    m_eventHandler;
   void*             m_clientData;
   wxEvtHandler *    m_eventHandler;
   void*             m_clientData;

+  wxWindow*         m_pInvokingWindow;
+
+  long              m_style;

 
   //// Motif-specific
   int               m_numColumns;
 
   //// Motif-specific
   int               m_numColumns;


@@ -135,69 +169,85 @@ public:
   wxMenu*           m_topLevelMenu ;
   wxMenu*           m_menuParent;
   bool              m_ownedByMenuBar;
   wxMenu*           m_topLevelMenu ;
   wxMenu*           m_menuParent;
   bool              m_ownedByMenuBar;

+  wxColour          m_foregroundColour;
+  wxColour          m_backgroundColour;
+  wxFont            m_font;
+
+private:
+    // common code for both constructors:
+    void Init( const wxString& title,
+               long style
+#ifdef WXWIN_COMPATIBILITY
+               , const wxFunction func = (wxFunction) NULL
+#endif
+               );

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

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

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

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxMenuBar: public wxEvtHandler
+
+class wxMenuBar : public wxMenuBarBase

 {
 {

-  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);
+public:
+    wxMenuBar() { Init(); }
+    wxMenuBar(long WXUNUSED(style)) { Init(); }
+    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    virtual ~wxMenuBar();

 
 

-  virtual void SetHelpString(int Id, const wxString& helpString);
-  virtual wxString GetHelpString(int Id) const ;
+    // implement base class (pure) virtuals
+    // ------------------------------------

 
 

-  virtual int FindMenuItem(const wxString& menuString, const wxString& itemString) const ;
+    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);

 
 

-  // Find wxMenuItem for item ID, and return item's
-  // menu too if itemMenu is non-NULL.
-  wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const ;
+    virtual int FindMenuItem(const wxString& menuString,
+                             const wxString& itemString) const;
+    virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;

 
 

-  inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
-  inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
+    virtual void EnableTop( size_t pos, bool flag );
+    virtual void SetLabelTop( size_t pos, const wxString& label );
+    virtual wxString GetLabelTop( size_t pos ) const;

 
 

-  inline int GetMenuCount() const { return m_menuCount; }
-  inline wxMenu* GetMenu(int i) const { return m_menus[i]; }
+    // implementation only from now on
+    // -------------------------------

 
 

-  //// 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;
+    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; }

 
 

-  //// Motif-specific
-  WXWidget                  m_mainWidget;
+    // 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_