fix crash caused by an wxMDIClientWindow's GTK signal handler being called when the...

[wxWidgets.git] / include / wx / dfb / nonownedwnd.h

diff --git a/include/wx/dfb/nonownedwnd.h b/include/wx/dfb/nonownedwnd.h
index 6c4e731d5ca33ef20d3e925ae3bb6a357581ed5d..86b7200aa18109d81fcc507ac14b7c03f9ea92b0 100644 (file)
--- a/include/wx/dfb/nonownedwnd.h
+++ b/include/wx/dfb/nonownedwnd.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dfb/nonownedwnd.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dfb/nonownedwnd.h

-// Purpose:     declares wxNonTopLevelWindow class
+// Purpose:     declares wxNonOwnedWindow class

 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2006-12-24
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2006-12-24


@@ -18,6 +18,7 @@
 wxDFB_DECLARE_INTERFACE(IDirectFBWindow);
 class wxDfbQueuedPaintRequests;
 struct wxDFBWindowEvent;
 wxDFB_DECLARE_INTERFACE(IDirectFBWindow);
 class wxDfbQueuedPaintRequests;
 struct wxDFBWindowEvent;

+class wxDFBEventsHandler;

 
 //-----------------------------------------------------------------------------
 // wxNonOwnedWindow
 
 //-----------------------------------------------------------------------------
 // wxNonOwnedWindow


@@ -59,6 +60,9 @@ public:
 
     virtual void Update();
 
 
     virtual void Update();
 

+    virtual void Raise();
+    virtual void Lower();
+

     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 


@@ -88,6 +92,10 @@ protected:
     // wxWindows as in wx
     void SetDfbFocus();
 
     // wxWindows as in wx
     void SetDfbFocus();
 

+    // overriden in wxTopLevelWindowDFB, there's no common handling for wxTLW
+    // and wxPopupWindow to be done here
+    virtual void HandleFocusEvent(const wxDFBWindowEvent& WXUNUSED(event_)) {}
+

 private:
     // do queued painting in idle time
     void HandleQueuedPaintRequests();
 private:
     // do queued painting in idle time
     void HandleQueuedPaintRequests();


@@ -111,8 +119,8 @@ private:
     // are we currently painting some area of this TLW?
     bool m_isPainting;
 
     // are we currently painting some area of this TLW?
     bool m_isPainting;
 

-    friend class wxEventLoop; // for HandleDFBWindowEvent
-    friend class wxWindowDFB; // for SetDfbFocus
+    friend class wxDFBEventsHandler; // for HandleDFBWindowEvent
+    friend class wxWindowDFB;        // for SetDfbFocus

 };
 
 #endif // _WX_DFB_NONOWNEDWND_H_
 };
 
 #endif // _WX_DFB_NONOWNEDWND_H_