Added wxCriticalSection::TryEnter() method.

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

diff --git a/include/wx/dfb/nonownedwnd.h b/include/wx/dfb/nonownedwnd.h
index 2363c785e615092e56850048e3f2f425f53d5867..4cba760b3e512b78b02f217749b2af3f9a57f6c2 100644 (file)
--- a/include/wx/dfb/nonownedwnd.h
+++ b/include/wx/dfb/nonownedwnd.h
@@ -18,6 +18,7 @@
 wxDFB_DECLARE_INTERFACE(IDirectFBWindow);
 class wxDfbQueuedPaintRequests;
 struct wxDFBWindowEvent;
+class wxDFBEventsHandler;
 
 //-----------------------------------------------------------------------------
 // wxNonOwnedWindow
@@ -28,7 +29,7 @@ struct wxDFBWindowEvent;
 // wxFrame is non-owned, because even though it can have a parent, it's
 // location is independent of it.  This class is for internal use only, it's
 // the base class for wxTopLevelWindow and wxPopupWindow.
-class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxWindow
+class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
 {
 public:
     // construction
@@ -79,7 +80,7 @@ protected:
 
     virtual wxIDirectFBSurfacePtr ObtainDfbSurface() const;
 
-    // overriden wxWindow methods
+    // overridden wxWindow methods
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
@@ -91,7 +92,7 @@ protected:
     // wxWindows as in wx
     void SetDfbFocus();
 
-    // overriden in wxTopLevelWindowDFB, there's no common handling for wxTLW
+    // overridden in wxTopLevelWindowDFB, there's no common handling for wxTLW
     // and wxPopupWindow to be done here
     virtual void HandleFocusEvent(const wxDFBWindowEvent& WXUNUSED(event_)) {}
 
@@ -118,8 +119,8 @@ private:
     // are we currently painting some area of this TLW?
     bool m_isPainting;
 
-    friend class wxGUIEventLoop; // for HandleDFBWindowEvent
-    friend class wxWindowDFB;    // for SetDfbFocus
+    friend class wxDFBEventsHandler; // for HandleDFBWindowEvent
+    friend class wxWindowDFB;        // for SetDfbFocus
 };
 
 #endif // _WX_DFB_NONOWNEDWND_H_