Some warnings removed.

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

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 83b610a2ea33b586ee2633b2562a0c232aea6fd4..44a00d57b627a86d8cba0dc8dd9f20fe5acbd3ca 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -230,13 +230,21 @@ class WXDLLEXPORT wxSizer: public wxWindow
   ~wxSizer();
 
   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 SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+  virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
+
   virtual void GetSize(int *w, int *h) const;
-  inline virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
+  wxSize GetSize() const { return wxWindow::GetSize(); }
+
+  virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
+  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
+
   virtual void GetPosition(int *x, int *y) const;
+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
 
   inline void SizerSetSize(int x, int y, int w, int h)
     { SetSize(x, y, w, h); }
@@ -277,9 +285,7 @@ class WXDLLEXPORT wxRowColSizer: public wxSizer
   ~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; }