Fixed an accidental name clash, and added back a wxCHECK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-07 20:52:35 +00:00
parent 6c1ad2a8e6
commit 3ff632ce66
2 changed files with 15 additions and 13 deletions
--- a/include/wx/gbsizer.h
+++ b/include/wx/gbsizer.h
@@ -148,14 +148,14 @@ public:
    void GetEndPos(int& row, int& col);

    
-    wxGridBagSizer* GetSizer() const { return m_sizer; }
-    void SetSizer(wxGridBagSizer* sizer) { m_sizer = sizer; }
+    wxGridBagSizer* GetGBSizer() const { return m_gbsizer; }
+    void SetGBSizer(wxGridBagSizer* sizer) { m_gbsizer = sizer; }
    
    
 protected:
    wxGBPosition    m_pos;
    wxGBSpan        m_span;
-    wxGridBagSizer* m_sizer;
+    wxGridBagSizer* m_gbsizer;  // so SetPos/SetSpan can check for intersects

    
 private: