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

wxMenu and wxMenuBar modifications: now works much better with owner-drawn

Browse Source 
items, better encapsulation (the wxMenu data members are no longer public),
simplified wxFrame and derived classes by moving the common parts into
member functions of wxMenuBar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-03 22:25:12 +00:00
parent 14531b30fe
commit c2dcfdef63
7 changed files with 666 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/wx/msw/menu.h
View File

@@ -129,10 +129,13 @@ public:
// get the menu handle
WXHMENU GetHMenu() const;
private:
bool m_doBreak ;
// only for wxMenuBar
void Attach(wxMenuBar *menubar);
void Detach();
private:
bool m_doBreak;
public:
// This is used when m_hMenu is NULL because we don't want to
// delete it in ~wxMenu (it's been added to a parent menu).
// But we'll still need the handle for other purposes.
@@ -162,12 +165,16 @@ class WXDLLEXPORT wxMenuBar : public wxEvtHandler
public:
// ctors & dtor
// default constructor
wxMenuBar();
// unused under MSW
wxMenuBar(long style);
// menubar takes ownership of the menus arrays but copies the titles
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
virtual ~wxMenuBar();
// menubar construction
WXHMENU Create();
void Append(wxMenu *menu, const wxString& title);
virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */
@@ -195,7 +202,8 @@ public:
void SetLabelTop(int pos, const wxString& label) ;
wxString GetLabelTop(int pos) const ;
// notifications
// notifications: return FALSE to prevent the menu from being
// appended/deleted
virtual bool OnAppend(wxMenu *menu, const char *title);
virtual bool OnDelete(wxMenu *menu, int index);
@@ -221,13 +229,35 @@ public:
bool Checked(int id) const { return IsChecked(id); }
#endif // WXWIN_COMPATIBILITY
public:
wxEvtHandler * m_eventHandler;
int m_menuCount;
wxMenu ** m_menus;
wxString * m_titles;
wxFrame * m_menuBarFrame;
WXHMENU m_hMenu;
// IMPLEMENTATION
// returns TRUE if we're attached to a frame
bool IsAttached() const { return m_menuBarFrame != NULL; }
// get the frame we live in
wxFrame *GetFrame() const { return m_menuBarFrame; }
// attach to a frame
void Attach(wxFrame *frame)
{
wxASSERT_MSG( !m_menuBarFrame, "menubar already attached!" );
m_menuBarFrame = frame;
}
// get the menu handle
WXHMENU GetHMenu() const { return m_hMenu; }
protected:
// common part of all ctors
void Init();
// if the menubar is modified, the display is not updated automatically,
// call this function to update it (m_menuBarFrame should be !NULL)
void Refresh();
wxEvtHandler *m_eventHandler;
int m_menuCount;
wxMenu **m_menus;
wxString *m_titles;
wxFrame *m_menuBarFrame;
WXHMENU m_hMenu;
};
#endif // _WX_MENU_H_

11
include/wx/msw/menuitem.h
View File

@@ -55,15 +55,20 @@ public:
// accessors (some more are inherited from wxOwnerDrawn or are below)
bool IsSeparator() const { return m_idItem == ID_SEPARATOR; }
bool IsEnabled() const { return m_bEnabled; }
bool IsChecked() const { return m_bChecked; }
bool IsEnabled() const { return m_bEnabled; }
bool IsChecked() const { return m_bChecked; }
bool IsSubMenu() const { return GetSubMenu() != NULL; }
int GetId() const { return m_idItem; }
const wxString& GetHelp() const { return m_strHelp; }
wxMenu *GetSubMenu() const { return m_pSubMenu; }
// the id for a popup menu is really its menu handle (as required by
// ::AppendMenu() API)
int GetRealId() const;
// operations
void SetName(const wxString& strName) { m_strName = strName; }
void SetName(const wxString& strName);
void SetHelp(const wxString& strHelp) { m_strHelp = strHelp; }
void Enable(bool bDoEnable = TRUE);

55
include/wx/ownerdrw.h
View File

@@ -16,8 +16,6 @@
#pragma interface "ownerdrw.h"
#endif
// No, don't do this: BC++ 5 complains that size_t already been defined.
// typedef unsigned int size_t;
#include <stddef.h>
// ----------------------------------------------------------------------------
@@ -34,34 +32,34 @@ public:
// ctor & dtor
wxOwnerDrawn(const wxString& str = "",
bool bCheckable = FALSE,
bool bMenuItem = FALSE); // @@ kludge for colors
bool bMenuItem = FALSE); // FIXME kludge for colors
virtual ~wxOwnerDrawn() { }
// fix appearance
inline void SetFont(const wxFont& font)
{ m_font = font; m_bOwnerDrawn = TRUE; }
void SetFont(const wxFont& font)
{ m_font = font; m_bOwnerDrawn = TRUE; }
inline wxFont& GetFont() const { return (wxFont &)m_font; }
wxFont& GetFont() const { return (wxFont &)m_font; }
inline void SetTextColour(const wxColour& colText)
{ m_colText = colText; m_bOwnerDrawn = TRUE; }
void SetTextColour(const wxColour& colText)
{ m_colText = colText; m_bOwnerDrawn = TRUE; }
inline wxColour& GetTextColour() const { return (wxColour&) m_colText; }
wxColour& GetTextColour() const { return (wxColour&) m_colText; }
inline void SetBackgroundColour(const wxColour& colBack)
{ m_colBack = colBack; m_bOwnerDrawn = TRUE; }
void SetBackgroundColour(const wxColour& colBack)
{ m_colBack = colBack; m_bOwnerDrawn = TRUE; }
inline wxColour& GetBackgroundColour() const
{ return (wxColour&) m_colBack ; }
wxColour& GetBackgroundColour() const
{ return (wxColour&) m_colBack ; }
inline void SetBitmaps(const wxBitmap& bmpChecked,
const wxBitmap& bmpUnchecked = wxNullBitmap)
{ m_bmpChecked = bmpChecked;
m_bmpUnchecked = bmpUnchecked;
m_bOwnerDrawn = TRUE; }
void SetBitmaps(const wxBitmap& bmpChecked,
const wxBitmap& bmpUnchecked = wxNullBitmap)
{ m_bmpChecked = bmpChecked;
m_bmpUnchecked = bmpUnchecked;
m_bOwnerDrawn = TRUE; }
inline const wxBitmap& GetBitmap(bool bChecked = TRUE) const
{ return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
const wxBitmap& GetBitmap(bool bChecked = TRUE) const
{ return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
// the height of the menu checkmark (or bitmap) is determined by the font
// for the current item, but the width should be always the same (for the
@@ -69,12 +67,15 @@ public:
// the last item (and default width for the first one).
//
// NB: default is too small for bitmaps, but ok for checkmarks.
inline void SetMarginWidth(int nWidth)
{ ms_nLastMarginWidth = m_nMarginWidth = (size_t) nWidth;
if ( ((size_t) nWidth) != ms_nDefaultMarginWidth ) m_bOwnerDrawn = TRUE; }
void SetMarginWidth(int nWidth)
{
ms_nLastMarginWidth = m_nMarginWidth = (size_t) nWidth;
if ( ((size_t) nWidth) != ms_nDefaultMarginWidth )
m_bOwnerDrawn = TRUE;
}
inline int GetMarginWidth() const { return (int) m_nMarginWidth; }
inline static int GetDefaultMarginWidth() { return (int) ms_nDefaultMarginWidth; }
int GetMarginWidth() const { return (int) m_nMarginWidth; }
static int GetDefaultMarginWidth() { return (int) ms_nDefaultMarginWidth; }
// accessors
void SetName(const wxString& strName) { m_strName = strName; }
@@ -86,8 +87,8 @@ public:
// to be owner-drawn. Moreover, you can force owner-drawn to FALSE if you
// want to change, say, the color for the item but only if it is owner-drawn
// (see wxMenuItem::wxMenuItem for example)
inline bool IsOwnerDrawn() const { return m_bOwnerDrawn; }
inline void ResetOwnerDrawn() { m_bOwnerDrawn = FALSE; }
bool IsOwnerDrawn() const { return m_bOwnerDrawn; }
void ResetOwnerDrawn() { m_bOwnerDrawn = FALSE; }
public:
// constants used in OnDrawItem