projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxVariant <-> wxAny conversion functionality. Includes implicit construction of wxAny...
[wxWidgets.git]
/
include
/
wx
/
layout.h
diff --git
a/include/wx/layout.h
b/include/wx/layout.h
index 26ca1119ef31d851c2295e719d700e97c4593d56..accc8836eb9108d6f77b152ac2ea2de6f7195818 100644
(file)
--- a/
include/wx/layout.h
+++ b/
include/wx/layout.h
@@
-1,25
+1,21
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: layout.h
-// Purpose:
Layout classes
+// Name:
wx/
layout.h
+// Purpose:
OBSOLETE layout constraint classes, use sizers instead
// Author: Julian Smart
// Modified by:
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
// Author: Julian Smart
// Modified by:
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_LAYOUT
H_
_
-#define _WX_LAYOUT
H_
_
+#ifndef _WX_LAYOUT
_H
_
+#define _WX_LAYOUT
_H
_
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "layout.h"
-#endif
-
#include "wx/object.h"
// X stupidly defines these in X.h
#include "wx/object.h"
// X stupidly defines these in X.h
@@
-30,12
+26,14
@@
#undef Below
#endif
#undef Below
#endif
+#if wxUSE_CONSTRAINTS
+
// ----------------------------------------------------------------------------
// forward declrations
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// forward declrations
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxWindowBase;
-class WXDLL
EXPORT
wxLayoutConstraints;
+class WXDLL
IMPEXP_FWD_CORE
wxWindowBase;
+class WXDLL
IMPEXP_FWD_CORE
wxLayoutConstraints;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-66,14
+64,14
@@
enum wxRelationship
// wxIndividualLayoutConstraint: a constraint on window position
// ----------------------------------------------------------------------------
// wxIndividualLayoutConstraint: a constraint on window position
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxIndividualLayoutConstraint : public wxObject
+class WXDLL
IMPEXP_CORE
wxIndividualLayoutConstraint : public wxObject
{
public:
wxIndividualLayoutConstraint();
// note that default copy ctor and assignment operators are ok
{
public:
wxIndividualLayoutConstraint();
// note that default copy ctor and assignment operators are ok
- ~wxIndividualLayoutConstraint();
+ virtual ~wxIndividualLayoutConstraint(){}
void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN);
void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN);
@@
-157,7
+155,7
@@
protected:
// wxLayoutConstraints: the complete set of constraints for a window
// ----------------------------------------------------------------------------
// wxLayoutConstraints: the complete set of constraints for a window
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxLayoutConstraints : public wxObject
+class WXDLL
IMPEXP_CORE
wxLayoutConstraints : public wxObject
{
public:
// Edge constraints
{
public:
// Edge constraints
@@
-176,7
+174,7
@@
public:
// note that default copy ctor and assignment operators are ok
// note that default copy ctor and assignment operators are ok
- ~wxLayoutConstraints();
+ virtual ~wxLayoutConstraints(){}
bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
bool AreSatisfied() const
bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
bool AreSatisfied() const
@@
-188,5
+186,6
@@
public:
DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
};
DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
};
-#endif
- // _WX_LAYOUTH__
+#endif // wxUSE_CONSTRAINTS
+
+#endif // _WX_LAYOUT_H_