Blind bug fix to bug reported by Angel Kry.

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

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index c50ae7865331f4d1c0616259574b2bcdb2ae9437..b4f94426d16a6118082c68de7d16a01d54ce40fa 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -12,12 +12,13 @@
 #ifndef _WX_MOTIF_MENU_H_
 #define _WX_MOTIF_MENU_H_
 
 #ifndef _WX_MOTIF_MENU_H_
 #define _WX_MOTIF_MENU_H_
 

-#ifdef __GNUG__
-    #pragma interface "menu.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "menu.h"

 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"

+#include "wx/arrstr.h"

 
 class wxFrame;
 
 
 class wxFrame;
 


@@ -31,69 +32,62 @@ public:
     // ctors & dtor
     wxMenu(const wxString& title, long style = 0)
         : wxMenuBase(title, style) { Init(); }
     // ctors & dtor
     wxMenu(const wxString& title, long style = 0)
         : wxMenuBase(title, style) { Init(); }

-
+    

     wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
     wxMenu(long style = 0) : wxMenuBase(style) { Init(); }

-
+    

     virtual ~wxMenu();
     virtual ~wxMenu();

-
+    

     // implement base class virtuals
     // implement base class virtuals

-    virtual bool DoAppend(wxMenuItem *item);
-    virtual bool DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem *DoRemove(wxMenuItem *item);
-
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+    

     virtual void Break();
     virtual void Break();

-
+    

     virtual void SetTitle(const wxString& title);
     virtual void SetTitle(const wxString& title);

-
+    

     bool ProcessCommand(wxCommandEvent& event);
     bool ProcessCommand(wxCommandEvent& event);

-
-    wxMenu(const wxString& title, const wxFunction func)
-        : wxMenuBase(title)
-    {
-        Init();
-
-        Callback(func);
-    }
-
+    

     //// Motif-specific
     WXWidget GetButtonWidget() const { return m_buttonWidget; }
     void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }
     //// Motif-specific
     WXWidget GetButtonWidget() const { return m_buttonWidget; }
     void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }

-
+    

     WXWidget GetMainWidget() const { return m_menuWidget; }
     WXWidget GetMainWidget() const { return m_menuWidget; }

-
+    

     int GetId() const { return m_menuId; }
     void SetId(int id) { m_menuId = id; }
     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 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();
     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,
     WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,

-                        const wxString& title = wxEmptyString,
-                        bool isPulldown = FALSE);
-
+        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;
     // 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; }
     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 SetBackgroundColour(const wxColour& colour);
     void SetForegroundColour(const wxColour& colour);
     void SetFont(const wxFont& colour);

-    void ChangeFont(bool keepOriginalSize = FALSE);
-
+    void ChangeFont(bool keepOriginalSize = false);
+    

     WXWidget GetHandle() const { return m_menuWidget; }
     WXWidget GetHandle() const { return m_menuWidget; }

-
+    

     bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }
 
     bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }
 

+    void DestroyWidgetAndDetach();

 public:
     // Motif-specific data
     int               m_numColumns;
 public:
     // Motif-specific data
     int               m_numColumns;


@@ -106,11 +100,11 @@ public:
     wxColour          m_foregroundColour;
     wxColour          m_backgroundColour;
     wxFont            m_font;
     wxColour          m_foregroundColour;
     wxColour          m_backgroundColour;
     wxFont            m_font;

-
+    

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

-
+    

     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 


@@ -123,61 +117,62 @@ class wxMenuBar : public wxMenuBarBase
 public:
     wxMenuBar() { Init(); }
     wxMenuBar(long WXUNUSED(style)) { Init(); }
 public:
     wxMenuBar() { Init(); }
     wxMenuBar(long WXUNUSED(style)) { Init(); }

-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    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();
     virtual ~wxMenuBar();

-
+    

     // implement base class (pure) virtuals
     // ------------------------------------
     // 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 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,
     virtual int FindMenuItem(const wxString& menuString,

-                             const wxString& itemString) const;
+        const wxString& itemString) const;

     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) 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;
     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
     // -------------------------------
     // 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; }
     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);
     // Create menubar
     bool CreateMenuBar(wxFrame* frame);

-
+    

     // Destroy menubar, but keep data structures intact so we can recreate it.
     bool DestroyMenuBar();
     // 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; }
     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);
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
     virtual bool SetFont(const wxFont& colour);

-    void ChangeFont(bool keepOriginalSize = FALSE);
-
+    void ChangeFont(bool keepOriginalSize = false);
+    

 public:
     // common part of all ctors
     void Init();
 public:
     // common part of all ctors
     void Init();

-
+    

     wxArrayString m_titles;
     wxFrame      *m_menuBarFrame;
     wxArrayString m_titles;
     wxFrame      *m_menuBarFrame;

-
+    

     WXWidget      m_mainWidget;
     WXWidget      m_mainWidget;

-
+    

     wxColour      m_foregroundColour;
     wxColour      m_backgroundColour;
     wxFont        m_font;
     wxColour      m_foregroundColour;
     wxColour      m_backgroundColour;
     wxFont        m_font;

-
+    

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