Applied patch [ 1382552 ] Fixes GDI-ressource leak in wxStaticBitmap

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

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 081d9dec799533bcdf055ca9d804e1d46945fd0d..16ecaa5557df0e7d732de0e7cf7bf19331b4b327 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -6,27 +6,23 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_MENU_H_
 #define _WX_MOTIF_MENU_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_MENU_H_
 #define _WX_MOTIF_MENU_H_
 

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

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

-class wxFrame;
+class WXDLLIMPEXP_CORE wxFrame;

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

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

 {
 public:
     // ctors & dtor
 {
 public:
     // ctors & dtor


@@ -66,8 +62,8 @@ public:
     void HidePopup();
     
     WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
     void HidePopup();
     
     WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,

-        const wxString& title = wxEmptyString,
-        bool isPulldown = FALSE);
+        size_t index, 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.
     
     // For popups, need to destroy, then recreate menu for a different (or
     // possibly same) window, since the parent may change.


@@ -81,7 +77,7 @@ public:
     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; }
     


@@ -112,13 +108,13 @@ private:
 // Menu Bar
 // ----------------------------------------------------------------------------
 
 // Menu Bar
 // ----------------------------------------------------------------------------
 

-class wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE 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(int n, wxMenu *menus[], const wxArrayString& 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();
     
     // implement base class (pure) virtuals
     virtual ~wxMenuBar();
     
     // implement base class (pure) virtuals


@@ -158,7 +154,7 @@ public:
     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
     
 public:
     // common part of all ctors