All events now internally watched

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index a5765f0fa08bbbfbeac3a3e41db23c675c9c0e5b..54215fde435db7708449a01b631ed69c3a1c0fcd 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -154,6 +154,9 @@ wxFrame::~wxFrame()
   // For some reason, wxWindows can activate another task altogether
   // when a frame is destroyed after a modal dialog has been invoked.
   // Try to bring the parent to the top.
   // For some reason, wxWindows can activate another task altogether
   // when a frame is destroyed after a modal dialog has been invoked.
   // Try to bring the parent to the top.

+  // MT:Only do this if this frame is currently the active window, else weird
+  // things start to happen
+  if ( wxGetActiveWindow() == this )

   if (GetParent() && GetParent()->GetHWND())
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }
   if (GetParent() && GetParent()->GetHWND())
     ::BringWindowToTop((HWND) GetParent()->GetHWND());
 }


@@ -241,15 +244,6 @@ void wxFrame::DoGetPosition(int *x, int *y) const
   *y = point.y;
 }
 
   *y = point.y;
 }
 

-void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
-
-    wxSizeEvent event(wxSize(width, height), m_windowId);
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event);
-}
-

 bool wxFrame::Show(bool show)
 {
   int cshow;
 bool wxFrame::Show(bool show)
 {
   int cshow;


@@ -677,10 +671,8 @@ bool wxFrame::ProcessCommand(int id)
         return FALSE;
 
     wxMenuItem *item = bar->FindItemForId(id);
         return FALSE;
 
     wxMenuItem *item = bar->FindItemForId(id);

-    if ( !item )
-        return FALSE;

 
 

-    if ( item->IsCheckable() )
+    if ( item &&  item->IsCheckable() )

     {
         bar->Check(id, !bar->IsChecked(id)) ;
     }
     {
         bar->Check(id, !bar->IsChecked(id)) ;
     }