wxPaintDC -> wxDC in wxListCtrl; fixed compile problems in wxTreeCtrl (return

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

diff --git a/include/wx/layout.h b/include/wx/layout.h
index a03b1d72c302fb4005d0302a25355f22b7ef8558..04ae4f1401227761f363f18e1fac349a27d5c229 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -48,6 +48,9 @@ class WXDLLEXPORT wxIndividualLayoutConstraint: public wxObject
   DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
 
  protected:
   DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
 
  protected:

+   // To be allowed to modify the internal variables
+   friend class wxIndividualLayoutConstraint_Serialize;
+

    // 'This' window is the parent or sibling of otherWin
    wxWindow *otherWin;
 
    // 'This' window is the parent or sibling of otherWin
    wxWindow *otherWin;
 


@@ -228,11 +231,9 @@ class WXDLLEXPORT wxSizer: public wxWindow
 
   bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
   virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
 
   bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
   virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);

-  // Avoid compiler warning
-  void SetSize(int w, int h) { wxWindow::SetSize(w, h); }
-  virtual void Move(int x, int y);

   virtual void GetSize(int *w, int *h) const;
   virtual void GetSize(int *w, int *h) const;

-  inline virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
+
+  virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }

   virtual void GetPosition(int *x, int *y) const;
 
   inline void SizerSetSize(int x, int y, int w, int h)
   virtual void GetPosition(int *x, int *y) const;
 
   inline void SizerSetSize(int x, int y, int w, int h)


@@ -274,9 +275,7 @@ class WXDLLEXPORT wxRowColSizer: public wxSizer
   ~wxRowColSizer();
 
   bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS, int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);
   ~wxRowColSizer();
 
   bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS, int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);

-  void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
-  // Avoid compiler warning
-  void SetSize(int w, int h) { wxSizer::SetSize(w, h); }
+  virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);

 
   inline virtual void SetRowOrCol(bool rc) { rowOrCol = rc; }
   inline virtual bool GetRowOrCol() { return rowOrCol; }
 
   inline virtual void SetRowOrCol(bool rc) { rowOrCol = rc; }
   inline virtual bool GetRowOrCol() { return rowOrCol; }