From db5d183b038b3f91bac70af884ba67f7fcfe90e0 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 4 Sep 1998 11:24:30 +0000 Subject: [PATCH] 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 --- src/gtk/dc.cpp | 2 +- src/gtk1/dc.cpp | 2 +- src/msw/mdi.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp index a7c77998bc..0b621c2b79 100644 --- a/src/gtk/dc.cpp +++ b/src/gtk/dc.cpp @@ -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; } diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp index a7c77998bc..0b621c2b79 100644 --- a/src/gtk1/dc.cpp +++ b/src/gtk1/dc.cpp @@ -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; } diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index fdb27c0822..2ec45d19b7 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -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) { -- 2.45.2