Make wxComboCtrlBase::Set*groundColour() methods public.

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

diff --git a/include/wx/dfb/nonownedwnd.h b/include/wx/dfb/nonownedwnd.h
index 2363c785e615092e56850048e3f2f425f53d5867..a4e8dcc7bc8bb4daf859034c7af41c4d202d960a 100644 (file)
--- a/include/wx/dfb/nonownedwnd.h
+++ b/include/wx/dfb/nonownedwnd.h
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2006-12-24
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2006-12-24

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 TT-Solutions
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 TT-Solutions
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


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

+class wxDFBEventsHandler;

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


@@ -28,7 +28,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.
 // 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
 {
 public:
     // construction


@@ -79,7 +79,7 @@ protected:
 
     virtual wxIDirectFBSurfacePtr ObtainDfbSurface() const;
 
 
     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);
     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 +91,7 @@ protected:
     // wxWindows as in wx
     void SetDfbFocus();
 
     // 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_)) {}
 
     // and wxPopupWindow to be done here
     virtual void HandleFocusEvent(const wxDFBWindowEvent& WXUNUSED(event_)) {}
 


@@ -118,8 +118,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 wxGUIEventLoop; // 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_