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

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

diff --git a/include/wx/wrapsizer.h b/include/wx/wrapsizer.h
index 1146af81119eaee0f3d8f761f38b0339404276ed..a4d61450024517729acc324336d9fa600945e000 100644 (file)
--- a/include/wx/wrapsizer.h
+++ b/include/wx/wrapsizer.h
@@ -3,7 +3,6 @@
 // Purpose:     provide wrapping sizer for layout (wxWrapSizer)
 // Author:      Arne Steinarson
 // Created:     2008-05-08
 // Purpose:     provide wrapping sizer for layout (wxWrapSizer)
 // Author:      Arne Steinarson
 // Created:     2008-05-08

-// RCS-ID:      $Id$

 // Copyright:   (c) Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Arne Steinarson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -39,6 +38,10 @@ public:
     virtual wxSize CalcMin();
     virtual void RecalcSizes();
 
     virtual wxSize CalcMin();
     virtual void RecalcSizes();
 

+    virtual bool InformFirstDirection(int direction,
+                                      int size,
+                                      int availableOtherDir);
+

 protected:
     // This method is called to decide if an item represents empty space or
     // not. We do this to avoid having space-only items first or last on a
 protected:
     // This method is called to decide if an item represents empty space or
     // not. We do this to avoid having space-only items first or last on a


@@ -52,10 +55,6 @@ protected:
         return item->IsSpacer();
     }
 
         return item->IsSpacer();
     }
 

-    virtual bool InformFirstDirection(int direction,
-                                      int size,
-                                      int availableOtherDir );
-

     // helpers of CalcMin()
     void CalcMinFromMinor(int totMinor);
     void CalcMinFromMajor(int totMajor);
     // helpers of CalcMin()
     void CalcMinFromMinor(int totMinor);
     void CalcMinFromMajor(int totMajor);


@@ -94,8 +93,7 @@ protected:
 
     wxBoxSizer m_rows;       // Sizer containing multiple rows of our items
 
 
     wxBoxSizer m_rows;       // Sizer containing multiple rows of our items
 

-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer)

 };
 
 #endif // _WX_WRAPSIZER_H_
 };
 
 #endif // _WX_WRAPSIZER_H_