// wxSizerFlags: flags used for an item in the sizer
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxSizerFlags
+class WXDLLIMPEXP_CORE wxSizerFlags
{
public:
// construct the flags object initialized with the given proportion (0 by
return *this;
}
- wxSizerFlags& Align(int alignment) // combination of wxAlignment values
+ wxSizerFlags& Expand()
{
- m_flags &= ~wxALIGN_MASK;
- m_flags |= alignment;
-
+ m_flags |= wxEXPAND;
return *this;
}
- wxSizerFlags& Expand()
+ // notice that Align() replaces the current alignment flags, use specific
+ // methods below such as Top(), Left() &c if you want to set just the
+ // vertical or horizontal alignment
+ wxSizerFlags& Align(int alignment) // combination of wxAlignment values
{
- m_flags |= wxEXPAND;
+ m_flags &= ~wxALIGN_MASK;
+ m_flags |= alignment;
+
return *this;
}
// some shortcuts for Align()
wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); }
wxSizerFlags& Center() { return Centre(); }
- wxSizerFlags& Top() { return Align(wxALIGN_TOP); }
- wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
- wxSizerFlags& Right() { return Align(wxALIGN_RIGHT); }
- wxSizerFlags& Bottom() { return Align(wxALIGN_BOTTOM); }
+
+ wxSizerFlags& Top()
+ {
+ m_flags &= ~(wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL);
+ return *this;
+ }
+
+ wxSizerFlags& Left()
+ {
+ m_flags &= ~(wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL);
+ return *this;
+ }
+
+ wxSizerFlags& Right()
+ {
+ m_flags = (m_flags & ~wxALIGN_CENTRE_HORIZONTAL) | wxALIGN_RIGHT;
+ return *this;
+ }
+
+ wxSizerFlags& Bottom()
+ {
+ m_flags = (m_flags & ~wxALIGN_CENTRE_VERTICAL) | wxALIGN_BOTTOM;
+ return *this;
+ }
+
// default border size used by Border() below
static int GetDefaultBorder()
{
#if wxUSE_BORDER_BY_DEFAULT
+ #ifdef __WXGTK20__
+ // GNOME HIG says to use 6px as the base unit:
+ // http://library.gnome.org/devel/hig-book/stable/design-window.html.en
+ return 6;
+ #else
// FIXME: default border size shouldn't be hardcoded and at the very
// least they should depend on the current font size
return 5;
+ #endif
#else
return 0;
#endif
return *this;
}
+ // makes the item ignore window's visibility status
+ wxSizerFlags& ReserveSpaceEvenIfHidden()
+ {
+ m_flags |= wxRESERVE_SPACE_EVEN_IF_HIDDEN;
+ return *this;
+ }
+
// accessors for wxSizer only
int GetProportion() const { return m_proportion; }
int GetFlags() const { return m_flags; }
// wxSizerSpacer: used by wxSizerItem to represent a spacer
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxSizerSpacer
+class WXDLLIMPEXP_CORE wxSizerSpacer
{
public:
wxSizerSpacer(const wxSize& size) : m_size(size), m_isShown(true) { }
// wxSizerItem
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxSizerItem : public wxObject
+class WXDLLIMPEXP_CORE wxSizerItem : public wxObject
{
public:
// window
{ return m_kind == Item_Sizer ? m_sizer : NULL; }
wxSize GetSpacer() const;
- // this function behaves obviously for the windows and spacers but for the
+ // This function behaves obviously for the windows and spacers but for the
// sizers it returns true if any sizer element is shown and only returns
- // false if all of them are hidden
+ // false if all of them are hidden. Also, it always returns true if
+ // wxRESERVE_SPACE_EVEN_IF_HIDDEN flag was used.
bool IsShown() const;
+
void Show(bool show);
void SetUserData(wxObject* userData)
// wxSizer
//---------------------------------------------------------------------------
-class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer
+class WXDLLIMPEXP_CORE wxSizer: public wxObject, public wxClientDataContainer
{
public:
wxSizer() { m_containingWindow = NULL; }
virtual void Layout();
+ wxSize ComputeFittingClientSize(wxWindow *window);
+ wxSize ComputeFittingWindowSize(wxWindow *window);
+
wxSize Fit( wxWindow *window );
void FitInside( wxWindow *window );
void SetSizeHints( wxWindow *window );
const wxSizerItemList& GetChildren() const
{ return m_children; }
- void SetDimension( int x, int y, int width, int height );
+ void SetDimension(const wxPoint& pos, const wxSize& size)
+ {
+ m_position = pos;
+ m_size = size;
+ Layout();
+ }
+ void SetDimension(int x, int y, int width, int height)
+ { SetDimension(wxPoint(x, y), wxSize(width, height)); }
wxSizerItem* GetItem( wxWindow *window, bool recursive = false );
wxSizerItem* GetItem( wxSizer *sizer, bool recursive = false );
// the window this sizer is used in, can be NULL
wxWindow *m_containingWindow;
- wxSize GetMaxWindowSize( wxWindow *window ) const;
- wxSize GetMinWindowSize( wxWindow *window );
wxSize GetMaxClientSize( wxWindow *window ) const;
wxSize GetMinClientSize( wxWindow *window );
wxSize VirtualFitSize( wxWindow *window );
// wxGridSizer
//---------------------------------------------------------------------------
-class WXDLLEXPORT wxGridSizer: public wxSizer
+class WXDLLIMPEXP_CORE wxGridSizer: public wxSizer
{
public:
wxGridSizer( int rows, int cols, int vgap, int hgap );
wxFLEX_GROWMODE_ALL
};
-class WXDLLEXPORT wxFlexGridSizer: public wxGridSizer
+class WXDLLIMPEXP_CORE wxFlexGridSizer: public wxGridSizer
{
public:
// ctors/dtor
void AddGrowableCol( size_t idx, int proportion = 0 );
void RemoveGrowableCol( size_t idx );
+ bool IsRowGrowable( size_t idx );
+ bool IsColGrowable( size_t idx );
// the sizer cells may grow in both directions, not grow at all or only
// grow in one direction but not the other
// wxBoxSizer
//---------------------------------------------------------------------------
-class WXDLLEXPORT wxBoxSizer: public wxSizer
+class WXDLLIMPEXP_CORE wxBoxSizer: public wxSizer
{
public:
wxBoxSizer(int orient)
{
m_orient = orient;
+ m_totalProportion = 0;
wxASSERT_MSG( m_orient == wxHORIZONTAL || m_orient == wxVERTICAL,
_T("invalid value for wxBoxSizer orientation") );
DECLARE_CLASS(wxBoxSizer)
};
-//---------------------------------------------------------------------------
-// wxWrapSizer - A box sizer that can wrap items on several lines when
-// widths exceed available width.
-//---------------------------------------------------------------------------
-
-// Borrow unused flag value
-#define wxEXTEND_LAST_ON_EACH_LINE wxFULL_REPAINT_ON_RESIZE
-
-class WXDLLEXPORT wxWrapSizer: public wxBoxSizer
-{
-public:
- wxWrapSizer( int orient=wxHORIZONTAL, int flags=wxEXTEND_LAST_ON_EACH_LINE );
- virtual ~wxWrapSizer();
-
- virtual void RecalcSizes();
- virtual wxSize CalcMin();
-
- virtual bool InformFirstDirection( int direction, int size, int availableOtherDir );
-
-protected:
- int m_prim_size_last; // Size in primary direction last time
- int m_n_line; // Number of lines
- wxBoxSizer m_rows; // Rows of items
- int m_flags;
-
- void AdjustPropLastItem(wxSizer *psz, wxSizerItem *itemLast);
-
- DECLARE_DYNAMIC_CLASS(wxWrapSizer)
-};
-
//---------------------------------------------------------------------------
// wxStaticBoxSizer
//---------------------------------------------------------------------------
class WXDLLIMPEXP_FWD_CORE wxStaticBox;
-class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
+class WXDLLIMPEXP_CORE wxStaticBoxSizer: public wxBoxSizer
{
public:
wxStaticBoxSizer(wxStaticBox *box, int orient);
#if wxUSE_BUTTON
-class WXDLLEXPORT wxStdDialogButtonSizer: public wxBoxSizer
+class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer
{
public:
// Constructor just creates a new wxBoxSizer, not much else.
projects / wxWidgets.git / blobdiff