wxGLCanvas works again

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

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 7a52593c04fe6e90d8f91bd41a0c6e3d15ff5842..960ad9071623b0a6db7b23fc989a2b07035ea1aa 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -232,21 +232,11 @@ public:
 
     bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
 
 
     bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
 

-    virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
-    virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-        { wxWindow::SetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
-    virtual void SetSize(const wxSize& size)
-        { wxWindow::SetSize(size.x, size.y); }
-    virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
-

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

-    wxSize GetSize() const { return wxWindow::GetSize(); }

 
     virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
 
     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;
 
     virtual void GetPosition(int *x, int *y) const;

-    wxPoint GetPosition() const { return wxWindow::GetPosition(); }

 
     void SizerSetSize(int x, int y, int w, int h) { SetSize(x, y, w, h); }
     void SizerMove(int x, int y) { Move(x, y); }
 
     void SizerSetSize(int x, int y, int w, int h) { SetSize(x, y, w, h); }
     void SizerMove(int x, int y) { Move(x, y); }


@@ -263,6 +253,11 @@ public:
 
     virtual bool LayoutPhase1(int *);
     virtual bool LayoutPhase2(int *);
 
     virtual bool LayoutPhase1(int *);
     virtual bool LayoutPhase2(int *);

+
+protected:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

 };
 
 #define wxSIZER_ROWS  TRUE
 };
 
 #define wxSIZER_ROWS  TRUE


@@ -287,7 +282,6 @@ public:
 
     bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS,
                 int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);
 
     bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS,
                 int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);

-    virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);

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