Source cleaning: whitespaces & tabs, ::, TRUE/true, FALSE/false.

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

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 8e4a45a8538c29c9ea60eff85a66d3555f734c3a..eb26667a365649e6a967df963a25716912c7a6d8 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_
 

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

 #pragma interface "menu.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"
 #pragma interface "menu.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"

+#include "wx/arrstr.h"

 
 class wxFrame;
 
 
 class wxFrame;
 


@@ -37,9 +38,9 @@ public:
     virtual ~wxMenu();
     
     // implement base class virtuals
     virtual ~wxMenu();
     
     // 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();
     


@@ -47,14 +48,6 @@ public:
     
     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; }


@@ -125,6 +118,7 @@ public:
     wxMenuBar() { Init(); }
     wxMenuBar(long WXUNUSED(style)) { Init(); }
     wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
     wxMenuBar() { Init(); }
     wxMenuBar(long WXUNUSED(style)) { Init(); }
     wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);

+    wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles);

     virtual ~wxMenuBar();
     
     // implement base class (pure) virtuals
     virtual ~wxMenuBar();
     
     // implement base class (pure) virtuals