Always link with expat in monolithic build.

[wxWidgets.git] / src / dfb / nonownedwnd.cpp

diff --git a/src/dfb/nonownedwnd.cpp b/src/dfb/nonownedwnd.cpp
index 3652a13ba470f0ebd491ac901d434b5e8e51f130..2c4809aee110bb586a6f83a19478adba21a5dca2 100644 (file)
--- a/src/dfb/nonownedwnd.cpp
+++ b/src/dfb/nonownedwnd.cpp
@@ -153,7 +153,7 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
 
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
-    m_isBeingDeleted = true;
+    SendDestroyEvent();
 
     // destroy all children before we destroy the underlying DirectFB window,
     // so that if any of them does something with the TLW, it will still work:
@@ -228,7 +228,7 @@ bool wxNonOwnedWindow::Show(bool show)
         m_sizeSet = true;
         wxSizeEvent event(GetSize(), GetId());
         event.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);
     }
 
     // make sure the window is fully painted, with all pending updates, before
@@ -259,6 +259,16 @@ bool wxNonOwnedWindow::Show(bool show)
     return true;
 }
 
+void wxNonOwnedWindow::Raise()
+{
+    m_dfbwin->RaiseToTop();
+}
+
+void wxNonOwnedWindow::Lower()
+{
+    m_dfbwin->LowerToBottom();
+}
+
 // ----------------------------------------------------------------------------
 // surfaces and painting
 // ----------------------------------------------------------------------------
@@ -291,16 +301,12 @@ void wxNonOwnedWindow::HandleQueuedPaintRequests()
     // blit the entire back buffer to front soon
     m_isPainting = true;
 
-#ifdef __WXDEBUG__
     int requestsCount = 0;
-#endif
 
     wxRect request;
     while ( m_toPaint->GetNext(request) )
     {
-#ifdef __WXDEBUG__
         requestsCount++;
-#endif
         wxRect clipped(request);
         clipped.Intersect(winRect);
         if ( clipped.IsEmpty() )