Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more accessors added, member variablesmade private

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-07-23 16:07:05 +00:00
parent ab16f4a300
commit 83885a398b
2 changed files with 192 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
include/wx/gtk/menu.h
View File

@@ -5,7 +5,7 @@
// Created: 01/02/97 // Created: 01/02/97
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -41,19 +41,23 @@ class wxMenu;
class wxMenuBar: public wxWindow class wxMenuBar: public wxWindow
{ {
DECLARE_DYNAMIC_CLASS(wxMenuBar) DECLARE_DYNAMIC_CLASS(wxMenuBar)
public: public:
wxMenuBar();
void Append( wxMenu *menu, const wxString &title );
wxMenuBar(void); int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
void Append( wxMenu *menu, const wxString &title ); wxMenuItem* FindMenuItemById( int id ) const;
int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
wxMenuItem* FindMenuItemById( int id ) const; int GetMenuCount() const { return m_menus.Number(); }
bool IsChecked( int id ) const; wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
bool IsEnabled( int id ) const;
bool IsChecked( int id ) const;
wxList m_menus; bool IsEnabled( int id ) const;
GtkWidget *m_menubar;
wxList m_menus;
GtkWidget *m_menubar;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -62,67 +66,95 @@ class wxMenuBar: public wxWindow
class wxMenuItem: public wxObject class wxMenuItem: public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxMenuItem) DECLARE_DYNAMIC_CLASS(wxMenuItem)
public: public:
wxMenuItem();
wxMenuItem(void);
// accessors
int m_id; // id
wxString m_text; void SetId(int id) { m_id = id; }
bool m_isCheckMenu; int GetId() const { return m_id; }
bool m_checked; bool IsSeparator() const { return m_id == ID_SEPARATOR; }
bool m_isSubMenu;
bool m_isEnabled; // the item's text
wxMenu *m_subMenu; void SetText(const wxString& str);
wxString m_helpStr; const wxString& GetText() const { return m_text; }
GtkWidget *m_menuItem; // GtkMenuItem // what kind of menu item we are
void SetCheckable(bool checkable) { m_isCheckMenu = checkable; }
bool IsCheckable() const { return m_isCheckMenu; } bool IsCheckable() const { return m_isCheckMenu; }
bool IsSeparator() const { return m_id == ID_SEPARATOR; } void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
bool IsEnabled() const { return m_isEnabled; } wxMenu *GetSubMenu() const { return m_subMenu; }
int GetId() const { return m_id; } bool IsSubMenu() const { return m_subMenu != NULL; }
const wxString& GetHelp() const { return m_helpStr; }
wxMenu *GetSubMenu() const { return m_subMenu; } // state
void Enable(bool enable = TRUE) { m_isEnabled = enable; }
void Check( bool check ); bool IsEnabled() const { return m_isEnabled; }
bool IsChecked() const; void Check(bool check = TRUE);
void Enable( bool enable ); bool IsChecked() const;
// help string (displayed in the status bar by default)
void SetHelpString(const wxString& str) { m_helpStr = str; }
// implementation
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
GtkWidget *GetMenuItem() const { return m_menuItem; }
private:
int m_id;
wxString m_text;
bool m_isCheckMenu;
bool m_isChecked;
bool m_isEnabled;
wxMenu *m_subMenu;
wxString m_helpStr;
GtkWidget *m_menuItem; // GtkMenuItem
}; };
class wxMenu: public wxEvtHandler class wxMenu: public wxEvtHandler
{ {
DECLARE_DYNAMIC_CLASS(wxMenu) DECLARE_DYNAMIC_CLASS(wxMenu)
public: public:
// construction
wxMenu( const wxString &title = "" );
wxMenu( const wxString &title = "" ); // operations
void AppendSeparator(void); // menu creation
void Append( int id, const wxString &item, void AppendSeparator();
const wxString &helpStr = "", bool checkable = FALSE ); void Append(int id, const wxString &item,
void Append( int id, const wxString &item, const wxString &helpStr = "", bool checkable = FALSE);
wxMenu *subMenu, const wxString &helpStr = "" ); void Append(int id, const wxString &item,
int FindItem( const wxString itemString ) const; wxMenu *subMenu, const wxString &helpStr = "" );
wxMenuItem* FindItemForId( int id ) const; void Break() {};
void Break(void) {};
void Check(int id, bool Flag);
void Enable( int id, bool enable );
bool Enabled( int id ) const;
void SetLabel( int id, const wxString &label );
public: // find item by name/id
int FindItem( const wxString itemString ) const;
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; wxMenuItem *FindItem(int id) const;
void SetInvokingWindow( wxWindow *win );
wxWindow *GetInvokingWindow(void);
wxString m_title; // get/set item's state
wxList m_items; void Enable( int id, bool enable );
wxWindow *m_invokingWindow; bool IsEnabled( int id ) const;
void Check( int id, bool check );
GtkWidget *m_menu; // GtkMenu bool IsChecked( int id ) const;
void SetLabel( int id, const wxString &label );
// accessors
wxList& GetItems() { return m_items; }
public:
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
void SetInvokingWindow( wxWindow *win );
wxWindow *GetInvokingWindow();
wxString m_title;
wxList m_items;
wxWindow *m_invokingWindow;
GtkWidget *m_menu; // GtkMenu
}; };
#endif // __GTKMENUH__ #endif // __GTKMENUH__

160
include/wx/gtk1/menu.h
View File

@@ -5,7 +5,7 @@
// Created: 01/02/97 // Created: 01/02/97
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -41,19 +41,23 @@ class wxMenu;
class wxMenuBar: public wxWindow class wxMenuBar: public wxWindow
{ {
DECLARE_DYNAMIC_CLASS(wxMenuBar) DECLARE_DYNAMIC_CLASS(wxMenuBar)
public: public:
wxMenuBar();
void Append( wxMenu *menu, const wxString &title );
wxMenuBar(void); int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
void Append( wxMenu *menu, const wxString &title ); wxMenuItem* FindMenuItemById( int id ) const;
int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
wxMenuItem* FindMenuItemById( int id ) const; int GetMenuCount() const { return m_menus.Number(); }
bool IsChecked( int id ) const; wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
bool IsEnabled( int id ) const;
bool IsChecked( int id ) const;
wxList m_menus; bool IsEnabled( int id ) const;
GtkWidget *m_menubar;
wxList m_menus;
GtkWidget *m_menubar;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -62,67 +66,95 @@ class wxMenuBar: public wxWindow
class wxMenuItem: public wxObject class wxMenuItem: public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxMenuItem) DECLARE_DYNAMIC_CLASS(wxMenuItem)
public: public:
wxMenuItem();
wxMenuItem(void);
// accessors
int m_id; // id
wxString m_text; void SetId(int id) { m_id = id; }
bool m_isCheckMenu; int GetId() const { return m_id; }
bool m_checked; bool IsSeparator() const { return m_id == ID_SEPARATOR; }
bool m_isSubMenu;
bool m_isEnabled; // the item's text
wxMenu *m_subMenu; void SetText(const wxString& str);
wxString m_helpStr; const wxString& GetText() const { return m_text; }
GtkWidget *m_menuItem; // GtkMenuItem // what kind of menu item we are
void SetCheckable(bool checkable) { m_isCheckMenu = checkable; }
bool IsCheckable() const { return m_isCheckMenu; } bool IsCheckable() const { return m_isCheckMenu; }
bool IsSeparator() const { return m_id == ID_SEPARATOR; } void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
bool IsEnabled() const { return m_isEnabled; } wxMenu *GetSubMenu() const { return m_subMenu; }
int GetId() const { return m_id; } bool IsSubMenu() const { return m_subMenu != NULL; }
const wxString& GetHelp() const { return m_helpStr; }
wxMenu *GetSubMenu() const { return m_subMenu; } // state
void Enable(bool enable = TRUE) { m_isEnabled = enable; }
void Check( bool check ); bool IsEnabled() const { return m_isEnabled; }
bool IsChecked() const; void Check(bool check = TRUE);
void Enable( bool enable ); bool IsChecked() const;
// help string (displayed in the status bar by default)
void SetHelpString(const wxString& str) { m_helpStr = str; }
// implementation
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
GtkWidget *GetMenuItem() const { return m_menuItem; }
private:
int m_id;
wxString m_text;
bool m_isCheckMenu;
bool m_isChecked;
bool m_isEnabled;
wxMenu *m_subMenu;
wxString m_helpStr;
GtkWidget *m_menuItem; // GtkMenuItem
}; };
class wxMenu: public wxEvtHandler class wxMenu: public wxEvtHandler
{ {
DECLARE_DYNAMIC_CLASS(wxMenu) DECLARE_DYNAMIC_CLASS(wxMenu)
public: public:
// construction
wxMenu( const wxString &title = "" );
wxMenu( const wxString &title = "" ); // operations
void AppendSeparator(void); // menu creation
void Append( int id, const wxString &item, void AppendSeparator();
const wxString &helpStr = "", bool checkable = FALSE ); void Append(int id, const wxString &item,
void Append( int id, const wxString &item, const wxString &helpStr = "", bool checkable = FALSE);
wxMenu *subMenu, const wxString &helpStr = "" ); void Append(int id, const wxString &item,
int FindItem( const wxString itemString ) const; wxMenu *subMenu, const wxString &helpStr = "" );
wxMenuItem* FindItemForId( int id ) const; void Break() {};
void Break(void) {};
void Check(int id, bool Flag);
void Enable( int id, bool enable );
bool Enabled( int id ) const;
void SetLabel( int id, const wxString &label );
public: // find item by name/id
int FindItem( const wxString itemString ) const;
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; wxMenuItem *FindItem(int id) const;
void SetInvokingWindow( wxWindow *win );
wxWindow *GetInvokingWindow(void);
wxString m_title; // get/set item's state
wxList m_items; void Enable( int id, bool enable );
wxWindow *m_invokingWindow; bool IsEnabled( int id ) const;
void Check( int id, bool check );
GtkWidget *m_menu; // GtkMenu bool IsChecked( int id ) const;
void SetLabel( int id, const wxString &label );
// accessors
wxList& GetItems() { return m_items; }
public:
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
void SetInvokingWindow( wxWindow *win );
wxWindow *GetInvokingWindow();
wxString m_title;
wxList m_items;
wxWindow *m_invokingWindow;
GtkWidget *m_menu; // GtkMenu
}; };
#endif // __GTKMENUH__ #endif // __GTKMENUH__