Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h
index 53560f83b78c082563c39499ccba3e0ccada5f3c..7d8709933dad16ec2d7902b067f5f8b3cbe4f80f 100644 (file)
--- a/include/wx/nonownedwnd.h
+++ b/include/wx/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
 ///////////////////////////////////////////////////////////////////////////////


@@ -58,6 +57,24 @@ public:
     }
 #endif // wxUSE_GRAPHICS_CONTEXT
 
     }
 #endif // wxUSE_GRAPHICS_CONTEXT
 

+
+    // Overridden base class methods.
+    // ------------------------------
+
+    virtual void AdjustForParentClientOrigin(int& WXUNUSED(x), int& WXUNUSED(y),
+                                             int WXUNUSED(sizeFlags) = 0) const
+    {
+        // Non owned windows positions don't need to be adjusted for parent
+        // client area origin so simply do nothing here.
+    }
+
+    virtual void InheritAttributes()
+    {
+        // Non owned windows don't inherit attributes from their parent window
+        // (if the parent frame is red, it doesn't mean that all dialogs shown
+        // by it should be red as well), so don't do anything here neither.
+    }
+

 protected:
     virtual bool DoClearShape()
     {
 protected:
     virtual bool DoClearShape()
     {


@@ -79,7 +96,7 @@ protected:
 
 #if defined(__WXDFB__)
     #include "wx/dfb/nonownedwnd.h"
 
 #if defined(__WXDFB__)
     #include "wx/dfb/nonownedwnd.h"

-#elif defined(__WXGTK__) && defined(__WXGTK20__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/nonownedwnd.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/nonownedwnd.h"
     #include "wx/gtk/nonownedwnd.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/nonownedwnd.h"