remove extra semicolons, correct virtual access

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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 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 +56,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 +94,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_

diff --git a/src/common/wrapsizer.cpp b/src/common/wrapsizer.cpp
index 91a43c2ea57dc8d02ff606968c467c6558a1397e..3884201b443317e92e33cd688149b228ce2c5d19 100644 (file)
--- a/src/common/wrapsizer.cpp
+++ b/src/common/wrapsizer.cpp
@@ -68,7 +68,7 @@ private:
 // wxWrapSizer implementation
 // ============================================================================
 
 // wxWrapSizer implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer);
+IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer)

 
 wxWrapSizer::wxWrapSizer(int orient, int flags)
            : wxBoxSizer(orient),
 
 wxWrapSizer::wxWrapSizer(int orient, int flags)
            : wxBoxSizer(orient),