netutils code is MSW-only

[wxWidgets.git] / src / os2 / window.cpp

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 99bd6f5a511ccb60901f7f142f3facdd7f9d559d..70d2e322aafb1ab66b230253383024e8008ea6bc 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1364,7 +1364,8 @@ void wxWindowOS2::OnIdle(
             (void)GetEventHandler()->ProcessEvent(rEvent);
         }
     }
             (void)GetEventHandler()->ProcessEvent(rEvent);
         }
     }

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 } // end of wxWindowOS2::OnIdle
 
 //
 } // end of wxWindowOS2::OnIdle
 
 //


@@ -1384,17 +1385,6 @@ bool wxWindowOS2::Reparent(
     return TRUE;
 } // end of wxWindowOS2::Reparent
 
     return TRUE;
 } // end of wxWindowOS2::Reparent
 

-void wxWindowOS2::Clear()
-{
-    wxClientDC                      vDc((wxWindow*)this);
-    wxBrush                         vBrush( GetBackgroundColour()
-                                           ,wxSOLID
-                                          );
-
-    vDc.SetBackground(vBrush);
-    vDc.Clear();
-} // end of wxWindowOS2::Clear
-

 void wxWindowOS2::Update()
 {
     ::WinUpdateWindow(GetHwnd());
 void wxWindowOS2::Update()
 {
     ::WinUpdateWindow(GetHwnd());


@@ -3514,7 +3504,7 @@ bool wxWindowOS2::HandleCreate(
 bool wxWindowOS2::HandleDestroy()
 {
     wxWindowDestroyEvent            vEvent((wxWindow*)this);
 bool wxWindowOS2::HandleDestroy()
 {
     wxWindowDestroyEvent            vEvent((wxWindow*)this);

-
+    vEvent.SetId(GetId());

     (void)GetEventHandler()->ProcessEvent(vEvent);
 
     //
     (void)GetEventHandler()->ProcessEvent(vEvent);
 
     //