projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing wxUSE_CRASHREPORT
[wxWidgets.git]
/
include
/
wx
/
gtk
/
menu.h
diff --git
a/include/wx/gtk/menu.h
b/include/wx/gtk/menu.h
index 9af8379c5a0f1eeb74ffccc31582c6a5da1e52d5..e28b4477e7f26fb06a5d5e7458cd31f4705ebbe7 100644
(file)
--- a/
include/wx/gtk/menu.h
+++ b/
include/wx/gtk/menu.h
@@
-24,7
+24,7
@@
public:
// ctors
wxMenuBar();
wxMenuBar(long style);
// ctors
wxMenuBar();
wxMenuBar(long style);
- wxMenuBar(
int n, wxMenu *menus[], const wxString titles[]
);
+ wxMenuBar(
size_t n, wxMenu *menus[], const wxString titles[], long style = 0
);
virtual ~wxMenuBar();
// implement base class (pure) virtuals
virtual ~wxMenuBar();
// implement base class (pure) virtuals
@@
-46,15
+46,18
@@
public:
void UnsetInvokingWindow( wxWindow *win );
// common part of Append and Insert
void UnsetInvokingWindow( wxWindow *win );
// common part of Append and Insert
- bool GtkAppend(wxMenu *menu, const wxString& title);
+ bool GtkAppend(wxMenu *menu, const wxString& title
, int pos=-1
);
+#ifndef __WXGTK20__
GtkAccelGroup *m_accel;
GtkAccelGroup *m_accel;
- GtkItemFactory *m_factory;
+#endif
GtkWidget *m_menubar;
long m_style;
wxWindow *m_invokingWindow;
private:
GtkWidget *m_menubar;
long m_style;
wxWindow *m_invokingWindow;
private:
+ void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+
DECLARE_DYNAMIC_CLASS(wxMenuBar)
};
DECLARE_DYNAMIC_CLASS(wxMenuBar)
};
@@
-87,18
+90,15
@@
public:
GtkWidget *m_menu; // GtkMenu
GtkWidget *m_owner;
GtkAccelGroup *m_accel;
GtkWidget *m_menu; // GtkMenu
GtkWidget *m_owner;
GtkAccelGroup *m_accel;
- GtkItemFactory *m_factory;
private:
// common code for all constructors:
void Init();
private:
// common code for all constructors:
void Init();
- // common part of Append and Insert
- bool GtkAppend(wxMenuItem *item);
+ // common part of Append
(if pos == -1)
and Insert
+ bool GtkAppend(wxMenuItem *item
, int pos=-1
);
- // if the last menu item was a radio one, this field contains its path,
- // otherwise it is empty
- wxString m_pathLastRadio;
+ GtkWidget *m_prevRadio;
DECLARE_DYNAMIC_CLASS(wxMenu)
};
DECLARE_DYNAMIC_CLASS(wxMenu)
};