Fixed wxWindowOS2::Reparent.

[wxWidgets.git] / include / wx / private / overlay.h

diff --git a/include/wx/private/overlay.h b/include/wx/private/overlay.h
index 4a941167fbb3ea8ad24931a375e536dc5b3f672e..2f04ec61571056eba7d0f8f5a7d4eaf62d1cf536 100644 (file)
--- a/include/wx/private/overlay.h
+++ b/include/wx/private/overlay.h
@@ -14,7 +14,7 @@
 
 #include "wx/overlay.h"
 
 
 #include "wx/overlay.h"
 

-#if wxHAS_NATIVE_OVERLAY
+#ifdef wxHAS_NATIVE_OVERLAY

 
 #if defined(__WXMAC__)
     #include "wx/mac/carbon/private/overlay.h"
 
 #if defined(__WXMAC__)
     #include "wx/mac/carbon/private/overlay.h"


@@ -26,28 +26,32 @@
 
 #else // !wxHAS_NATIVE_OVERLAY
 
 
 #else // !wxHAS_NATIVE_OVERLAY
 

+#include "wx/bitmap.h"
+
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+

 // generic implementation of wxOverlay
 class wxOverlayImpl
 {
 public:
     wxOverlayImpl();
     ~wxOverlayImpl();
 // generic implementation of wxOverlay
 class wxOverlayImpl
 {
 public:
     wxOverlayImpl();
     ~wxOverlayImpl();

-    
-    
+
+

     // clears the overlay without restoring the former state
     // to be done eg when the window content has been changed and repainted
     void Reset();
     // clears the overlay without restoring the former state
     // to be done eg when the window content has been changed and repainted
     void Reset();

-    
+

     // returns true if it has been setup
     bool IsOk();
     // returns true if it has been setup
     bool IsOk();

-    
-    void Init(wxWindowDC* dc, int x , int y , int width , int height);
-    
-    void BeginDrawing(wxWindowDC* dc);
-    
-    void EndDrawing(wxWindowDC* dc);
-    
-    void Clear(wxWindowDC* dc);
+
+    void Init(wxDC* dc, int x , int y , int width , int height);
+
+    void BeginDrawing(wxDC* dc);
+
+    void EndDrawing(wxDC* dc);
+
+    void Clear(wxDC* dc);

 
 private:
     wxBitmap m_bmpSaved ;
 
 private:
     wxBitmap m_bmpSaved ;


@@ -55,13 +59,8 @@ private:
     int m_y ;
     int m_width ;
     int m_height ;
     int m_y ;
     int m_width ;
     int m_height ;

-// this is to enable wxMOTIF and UNIV to compile....
-// currently (10 oct 06) we don't use m_window
-// ce - how do we fix this
-#if defined(__WXGTK__) || defined(__WXMSW__)

     wxWindow* m_window ;
     wxWindow* m_window ;

-#endif   
-} ;
+};

 
 #endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY
 
 
 #endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY