projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile fix for --disable-ffile.
[wxWidgets.git]
/
include
/
wx
/
layout.h
diff --git
a/include/wx/layout.h
b/include/wx/layout.h
index 388398b9e1a922e39fdebbf1cf50a9ef69639fda..62655782b8a6692d70b1fd3d9d0a5b0634c58c72 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: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_LAYOUT
H_
_
-#define _WX_LAYOUT
H_
_
+#ifndef _WX_LAYOUT
_H
_
+#define _WX_LAYOUT
_H
_
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(__APPLE__)
- #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,6
+26,8
@@
#undef Below
#endif
#undef Below
#endif
+#if wxUSE_CONSTRAINTS
+
// ----------------------------------------------------------------------------
// forward declrations
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// forward declrations
// ----------------------------------------------------------------------------
@@
-73,7
+71,7
@@
public:
// note that default copy ctor and assignment operators are ok
// 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);
@@
-149,6
+147,8
@@
protected:
int percent;
wxEdge otherEdge;
bool done;
int percent;
wxEdge otherEdge;
bool done;
+
+ DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-174,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
@@
-186,5
+186,6
@@
public:
DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
};
DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
};
-#endif
- // _WX_LAYOUTH__
+#endif // wxUSE_CONSTRAINTS
+
+#endif // _WX_LAYOUT_H_