Fixed compile error in gtk/dc.cpp (L.88); also menu problem in msw/mdi.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -85,7 +85,7 @@ wxDC::~wxDC(void)
|
||||
|
||||
bool wxDC::Ok(void) const
|
||||
{
|
||||
wxASSERT_MSG( !ok, "invalid display context" );
|
||||
wxASSERT_MSG( m_ok, "invalid display context" );
|
||||
return m_ok;
|
||||
}
|
||||
|
||||
|
@@ -85,7 +85,7 @@ wxDC::~wxDC(void)
|
||||
|
||||
bool wxDC::Ok(void) const
|
||||
{
|
||||
wxASSERT_MSG( !ok, "invalid display context" );
|
||||
wxASSERT_MSG( m_ok, "invalid display context" );
|
||||
return m_ok;
|
||||
}
|
||||
|
||||
|
@@ -487,6 +487,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
|
||||
if (win)
|
||||
return win->MSWCommand(cmd, id);
|
||||
|
||||
/*
|
||||
if (wxCurrentPopupMenu)
|
||||
{
|
||||
wxMenu *popupMenu = wxCurrentPopupMenu;
|
||||
@@ -494,6 +495,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
|
||||
if (!popupMenu->MSWCommand(cmd, id))
|
||||
return TRUE;
|
||||
}
|
||||
*/
|
||||
|
||||
switch (id)
|
||||
{
|
||||
|
Reference in New Issue
Block a user