X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c219cecc129fd06327faa9d0a417550740f8bd64..066f302c6c9e8628b2cea3a3f89f5d18f6b4cfc8:/src/msw/frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index db3bd68269..1f463ef76a 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -175,8 +175,10 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
   rect.bottom -= pt.y;
   rect.right -= pt.x;
 
-  *x = rect.right;
-  *y = rect.bottom;
+  if ( x )
+    *x = rect.right;
+  if ( y )
+    *y = rect.bottom;
 }
 
 // Set the client size (i.e. leave the calculation of borders etc.
@@ -420,6 +422,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     if (!menu_bar)
     {
+        delete m_frameMenuBar;
         m_frameMenuBar = NULL;
         return;
     }
@@ -878,10 +881,7 @@ bool wxFrame::HandlePaint()
         }
         else
         {
-            wxPaintEvent event(m_windowId);
-            event.m_eventObject = this;
-
-            return GetEventHandler()->ProcessEvent(event);
+            return wxWindow::HandlePaint();
         }
     }
     else