adding 10.4 build compatibility for osx cocoa, see #10361

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index eda3f5a5b16c6f67654afc84d5280afd4c5eb12f..63692e98b02d0db1e984cea8e94ac139c645cd53 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKMENUH__
-#define __GTKMENUH__
+#ifndef _WX_GTKMENU_H_
+#define _WX_GTKMENU_H_

 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 
 //-----------------------------------------------------------------------------
 // wxMenuBar


@@ -50,14 +50,13 @@ public:
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 

+private:

     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
     GtkWidget       *m_menubar;
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
     GtkWidget       *m_menubar;

-    long             m_style;

     wxWindow        *m_invokingWindow;
 
     wxWindow        *m_invokingWindow;
 

-private:

     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)


@@ -85,13 +84,11 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
 
     // TODO: virtual void SetTitle(const wxString& title);
 

-    // implementation
-    int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
-

     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;

+    bool m_popupShown;

 
 protected:
     virtual wxMenuItem* DoAppend(wxMenuItem *item);
 
 protected:
     virtual wxMenuItem* DoAppend(wxMenuItem *item);


@@ -111,4 +108,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-    // __GTKMENUH__
+    // _WX_GTKMENU_H_