Build fix for wxOSX after removing position in MacCreateKeyEvent().

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

diff --git a/include/wx/dfb/nonownedwnd.h b/include/wx/dfb/nonownedwnd.h
index 96d2ebbf88ba0e38ba62bb015a593776269cfc12..4cba760b3e512b78b02f217749b2af3f9a57f6c2 100644 (file)
--- a/include/wx/dfb/nonownedwnd.h
+++ b/include/wx/dfb/nonownedwnd.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dfb/nonownedwnd.h
-// Purpose:     declares wxNonTopLevelWindow class
+// Purpose:     declares wxNonOwnedWindow class
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2006-12-24
@@ -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
@@ -59,6 +60,9 @@ public:
 
     virtual void Update();
 
+    virtual void Raise();
+    virtual void Lower();
+
     // implementation from now on
     // --------------------------
 
@@ -76,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);
@@ -88,6 +92,10 @@ protected:
     // wxWindows as in wx
     void SetDfbFocus();
 
+    // overridden 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();
@@ -111,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_