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

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index a7c77998bc209455c7c40d1b49c212d01d1f2c6b..0b621c2b791deadc4b8ec4aac7a8b92093eccb32 100644 (file)
--- 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 a7c77998bc209455c7c40d1b49c212d01d1f2c6b..0b621c2b791deadc4b8ec4aac7a8b92093eccb32 100644 (file)
--- 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 fdb27c0822bcc8fb45fbe7b45dcad3754945a983..2ec45d19b729a4580d807b11e44dfeb240c643cc 100644 (file)
--- 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)
     {