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

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

@@ -129,10 +129,13 @@ public:
// get the menu handle // get the menu handle
WXHMENU GetHMenu() const; WXHMENU GetHMenu() const;
// only for wxMenuBar
void Attach(wxMenuBar *menubar);
void Detach();
private: private:
bool m_doBreak; bool m_doBreak;
public:
// This is used when m_hMenu is NULL because we don't want to // 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). // delete it in ~wxMenu (it's been added to a parent menu).
// But we'll still need the handle for other purposes. // But we'll still need the handle for other purposes.
@@ -162,12 +165,16 @@ class WXDLLEXPORT wxMenuBar : public wxEvtHandler
public: public:
// ctors & dtor // ctors & dtor
// default constructor
wxMenuBar(); wxMenuBar();
// unused under MSW
wxMenuBar(long style); wxMenuBar(long style);
// menubar takes ownership of the menus arrays but copies the titles
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
virtual ~wxMenuBar(); virtual ~wxMenuBar();
// menubar construction // menubar construction
WXHMENU Create();
void Append(wxMenu *menu, const wxString& title); void Append(wxMenu *menu, const wxString& title);
virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */ virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */
@@ -195,7 +202,8 @@ public:
void SetLabelTop(int pos, const wxString& label) ; void SetLabelTop(int pos, const wxString& label) ;
wxString GetLabelTop(int pos) const ; 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 OnAppend(wxMenu *menu, const char *title);
virtual bool OnDelete(wxMenu *menu, int index); virtual bool OnDelete(wxMenu *menu, int index);
@@ -221,7 +229,29 @@ public:
bool Checked(int id) const { return IsChecked(id); } bool Checked(int id) const { return IsChecked(id); }
#endif // WXWIN_COMPATIBILITY #endif // WXWIN_COMPATIBILITY
public: // 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; wxEvtHandler *m_eventHandler;
int m_menuCount; int m_menuCount;
wxMenu **m_menus; wxMenu **m_menus;

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

@@ -57,13 +57,18 @@ public:
bool IsSeparator() const { return m_idItem == ID_SEPARATOR; } bool IsSeparator() const { return m_idItem == ID_SEPARATOR; }
bool IsEnabled() const { return m_bEnabled; } bool IsEnabled() const { return m_bEnabled; }
bool IsChecked() const { return m_bChecked; } bool IsChecked() const { return m_bChecked; }
bool IsSubMenu() const { return GetSubMenu() != NULL; }
int GetId() const { return m_idItem; } int GetId() const { return m_idItem; }
const wxString& GetHelp() const { return m_strHelp; } const wxString& GetHelp() const { return m_strHelp; }
wxMenu *GetSubMenu() const { return m_pSubMenu; } 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 // operations
void SetName(const wxString& strName) { m_strName = strName; } void SetName(const wxString& strName);
void SetHelp(const wxString& strHelp) { m_strHelp = strHelp; } void SetHelp(const wxString& strHelp) { m_strHelp = strHelp; }
void Enable(bool bDoEnable = TRUE); void Enable(bool bDoEnable = TRUE);

37
include/wx/ownerdrw.h
View File

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

35
src/msw/frame.cpp
View File

@@ -455,42 +455,23 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
return; return;
} }
if (menu_bar->m_menuBarFrame) wxCHECK_RET( !menu_bar->GetFrame(), "this menubar is already attached" );
return;
int i;
HMENU menu = CreateMenu();
for (i = 0; i < menu_bar->m_menuCount; i ++)
{
HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu;
//
// After looking Bounds Checker result, it seems that all
// menus must be individually destroyed. So, don't reset m_hMenu,
// to allow ~wxMenu to do the job.
//
menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup;
// Uncommenting for the moment... JACS
menu_bar->m_menus[i]->m_hMenu = 0;
AppendMenu(menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]);
}
menu_bar->m_hMenu = (WXHMENU)menu;
if (m_frameMenuBar) if (m_frameMenuBar)
delete m_frameMenuBar; delete m_frameMenuBar;
this->m_hMenu = (WXHMENU) menu; m_hMenu = menu_bar->Create();
DWORD err = 0; if ( !m_hMenu )
if (!SetMenu((HWND) GetHWND(), menu)) return;
if ( !::SetMenu((HWND)GetHWND(), (HMENU)m_hMenu) )
{ {
#ifdef __WIN32__ wxLogLastError("SetMenu");
err = GetLastError();
#endif
} }
m_frameMenuBar = menu_bar; m_frameMenuBar = menu_bar;
menu_bar->m_menuBarFrame = this; menu_bar->Attach(this);
} }
#if 0 #if 0

92
src/msw/mdi.cpp
View File

@@ -77,7 +77,7 @@ END_EVENT_TABLE()
#endif #endif
wxMDIParentFrame::wxMDIParentFrame(void) wxMDIParentFrame::wxMDIParentFrame()
{ {
m_clientWindow = NULL; m_clientWindow = NULL;
m_currentChild = NULL; m_currentChild = NULL;
@@ -149,7 +149,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
return TRUE; return TRUE;
} }
wxMDIParentFrame::~wxMDIParentFrame(void) wxMDIParentFrame::~wxMDIParentFrame()
{ {
DestroyChildren(); DestroyChildren();
@@ -195,40 +195,23 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
return; return;
} }
if (menu_bar->m_menuBarFrame) if ( menu_bar->IsAttached() )
return; return;
int i; m_hMenu = menu_bar->Create();
HMENU menu = CreateMenu();
for (i = 0; i < menu_bar->m_menuCount; i ++)
{
HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu;
//
// After looking Bounds Checker result, it seems that all
// menus must be individually destroyed. So, don't reset m_hMenu,
// to allow ~wxMenu to do the job.
//
menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup;
// Uncommenting for the moment... JACS
menu_bar->m_menus[i]->m_hMenu = (WXHMENU) NULL;
AppendMenu(menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]);
}
menu_bar->m_hMenu = (WXHMENU)menu;
if (m_frameMenuBar) if (m_frameMenuBar)
delete m_frameMenuBar; delete m_frameMenuBar;
this->m_hMenu = (WXHMENU) menu;
// MDI parent-specific code follows // MDI parent-specific code follows
HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0); HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
// Try to insert Window menu in front of Help, otherwise append it. // Try to insert Window menu in front of Help, otherwise append it.
HMENU menu = (HMENU)m_hMenu;
int N = GetMenuItemCount(menu); int N = GetMenuItemCount(menu);
bool success = FALSE; bool success = FALSE;
for (i = 0; i < N; i++) for (int i = 0; i < N; i++)
{ {
char buf[100]; char buf[100];
int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION); int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION);
@@ -257,7 +240,7 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
DrawMenuBar((HWND) GetHWND()); DrawMenuBar((HWND) GetHWND());
m_frameMenuBar = menu_bar; m_frameMenuBar = menu_bar;
menu_bar->m_menuBarFrame = this; menu_bar->Attach(this);
} }
void wxMDIParentFrame::OnSize(wxSizeEvent& event) void wxMDIParentFrame::OnSize(wxSizeEvent& event)
@@ -290,7 +273,7 @@ void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
} }
// Returns the active MDI child window // Returns the active MDI child window
wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
{ {
// HWND hWnd = (HWND)LOWORD(SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L)); // HWND hWnd = (HWND)LOWORD(SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L));
HWND hWnd = (HWND)SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L); HWND hWnd = (HWND)SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L);
@@ -302,7 +285,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
// Create the client window class (don't Create the window, // Create the client window class (don't Create the window,
// just return a new class) // just return a new class)
wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void) wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
{ {
return new wxMDIClientWindow ; return new wxMDIClientWindow ;
} }
@@ -329,27 +312,27 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
} }
// MDI operations // MDI operations
void wxMDIParentFrame::Cascade(void) void wxMDIParentFrame::Cascade()
{ {
::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDICASCADE, 0, 0); ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDICASCADE, 0, 0);
} }
void wxMDIParentFrame::Tile(void) void wxMDIParentFrame::Tile()
{ {
::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDITILE, MDITILE_HORIZONTAL, 0); ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDITILE, MDITILE_HORIZONTAL, 0);
} }
void wxMDIParentFrame::ArrangeIcons(void) void wxMDIParentFrame::ArrangeIcons()
{ {
::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDIICONARRANGE, 0, 0); ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDIICONARRANGE, 0, 0);
} }
void wxMDIParentFrame::ActivateNext(void) void wxMDIParentFrame::ActivateNext()
{ {
::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 0); ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 0);
} }
void wxMDIParentFrame::ActivatePrevious(void) void wxMDIParentFrame::ActivatePrevious()
{ {
::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 1); ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 1);
} }
@@ -358,13 +341,13 @@ void wxMDIParentFrame::ActivatePrevious(void)
/* /*
// Returns a style for the client window - usually 0 // Returns a style for the client window - usually 0
// or, for example, wxHSCROLL | wxVSCROLL // or, for example, wxHSCROLL | wxVSCROLL
long wxMDIParentFrame::GetClientStyle(void) const long wxMDIParentFrame::GetClientStyle() const
{ {
return wxHSCROLL | wxVSCROLL ; return wxHSCROLL | wxVSCROLL ;
} }
*/ */
bool wxMDIParentFrame::MSWOnDestroy(void) bool wxMDIParentFrame::MSWOnDestroy()
{ {
return FALSE; return FALSE;
} }
@@ -583,7 +566,7 @@ bool wxMDIParentFrame::MSWOnEraseBkgnd(WXHDC WXUNUSED(pDC))
extern wxWindow *wxWndHook; extern wxWindow *wxWndHook;
extern wxList *wxWinHandleList; extern wxList *wxWinHandleList;
wxMDIChildFrame::wxMDIChildFrame(void) wxMDIChildFrame::wxMDIChildFrame()
{ {
// m_active = FALSE; // m_active = FALSE;
} }
@@ -670,7 +653,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
return TRUE; return TRUE;
} }
wxMDIChildFrame::~wxMDIChildFrame(void) wxMDIChildFrame::~wxMDIChildFrame()
{ {
MSWDestroyWindow(); MSWDestroyWindow();
@@ -743,41 +726,24 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
return; return;
} }
if (menu_bar->m_menuBarFrame) if ( menu_bar->IsAttached() )
return; return;
int i; m_hMenu = menu_bar->Create();
HMENU menu = CreateMenu();
for (i = 0; i < menu_bar->m_menuCount; i ++)
{
HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu;
//
// After looking Bounds Checker result, it seems that all
// menus must be individually destroyed. So, don't reset m_hMenu,
// to allow ~wxMenu to do the job.
//
menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup;
// Uncommenting for the moment... JACS
menu_bar->m_menus[i]->m_hMenu = 0;
::AppendMenu((HMENU) menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]);
}
menu_bar->m_hMenu = (WXHMENU)menu;
if (m_frameMenuBar) if (m_frameMenuBar)
delete m_frameMenuBar; delete m_frameMenuBar;
this->m_hMenu = (WXHMENU) menu;
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
parent->m_parentFrameActive = FALSE; parent->m_parentFrameActive = FALSE;
HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0); HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
// Try to insert Window menu in front of Help, otherwise append it. // Try to insert Window menu in front of Help, otherwise append it.
HMENU menu = (HMENU)m_hMenu;
int N = GetMenuItemCount(menu); int N = GetMenuItemCount(menu);
bool success = FALSE; bool success = FALSE;
for (i = 0; i < N; i++) for (int i = 0; i < N; i++)
{ {
char buf[100]; char buf[100];
int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION); int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION);
@@ -805,25 +771,25 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
DrawMenuBar((HWND) parent->GetHWND()); DrawMenuBar((HWND) parent->GetHWND());
m_frameMenuBar = menu_bar; m_frameMenuBar = menu_bar;
menu_bar->m_menuBarFrame = this; menu_bar->Attach(this);
} }
// MDI operations // MDI operations
void wxMDIChildFrame::Maximize(void) void wxMDIChildFrame::Maximize()
{ {
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
if ( parent && parent->GetClientWindow() ) if ( parent && parent->GetClientWindow() )
::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIMAXIMIZE, (WPARAM) (HWND) GetHWND(), 0); ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIMAXIMIZE, (WPARAM) (HWND) GetHWND(), 0);
} }
void wxMDIChildFrame::Restore(void) void wxMDIChildFrame::Restore()
{ {
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
if ( parent && parent->GetClientWindow() ) if ( parent && parent->GetClientWindow() )
::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIRESTORE, (WPARAM) (HWND) GetHWND(), 0); ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIRESTORE, (WPARAM) (HWND) GetHWND(), 0);
} }
void wxMDIChildFrame::Activate(void) void wxMDIChildFrame::Activate()
{ {
wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
if ( parent && parent->GetClientWindow() ) if ( parent && parent->GetClientWindow() )
@@ -991,7 +957,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
return 0; return 0;
} }
void wxMDIChildFrame::MSWDestroyWindow(void) void wxMDIChildFrame::MSWDestroyWindow()
{ {
MSWDetachWindowMenu(); MSWDetachWindowMenu();
invalidHandle = (HWND) GetHWND(); invalidHandle = (HWND) GetHWND();
@@ -1083,13 +1049,13 @@ void wxMDIChildFrame::MSWOnWindowPosChanging(void *pos)
} }
// Client window // Client window
wxMDIClientWindow::wxMDIClientWindow(void) wxMDIClientWindow::wxMDIClientWindow()
{ {
m_scrollX = 0; m_scrollX = 0;
m_scrollY = 0; m_scrollY = 0;
} }
wxMDIClientWindow::~wxMDIClientWindow(void) wxMDIClientWindow::~wxMDIClientWindow()
{ {
} }

651
src/msw/menu.cpp
View File

@@ -9,6 +9,14 @@
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// declarations
// ===========================================================================
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "menu.h" #pragma implementation "menu.h"
#endif #endif
@@ -60,7 +68,7 @@ static const int idMenuTitle = -2;
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
#endif #endif
// convenience macro // convenience macros
#define GetHMENU() ((HMENU)GetHMenu()) #define GetHMENU() ((HMENU)GetHMenu())
#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu()) #define GetHMenuOf(menu) ((HMENU)menu->GetHMenu())
@@ -68,7 +76,9 @@ static const int idMenuTitle = -2;
// implementation // implementation
// ============================================================================ // ============================================================================
// Menus // ---------------------------------------------------------------------------
// wxMenu construction, adding and removing menu items
// ---------------------------------------------------------------------------
// Construct a menu with optional title (then use append) // Construct a menu with optional title (then use append)
wxMenu::wxMenu(const wxString& title, const wxFunction func) wxMenu::wxMenu(const wxString& title, const wxFunction func)
@@ -91,37 +101,22 @@ wxMenu::wxMenu(const wxString& title, const wxFunction func)
AppendSeparator() ; AppendSeparator() ;
} }
#if WXWIN_COMPATIBILITY
Callback(func); Callback(func);
#endif
} }
// The wxWindow destructor will take care of deleting the submenus. // The wxWindow destructor will take care of deleting the submenus.
wxMenu::~wxMenu() wxMenu::~wxMenu()
{ {
// free Windows resources
if ( m_hMenu ) if ( m_hMenu )
DestroyMenu((HMENU) m_hMenu); {
::DestroyMenu((HMENU)m_hMenu);
m_hMenu = 0; m_hMenu = 0;
}
// Windows seems really bad on Menu de-allocation... // delete submenus
// After many try, here is what I do: RemoveMenu() will ensure
// that popup are "disconnected" from their parent; then call
// delete method on each child (which in turn do a recursive job),
// and finally, DestroyMenu()
//
// With that, BoundCheckers is happy, and no complaints...
/*
int N = 0 ;
if (m_hMenu)
N = GetMenuItemCount(m_hMenu);
int i;
for (i = N-1; i >= 0; i--)
RemoveMenu(m_hMenu, i, MF_BYPOSITION);
*/
// How is deleting submenus in this loop any different from deleting
// the submenus in the children list, via ~wxWindow ?
// I'll reinstate this deletion for now and remove addition
// from children list (which doesn't exist now)
// Julian 1/3/97
wxNode *node = m_menuItems.First(); wxNode *node = m_menuItems.First();
while ( node ) while ( node )
{ {
@@ -130,7 +125,7 @@ wxMenu::~wxMenu()
// Delete child menus. // Delete child menus.
// Beware: they must not be appended to children list!!! // Beware: they must not be appended to children list!!!
// (because order of delete is significant) // (because order of delete is significant)
if (item->GetSubMenu()) if ( item->IsSubMenu() )
item->DeleteSubMenu(); item->DeleteSubMenu();
wxNode *next = node->Next(); wxNode *next = node->Next();
@@ -138,11 +133,6 @@ wxMenu::~wxMenu()
delete node; delete node;
node = next; node = next;
} }
/*
if (m_hMenu)
DestroyMenu(m_hMenu);
m_hMenu = 0;
*/
} }
void wxMenu::Break() void wxMenu::Break()
@@ -155,10 +145,10 @@ void wxMenu::Append(wxMenuItem *pItem)
{ {
wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
m_menuItems.Append(pItem);
UINT flags = 0; UINT flags = 0;
// if "Break" has just been called, insert a menu break before this item
// (and don't forget to reset the flag)
if ( m_doBreak ) { if ( m_doBreak ) {
flags |= MF_MENUBREAK; flags |= MF_MENUBREAK;
m_doBreak = FALSE; m_doBreak = FALSE;
@@ -168,18 +158,18 @@ void wxMenu::Append(wxMenuItem *pItem)
flags |= MF_SEPARATOR; flags |= MF_SEPARATOR;
} }
// id is the numeric id for normal menu items and HMENU for submenus // id is the numeric id for normal menu items and HMENU for submenus as
// required by ::AppendMenu() API
UINT id; UINT id;
wxMenu *SubMenu = pItem->GetSubMenu(); wxMenu *submenu = pItem->GetSubMenu();
if ( SubMenu != NULL ) { if ( submenu != NULL ) {
wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL ); wxASSERT( submenu->GetHMenu() != (WXHMENU) NULL );
id = (UINT)SubMenu->m_hMenu; id = (UINT)submenu->GetHMenu();
submenu->m_topLevelMenu = m_topLevelMenu;
SubMenu->m_topLevelMenu = m_topLevelMenu; submenu->m_parent = this;
SubMenu->m_parent = this; submenu->m_savehMenu = (WXHMENU)id;
SubMenu->m_savehMenu = (WXHMENU)id; submenu->m_hMenu = 0;
SubMenu->m_hMenu = 0;
flags |= MF_POPUP; flags |= MF_POPUP;
} }
@@ -209,13 +199,16 @@ void wxMenu::Append(wxMenuItem *pItem)
// TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face
} }
if ( !AppendMenu(GetHMENU(), flags, id, pData) ) if ( !::AppendMenu(GetHMENU(), flags, id, pData) )
{ {
wxLogLastError("AppendMenu"); wxLogLastError("AppendMenu");
} }
else
{
m_menuItems.Append(pItem);
m_noItems++; m_noItems++;
} }
}
void wxMenu::AppendSeparator() void wxMenu::AppendSeparator()
{ {
@@ -223,20 +216,25 @@ void wxMenu::AppendSeparator()
} }
// Pullright item // Pullright item
void wxMenu::Append(int id, const wxString& label, void wxMenu::Append(int id,
wxMenu *SubMenu, const wxString& helpString) const wxString& label,
wxMenu *SubMenu,
const wxString& helpString)
{ {
Append(new wxMenuItem(this, id, label, helpString, FALSE, SubMenu)); Append(new wxMenuItem(this, id, label, helpString, FALSE, SubMenu));
} }
// Ordinary menu item // Ordinary menu item
void wxMenu::Append(int id, const wxString& label, void wxMenu::Append(int id,
const wxString& helpString, bool checkable) const wxString& label,
const wxString& helpString,
bool checkable)
{ {
// 'checkable' parameter is useless for Windows. // 'checkable' parameter is useless for Windows.
Append(new wxMenuItem(this, id, label, helpString, checkable)); Append(new wxMenuItem(this, id, label, helpString, checkable));
} }
// delete item by id
void wxMenu::Delete(int id) void wxMenu::Delete(int id)
{ {
wxMenuItem *item = NULL; wxMenuItem *item = NULL;
@@ -274,6 +272,10 @@ void wxMenu::Delete(int id)
delete item; delete item;
} }
// ---------------------------------------------------------------------------
// wxMenu functions implemented in wxMenuItem
// ---------------------------------------------------------------------------
void wxMenu::Enable(int id, bool Flag) void wxMenu::Enable(int id, bool Flag)
{ {
wxMenuItem *item = FindItemForId(id); wxMenuItem *item = FindItemForId(id);
@@ -306,6 +308,51 @@ bool wxMenu::IsChecked(int id) const
return item->IsChecked(); return item->IsChecked();
} }
void wxMenu::SetLabel(int id, const wxString& label)
{
wxMenuItem *item = FindItemForId(id) ;
wxCHECK_RET( item, "wxMenu::SetLabel: no such item" );
item->SetName(label);
}
wxString wxMenu::GetLabel(int id) const
{
wxString label;
wxMenuItem *pItem = FindItemForId(id) ;
if (pItem)
label = pItem->GetName() ;
else
wxFAIL_MSG("wxMenu::GetLabel: item doesn't exist");
return label;
}
void wxMenu::SetHelpString(int itemId, const wxString& helpString)
{
wxMenuItem *item = FindItemForId (itemId);
if (item)
item->SetHelp(helpString);
else
wxFAIL_MSG("wxMenu::SetHelpString: item doesn't exist");
}
wxString wxMenu::GetHelpString (int itemId) const
{
wxString help;
wxMenuItem *item = FindItemForId (itemId);
if (item)
help = item->GetHelp();
else
wxFAIL_MSG("wxMenu::GetHelpString: item doesn't exist");
return help;
}
// ---------------------------------------------------------------------------
// wxMenu title
// ---------------------------------------------------------------------------
void wxMenu::SetTitle(const wxString& label) void wxMenu::SetTitle(const wxString& label)
{ {
bool hasNoTitle = m_title.IsEmpty(); bool hasNoTitle = m_title.IsEmpty();
@@ -370,51 +417,9 @@ const wxString wxMenu::GetTitle() const
return m_title; return m_title;
} }
void wxMenu::SetLabel(int id, const wxString& label) // ---------------------------------------------------------------------------
{ // event processing
wxMenuItem *item = FindItemForId(id) ; // ---------------------------------------------------------------------------
if (item==NULL)
return;
if (item->GetSubMenu()==NULL)
{
HMENU hMenu = GetHMENU();
UINT was_flag = GetMenuState(hMenu, id, MF_BYCOMMAND);
ModifyMenu(hMenu, id, MF_BYCOMMAND | MF_STRING | was_flag, id, label);
}
else
{
wxMenu *father = item->GetSubMenu()->m_topLevelMenu ;
wxNode *node = father->m_menuItems.First() ;
int i = 0 ;
while (node)
{
wxMenuItem *matched = (wxMenuItem*)node->Data() ;
if (matched==item)
break ;
i++ ;
node = node->Next() ;
}
// Here, we have the position.
ModifyMenu((HMENU)father->m_savehMenu,i,
MF_BYPOSITION|MF_STRING|MF_POPUP,
(UINT)item->GetSubMenu()->m_savehMenu,(const char *)label) ;
}
item->SetName(label);
}
wxString wxMenu::GetLabel(int id) const
{
wxString label;
wxMenuItem *pItem = FindItemForId(id) ;
if (pItem)
label = pItem->GetName() ;
else
wxFAIL_MSG("wxMenu::GetLabel: item doesn't exist");
return label;
}
bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
{ {
@@ -433,83 +438,6 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
return TRUE; return TRUE;
} }
// Finds the item id matching the given string, -1 if not found.
int wxMenu::FindItem (const wxString& itemString) const
{
// FIXME fixed size buffer
char buf1[200];
char buf2[200];
wxStripMenuCodes ((char *)(const char *)itemString, buf1);
for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
{
wxMenuItem *item = (wxMenuItem *) node->Data ();
if (item->GetSubMenu())
{
int ans = item->GetSubMenu()->FindItem(itemString);
if (ans > -1)
return ans;
}
if ( !item->IsSeparator() )
{
wxStripMenuCodes((char *)item->GetName().c_str(), buf2);
if (strcmp(buf1, buf2) == 0)
return item->GetId();
}
}
return wxNOT_FOUND;
}
wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
{
if (itemMenu)
*itemMenu = NULL;
for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
{
wxMenuItem *item = (wxMenuItem *) node->Data ();
if (item->GetId() == itemId)
{
if (itemMenu)
*itemMenu = (wxMenu *) this;
return item;
}
if (item->GetSubMenu())
{
wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
if (ans)
return ans;
}
}
if (itemMenu)
*itemMenu = NULL;
return NULL;
}
void wxMenu::SetHelpString(int itemId, const wxString& helpString)
{
wxMenuItem *item = FindItemForId (itemId);
if (item)
item->SetHelp(helpString);
else
wxFAIL_MSG("wxMenu::SetHelpString: item doesn't exist");
}
wxString wxMenu::GetHelpString (int itemId) const
{
wxString help;
wxMenuItem *item = FindItemForId (itemId);
if (item)
help = item->GetHelp();
else
wxFAIL_MSG("wxMenu::GetHelpString: item doesn't exist");
return help;
}
void wxMenu::ProcessCommand(wxCommandEvent & event) void wxMenu::ProcessCommand(wxCommandEvent & event)
{ {
bool processed = FALSE; bool processed = FALSE;
@@ -534,13 +462,73 @@ void wxMenu::ProcessCommand(wxCommandEvent & event)
processed = win->GetEventHandler()->ProcessEvent(event); processed = win->GetEventHandler()->ProcessEvent(event);
} }
// ---------------------------------------------------------------------------
// Item search
// ---------------------------------------------------------------------------
// Finds the item id matching the given string, -1 if not found.
int wxMenu::FindItem (const wxString& itemString) const
{
// FIXME fixed size buffer
wxString itemLabel = wxStripMenuCodes(itemString);
for ( wxNode *node = m_menuItems.First(); node; node = node->Next() )
{
wxMenuItem *item = (wxMenuItem *)node->Data();
if ( item->IsSubMenu() )
{
int ans = item->GetSubMenu()->FindItem(itemString);
if ( ans != wxNOT_FOUND )
return ans;
}
else if ( !item->IsSeparator() )
{
wxString label = wxStripMenuCodes(item->GetName());
if ( itemLabel == label )
return item->GetId();
}
}
return wxNOT_FOUND;
}
wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
{
if ( itemMenu )
*itemMenu = NULL;
wxMenuItem *item = NULL;
for ( wxNode *node = m_menuItems.First(); node; node = node->Next() )
{
item = (wxMenuItem *)node->Data();
if ( item->GetId() == itemId )
{
if (itemMenu)
*itemMenu = (wxMenu *)this;
break;
}
else if ( item->IsSubMenu() )
{
item = item->GetSubMenu()->FindItemForId(itemId, itemMenu);
if ( item )
break;
}
}
return item;
}
// ---------------------------------------------------------------------------
// other
// ---------------------------------------------------------------------------
bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
{ {
menu->SetInvokingWindow(this); menu->SetInvokingWindow(this);
menu->UpdateUI(); menu->UpdateUI();
HWND hWnd = (HWND) GetHWND(); HWND hWnd = (HWND) GetHWND();
HMENU hMenu = (HMENU)menu->m_hMenu; HMENU hMenu = (HMENU)menu->GetHMenu();
POINT point; POINT point;
point.x = x; point.x = x;
point.y = y; point.y = y;
@@ -555,8 +543,30 @@ bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
return TRUE; return TRUE;
} }
void wxMenu::Attach(wxMenuBar *menubar)
{
// menu can be in at most one menubar because otherwise they would both
// delete the menu pointer
wxASSERT_MSG( !m_menuBar, "menu belongs to 2 menubars, expect a crash" );
m_menuBar = menubar;
m_savehMenu = m_hMenu;
m_hMenu = 0;
}
void wxMenu::Detach()
{
wxASSERT_MSG( m_menuBar, "can't detach menu if it's not attached" );
m_hMenu = m_savehMenu;
m_savehMenu = 0;
}
// ---------------------------------------------------------------------------
// Menu Bar // Menu Bar
wxMenuBar::wxMenuBar() // ---------------------------------------------------------------------------
void wxMenuBar::Init()
{ {
m_eventHandler = this; m_eventHandler = this;
m_menuCount = 0; m_menuCount = 0;
@@ -566,83 +576,94 @@ wxMenuBar::wxMenuBar()
m_hMenu = 0; m_hMenu = 0;
} }
wxMenuBar::wxMenuBar()
{
Init();
}
wxMenuBar::wxMenuBar( long WXUNUSED(style) ) wxMenuBar::wxMenuBar( long WXUNUSED(style) )
{ {
m_eventHandler = this; Init();
m_menuCount = 0;
m_menus = NULL;
m_titles = NULL;
m_menuBarFrame = NULL;
m_hMenu = 0;
} }
wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[]) wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
{ {
m_eventHandler = this; Init();
m_menuCount = N;
m_menus = Menus;
m_titles = new wxString[N];
int i;
for ( i = 0; i < N; i++ )
m_titles[i] = Titles[i];
m_menuBarFrame = NULL;
for (i = 0; i < N; i++)
m_menus[i]->m_menuBar = (wxMenuBar *) this;
m_hMenu = 0; m_menuCount = count;
m_menus = menus;
m_titles = new wxString[count];
int i;
for ( i = 0; i < count; i++ )
m_titles[i] = titles[i];
for ( i = 0; i < count; i++ )
m_menus[i]->Attach(this);
} }
wxMenuBar::~wxMenuBar() wxMenuBar::~wxMenuBar()
{ {
// In fact, don't want menu to be destroyed before MDI for ( int i = 0; i < m_menuCount; i++ )
// shuffling has taken place. Let it be destroyed
// automatically when the window is destroyed.
// DestroyMenu(menu);
// m_hMenu = NULL;
int i;
/*
// See remarks in ::~wxMenu() method
// BEWARE - this may interfere with MDI fixes, so
// may need to remove
int N = 0 ;
if (m_menuBarFrame && ((m_menuBarFrame->GetWindowStyleFlag() & wxSDI) == wxSDI))
{
if (menu)
N = GetMenuItemCount(menu) ;
for (i = N-1; i >= 0; i--)
RemoveMenu(menu, i, MF_BYPOSITION);
}
*/
for (i = 0; i < m_menuCount; i++)
{ {
delete m_menus[i]; delete m_menus[i];
} }
delete[] m_menus; delete[] m_menus;
delete[] m_titles; delete[] m_titles;
/* Don't destroy menu here, in case we're MDI and
need to do some shuffling with VALID menu handles.
if (menu)
DestroyMenu(menu);
m_hMenu = 0;
*/
} }
// ---------------------------------------------------------------------------
// wxMenuBar helpers
// ---------------------------------------------------------------------------
void wxMenuBar::Refresh()
{
wxCHECK_RET( m_menuBarFrame, "can't refresh a menubar withotu a frame" );
DrawMenuBar((HWND)m_menuBarFrame->GetHWND()) ;
}
WXHMENU wxMenuBar::Create()
{
wxCHECK_MSG( !m_hMenu, TRUE, "menubar already created" );
m_hMenu = (WXHMENU)::CreateMenu();
if ( !m_hMenu )
{
wxLogLastError("CreateMenu");
}
else
{
for ( int i = 0; i < m_menuCount; i++ )
{
if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
(UINT)m_menus[i]->GetHMenu(),
m_titles[i]) )
{
wxLogLastError("AppendMenu");
}
}
}
return m_hMenu;
}
// ---------------------------------------------------------------------------
// wxMenuBar functions forwarded to wxMenuItem
// ---------------------------------------------------------------------------
// Must only be used AFTER menu has been attached to frame, // Must only be used AFTER menu has been attached to frame,
// otherwise use individual menus to enable/disable items // otherwise use individual menus to enable/disable items
void wxMenuBar::Enable(int id, bool enable) void wxMenuBar::Enable(int id, bool enable)
{ {
int flag = enable ? MF_ENABLED : MF_GRAYED;
wxMenu *itemMenu = NULL; wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(id, &itemMenu) ; wxMenuItem *item = FindItemForId(id, &itemMenu) ;
wxCHECK_RET( item, "attempt to enable an item which doesn't exist" ); wxCHECK_RET( item, "attempt to enable an item which doesn't exist" );
EnableMenuItem(GetHMenuOf(itemMenu), id, MF_BYCOMMAND | flag); item->Enable(enable);
} }
void wxMenuBar::EnableTop(int pos, bool enable) void wxMenuBar::EnableTop(int pos, bool enable)
@@ -650,7 +671,6 @@ void wxMenuBar::EnableTop(int pos, bool enable)
int flag = enable ? MF_ENABLED : MF_GRAYED;; int flag = enable ? MF_ENABLED : MF_GRAYED;;
EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag);
DrawMenuBar((HWND)m_menuBarFrame->GetHWND()) ;
} }
// Must only be used AFTER menu has been attached to frame, // Must only be used AFTER menu has been attached to frame,
@@ -663,8 +683,7 @@ void wxMenuBar::Check(int id, bool check)
wxCHECK_RET( item, "attempt to check an item which doesn't exist" ); wxCHECK_RET( item, "attempt to check an item which doesn't exist" );
wxCHECK_RET( item->IsCheckable(), "attempt to check an uncheckable item" ); wxCHECK_RET( item->IsCheckable(), "attempt to check an uncheckable item" );
int flag = check ? MF_CHECKED : MF_UNCHECKED; item->Check(check);
CheckMenuItem(GetHMenuOf(itemMenu), id, MF_BYCOMMAND | flag);
} }
bool wxMenuBar::IsChecked(int id) const bool wxMenuBar::IsChecked(int id) const
@@ -672,7 +691,7 @@ bool wxMenuBar::IsChecked(int id) const
wxMenu *itemMenu = NULL; wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(id, &itemMenu) ; wxMenuItem *item = FindItemForId(id, &itemMenu) ;
wxCHECK_MSG( item, FALSE, "wxMenuItem::IsChecked(): no such item" ); wxCHECK_MSG( item, FALSE, "wxMenuBar::IsChecked(): no such item" );
int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND); int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND);
@@ -684,7 +703,7 @@ bool wxMenuBar::IsEnabled(int id) const
wxMenu *itemMenu = NULL; wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(id, &itemMenu) ; wxMenuItem *item = FindItemForId(id, &itemMenu) ;
wxCHECK_MSG( item, FALSE, "wxMenuItem::IsEnabled(): no such item" ); wxCHECK_MSG( item, FALSE, "wxMenuBar::IsEnabled(): no such item" );
int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND) ; int flag = ::GetMenuState(GetHMenuOf(itemMenu), id, MF_BYCOMMAND) ;
@@ -696,12 +715,9 @@ void wxMenuBar::SetLabel(int id, const wxString& label)
wxMenu *itemMenu = NULL; wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(id, &itemMenu) ; wxMenuItem *item = FindItemForId(id, &itemMenu) ;
if (!item) wxCHECK_RET( item, "wxMenuBar::SetLabel(): no such item" );
return;
HMENU hMenu = GetHMenuOf(itemMenu); item->SetName(label);
UINT was_flag = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
::ModifyMenu(hMenu, id, MF_BYCOMMAND | MF_STRING | was_flag, id, label);
} }
wxString wxMenuBar::GetLabel(int id) const wxString wxMenuBar::GetLabel(int id) const
@@ -709,26 +725,53 @@ wxString wxMenuBar::GetLabel(int id) const
wxMenu *itemMenu = NULL; wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(id, &itemMenu) ; wxMenuItem *item = FindItemForId(id, &itemMenu) ;
wxCHECK_MSG( item, "", "wxMenuItem::GetLabel(): no such item" ); wxCHECK_MSG( item, "", "wxMenuBar::GetLabel(): no such item" );
HMENU hMenu = GetHMenuOf(itemMenu); return item->GetName();
int len = ::GetMenuString(hMenu, id, NULL, 0, MF_BYCOMMAND);
len++; // for the NUL character
wxString label;
::GetMenuString(hMenu, id, label.GetWriteBuf(len), len, MF_BYCOMMAND);
label.UngetWriteBuf();
return label;
} }
void wxMenuBar::SetHelpString (int id, const wxString& helpString)
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(id, &itemMenu) ;
wxCHECK_RET( item, "wxMenuBar::SetHelpString(): no such item" );
item->SetHelp(helpString);
}
wxString wxMenuBar::GetHelpString (int id) const
{
wxMenu *itemMenu = NULL;
wxMenuItem *item = FindItemForId(id, &itemMenu) ;
wxCHECK_MSG( item, "", "wxMenuBar::GetHelpString(): no such item" );
return item->GetHelp();
}
// ---------------------------------------------------------------------------
// wxMenuBar functions to work with the top level submenus
// ---------------------------------------------------------------------------
// NB: we don't support owner drawn top level items for now, if we do these
// functions would have to be changed to use wxMenuItem as well
void wxMenuBar::SetLabelTop(int pos, const wxString& label) void wxMenuBar::SetLabelTop(int pos, const wxString& label)
{ {
UINT id; UINT id;
UINT was_flag = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION); UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, pos, MF_BYPOSITION);
if (was_flag & MF_POPUP) if ( flagsOld == 0xFFFFFFFF )
{ {
was_flag &= 0xff ; wxLogLastError("GetMenuState");
return;
}
if ( flagsOld & MF_POPUP )
{
// HIBYTE contains the number of items in the submenu in this case
flagsOld &= 0xff ;
id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos) ; id = (UINT)::GetSubMenu((HMENU)m_hMenu, pos) ;
} }
else else
@@ -736,8 +779,11 @@ void wxMenuBar::SetLabelTop(int pos, const wxString& label)
id = pos; id = pos;
} }
::ModifyMenu((HMENU)m_hMenu, pos, MF_BYPOSITION | MF_STRING | was_flag, if ( ::ModifyMenu(GetHMENU(), pos, MF_BYPOSITION | MF_STRING | flagsOld,
id, label) ; id, label) == 0xFFFFFFFF )
{
wxLogLastError("ModifyMenu");
}
} }
wxString wxMenuBar::GetLabelTop(int pos) const wxString wxMenuBar::GetLabelTop(int pos) const
@@ -746,49 +792,67 @@ wxString wxMenuBar::GetLabelTop(int pos) const
len++; // for the NUL character len++; // for the NUL character
wxString label; wxString label;
::GetMenuString((HMENU)m_hMenu, pos, label.GetWriteBuf(len), len, MF_BYCOMMAND); ::GetMenuString(GetHMENU(), pos, label.GetWriteBuf(len), len, MF_BYCOMMAND);
label.UngetWriteBuf(); label.UngetWriteBuf();
return label; return label;
} }
// ---------------------------------------------------------------------------
// wxMenuBar notifications
// ---------------------------------------------------------------------------
bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
{ {
if ( !m_menuBarFrame ) if ( !m_menuBarFrame )
return TRUE; return TRUE;
if (RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION)) { if ( ::RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION) )
m_menus[pos]->m_hMenu = m_menus[pos]->m_savehMenu; {
m_menus[pos]->m_savehMenu = 0; // VZ: I'm not sure about what's going on here, so I leave an assert
wxASSERT_MSG( m_menus[pos] == a_menu, "what is this parameter for??" );
if (m_menuBarFrame) { a_menu->Detach();
DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ;
} if ( m_menuBarFrame )
Refresh();
return TRUE; return TRUE;
} }
else
{
wxLogLastError("RemoveMenu");
}
return FALSE; return FALSE;
} }
bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title) bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title)
{ {
if (!a_menu->m_hMenu) WXHMENU submenu = a_menu->GetHMenu();
if ( !submenu )
return FALSE; return FALSE;
if ( !m_menuBarFrame ) if ( !m_menuBarFrame )
return TRUE; return TRUE;
a_menu->m_savehMenu = a_menu->m_hMenu; a_menu->Attach(this);
a_menu->m_hMenu = 0;
AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)a_menu->m_savehMenu, title); if ( !::AppendMenu(GetHMENU(), MF_POPUP | MF_STRING,
(UINT)submenu, title) )
{
wxLogLastError("AppendMenu");
}
DrawMenuBar((HWND)m_menuBarFrame->GetHWND()); Refresh();
return TRUE; return TRUE;
} }
// ---------------------------------------------------------------------------
// wxMenuBar construction
// ---------------------------------------------------------------------------
void wxMenuBar::Append (wxMenu * menu, const wxString& title) void wxMenuBar::Append (wxMenu * menu, const wxString& title)
{ {
if (!OnAppend(menu, title)) if (!OnAppend(menu, title))
@@ -817,8 +881,7 @@ void wxMenuBar::Append (wxMenu * menu, const wxString& title)
m_menus[m_menuCount - 1] = (wxMenu *)menu; m_menus[m_menuCount - 1] = (wxMenu *)menu;
m_titles[m_menuCount - 1] = title; m_titles[m_menuCount - 1] = title;
((wxMenu *)menu)->m_menuBar = (wxMenuBar *) this; menu->SetParent(this);
((wxMenu *)menu)->SetParent(this);
} }
void wxMenuBar::Delete(wxMenu * menu, int i) void wxMenuBar::Delete(wxMenu * menu, int i)
@@ -851,21 +914,23 @@ void wxMenuBar::Delete(wxMenu * menu, int i)
} }
} }
// Find the menu menuString, item itemString, and return the item id. // ---------------------------------------------------------------------------
// Returns -1 if none found. // wxMenuBar searching for menu items
int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const // ---------------------------------------------------------------------------
// Find the itemString in menuString, and return the item id or wxNOT_FOUND
int wxMenuBar::FindMenuItem(const wxString& menuString,
const wxString& itemString) const
{ {
char buf1[200]; wxString menuLabel = wxStripMenuCodes(menuString);
char buf2[200]; for ( int i = 0; i < m_menuCount; i++ )
wxStripMenuCodes ((char *)(const char *)menuString, buf1);
int i;
for (i = 0; i < m_menuCount; i++)
{ {
wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); wxString title = wxStripMenuCodes(m_titles[i]);
if (strcmp (buf1, buf2) == 0) if ( menuString == title )
return m_menus[i]->FindItem(itemString); return m_menus[i]->FindItem(itemString);
} }
return -1;
return wxNOT_FOUND;
} }
wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu **itemMenu) const wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu **itemMenu) const
@@ -874,46 +939,14 @@ wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const
*itemMenu = NULL; *itemMenu = NULL;
wxMenuItem *item = NULL; wxMenuItem *item = NULL;
int i; for ( int i = 0; !item && (i < m_menuCount); i++ )
for (i = 0; i < m_menuCount; i++)
{ {
item = m_menus[i]->FindItemForId(id, itemMenu); item = m_menus[i]->FindItemForId(id, itemMenu);
if (item) }
return item; return item;
} }
return NULL;
}
void wxMenuBar::SetHelpString (int id, const wxString& helpString)
{
int i;
for (i = 0; i < m_menuCount; i++)
{
if (m_menus[i]->FindItemForId (id))
{
m_menus[i]->SetHelpString (id, helpString);
return;
}
}
}
wxString wxMenuBar::GetHelpString (int id) const
{
wxString helpString;
for (int i = 0; i < m_menuCount; i++)
{
wxMenuItem *item = m_menus[i]->FindItemForId(id);
if ( item )
{
helpString = item->GetHelp();
break;
}
}
return helpString;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// helper functions // helper functions
@@ -924,7 +957,7 @@ wxWindow *wxMenu::GetWindow() const
if ( m_pInvokingWindow != NULL ) if ( m_pInvokingWindow != NULL )
return m_pInvokingWindow; return m_pInvokingWindow;
else if ( m_menuBar != NULL) else if ( m_menuBar != NULL)
return m_menuBar->m_menuBarFrame; return m_menuBar->GetFrame();
return NULL; return NULL;
} }

111
src/msw/menuitem.cpp
View File

@@ -9,6 +9,14 @@
// Licence: wxWindows license // Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// declarations
// ===========================================================================
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "menuitem.h" #pragma implementation "menuitem.h"
#endif #endif
@@ -41,6 +49,12 @@
#undef GetClassName #undef GetClassName
#endif #endif
// ---------------------------------------------------------------------------
// convenience macro
// ---------------------------------------------------------------------------
#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu())
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================
@@ -77,7 +91,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
#endif //owner drawn #endif //owner drawn
m_strHelp(strHelp) m_strHelp(strHelp)
{ {
wxASSERT( pParentMenu != NULL ); wxASSERT_MSG( pParentMenu != NULL, "a menu item should have a parent" );
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN
// set default menu colors // set default menu colors
@@ -94,8 +108,8 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
m_pParentMenu = pParentMenu; m_pParentMenu = pParentMenu;
m_pSubMenu = pSubMenu; m_pSubMenu = pSubMenu;
m_idItem = id;
m_bEnabled = TRUE; m_bEnabled = TRUE;
m_idItem = id;
} }
wxMenuItem::~wxMenuItem() wxMenuItem::~wxMenuItem()
@@ -105,11 +119,16 @@ wxMenuItem::~wxMenuItem()
// misc // misc
// ---- // ----
// return the id for calling Win32 API functions
int wxMenuItem::GetRealId() const
{
return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId();
}
// delete the sub menu // delete the sub menu
// -------------------
void wxMenuItem::DeleteSubMenu() void wxMenuItem::DeleteSubMenu()
{ {
wxASSERT( m_pSubMenu != NULL );
delete m_pSubMenu; delete m_pSubMenu;
m_pSubMenu = NULL; m_pSubMenu = NULL;
} }
@@ -120,24 +139,13 @@ void wxMenuItem::DeleteSubMenu()
void wxMenuItem::Enable(bool bDoEnable) void wxMenuItem::Enable(bool bDoEnable)
{ {
if ( m_bEnabled != bDoEnable ) { if ( m_bEnabled != bDoEnable ) {
if ( m_pSubMenu == NULL ) { // normal menu item long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu),
EnableMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, GetRealId(),
MF_BYCOMMAND | (bDoEnable ? MF_ENABLED: MF_GRAYED)); MF_BYCOMMAND |
} (bDoEnable ? MF_ENABLED : MF_GRAYED));
else // submenu
{ if ( rc == -1 ) {
wxMenu *father = m_pSubMenu->m_topLevelMenu ; wxLogLastError("EnableMenuItem");
wxNode *node = father->m_menuItems.First() ;
int i = 0 ;
while (node) {
wxMenuItem *matched = (wxMenuItem*)node->Data();
if ( matched == this)
break;
i++;
node = node->Next();
}
EnableMenuItem((HMENU)father->m_savehMenu, i,
MF_BYPOSITION | (bDoEnable ? MF_ENABLED: MF_GRAYED));
} }
m_bEnabled = bDoEnable; m_bEnabled = bDoEnable;
@@ -149,9 +157,64 @@ void wxMenuItem::Check(bool bDoCheck)
wxCHECK_RET( IsCheckable(), "only checkable items may be checked" ); wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
if ( m_bChecked != bDoCheck ) { if ( m_bChecked != bDoCheck ) {
CheckMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
MF_BYCOMMAND | (bDoCheck ? MF_CHECKED : MF_UNCHECKED)); GetId(),
MF_BYCOMMAND |
(bDoCheck ? MF_CHECKED : MF_UNCHECKED));
if ( rc == -1 ) {
wxLogLastError("CheckMenuItem");
}
m_bChecked = bDoCheck; m_bChecked = bDoCheck;
} }
} }
void wxMenuItem::SetName(const wxString& strName)
{
// don't do anything if label didn't change
if ( m_strName == strName )
return;
m_strName = strName;
HMENU hMenu = GetHMenuOf(m_pParentMenu);
UINT id = GetRealId();
UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
if ( flagsOld == 0xFFFFFFFF )
{
wxLogLastError("GetMenuState");
}
else
{
if ( IsSubMenu() )
{
// high byte contains the number of items in a submenu for submenus
flagsOld &= 0xFF;
flagsOld |= MF_POPUP;
}
LPCSTR data;
#if wxUSE_OWNER_DRAWN
if ( IsOwnerDrawn() )
{
flagsOld |= MF_OWNERDRAW;
data = (LPCSTR)this;
}
else
#endif //owner drawn
{
flagsOld |= MF_STRING;
data = strName;
}
if ( ::ModifyMenu(hMenu, id,
MF_BYCOMMAND | flagsOld,
id, data) == 0xFFFFFFFF )
{
wxLogLastError("ModifyMenu");
}
}
}