wxWidgets3: update to svn r70933

This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions

View File

@ -4,7 +4,7 @@
// Author: Robert Roebling and Robin Dunn
// Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
// Created:
// RCS-ID: $Id: sizer.h 66862 2011-02-08 13:36:13Z VZ $
// RCS-ID: $Id: sizer.h 69970 2011-12-10 04:34:06Z RD $
// Copyright: (c) Robin Dunn, Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -251,10 +251,10 @@ class WXDLLIMPEXP_CORE wxSizerItem : public wxObject
public:
// window
wxSizerItem( wxWindow *window,
int proportion,
int flag,
int border,
wxObject* userData );
int proportion=0,
int flag=0,
int border=0,
wxObject* userData=NULL );
// window with flags
wxSizerItem(wxWindow *window, const wxSizerFlags& flags)
@ -266,10 +266,10 @@ public:
// subsizer
wxSizerItem( wxSizer *sizer,
int proportion,
int flag,
int border,
wxObject* userData );
int proportion=0,
int flag=0,
int border=0,
wxObject* userData=NULL );
// sizer with flags
wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)
@ -282,10 +282,10 @@ public:
// spacer
wxSizerItem( int width,
int height,
int proportion,
int flag,
int border,
wxObject* userData);
int proportion=0,
int flag=0,
int border=0,
wxObject* userData=NULL);
// spacer with flags
wxSizerItem(int width, int height, const wxSizerFlags& flags)