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

Fixed compile error in gtk/dc.cpp (L.88); also menu problem in msw/mdi.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-09-04 11:24:30 +00:00
parent cf7a7e133b
commit db5d183b03
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/dc.cpp
View File

@@ -85,7 +85,7 @@ wxDC::~wxDC(void)
bool wxDC::Ok(void) const bool wxDC::Ok(void) const
{ {
wxASSERT_MSG( !ok, "invalid display context" ); wxASSERT_MSG( m_ok, "invalid display context" );
return m_ok; return m_ok;
} }

2
src/gtk1/dc.cpp
View File

@@ -85,7 +85,7 @@ wxDC::~wxDC(void)
bool wxDC::Ok(void) const bool wxDC::Ok(void) const
{ {
wxASSERT_MSG( !ok, "invalid display context" ); wxASSERT_MSG( m_ok, "invalid display context" );
return m_ok; return m_ok;
} }

2
src/msw/mdi.cpp
View File

@@ -487,6 +487,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
if (win) if (win)
return win->MSWCommand(cmd, id); return win->MSWCommand(cmd, id);
/*
if (wxCurrentPopupMenu) if (wxCurrentPopupMenu)
{ {
wxMenu *popupMenu = wxCurrentPopupMenu; wxMenu *popupMenu = wxCurrentPopupMenu;
@@ -494,6 +495,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
if (!popupMenu->MSWCommand(cmd, id)) if (!popupMenu->MSWCommand(cmd, id))
return TRUE; return TRUE;
} }
*/
switch (id) switch (id)
{ {