Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/wrapsizer.h b/include/wx/wrapsizer.h
index 1146af81119eaee0f3d8f761f38b0339404276ed..60fa51d149ae29da60a07ecafa31ca0ba3ed8243 100644 (file)
--- a/include/wx/wrapsizer.h
+++ b/include/wx/wrapsizer.h
@@ -39,6 +39,10 @@ public:
     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
@@ -52,10 +56,6 @@ protected:
         return item->IsSpacer();
     }
 
-    virtual bool InformFirstDirection(int direction,
-                                      int size,
-                                      int availableOtherDir );
-
     // helpers of CalcMin()
     void CalcMinFromMinor(int totMinor);
     void CalcMinFromMajor(int totMajor);
@@ -94,8 +94,7 @@ protected:
 
     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_