Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxGTK compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-04 16:01:30 +00:00
parent a9aedce135
commit a532afbbab
1 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/wx/layout.h
View File

@@ -203,11 +203,12 @@ to the top of the hierarchy and call Layout() again.
*/ */
typedef enum { enum wxSizerBehaviour
{
wxSizerShrink, wxSizerShrink,
wxSizerExpand, wxSizerExpand,
wxSizerNone wxSizerNone
} wxSizerBehaviour; };
#define wxTYPE_SIZER 90 #define wxTYPE_SIZER 90
@@ -215,7 +216,6 @@ class WXDLLEXPORT wxSizer: public wxWindow
{ {
DECLARE_DYNAMIC_CLASS(wxSizer) DECLARE_DYNAMIC_CLASS(wxSizer)
private:
protected: protected:
wxSizerBehaviour sizerBehaviour; wxSizerBehaviour sizerBehaviour;
int borderX; int borderX;
@@ -224,6 +224,7 @@ class WXDLLEXPORT wxSizer: public wxWindow
int sizerHeight; int sizerHeight;
int sizerX; int sizerX;
int sizerY; int sizerY;
public: public:
wxSizer(); wxSizer();
wxSizer(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone); wxSizer(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
@@ -233,8 +234,9 @@ class WXDLLEXPORT wxSizer: public wxWindow
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO); 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) virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); } { wxWindow::SetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); } 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 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;
@@ -246,20 +248,18 @@ class WXDLLEXPORT wxSizer: public wxWindow
virtual void GetPosition(int *x, int *y) const; virtual void GetPosition(int *x, int *y) const;
wxPoint GetPosition() const { return wxWindow::GetPosition(); } wxPoint GetPosition() const { return wxWindow::GetPosition(); }
inline void SizerSetSize(int x, int y, int w, int h) void SizerSetSize(int x, int y, int w, int h) { SetSize(x, y, w, h); }
{ SetSize(x, y, w, h); } void SizerMove(int x, int y) { Move(x, y); }
inline void SizerMove(int x, int y)
{ Move(x, y); }
virtual void SetBorder(int w, int h); virtual void SetBorder(int w, int h);
inline int GetBorderX() { return borderX ; } int GetBorderX() { return borderX ; }
inline int GetBorderY() { return borderY ; } int GetBorderY() { return borderY ; }
virtual void AddSizerChild(wxWindow *child); virtual void AddSizerChild(wxWindow *child);
virtual void RemoveSizerChild(wxWindow *child); virtual void RemoveSizerChild(wxWindow *child);
inline virtual void SetBehaviour(wxSizerBehaviour b) { sizerBehaviour = b; } virtual void SetBehaviour(wxSizerBehaviour b) { sizerBehaviour = b; }
inline virtual wxSizerBehaviour GetBehaviour() { return sizerBehaviour; } virtual wxSizerBehaviour GetBehaviour() { return sizerBehaviour; }
virtual bool LayoutPhase1(int *); virtual bool LayoutPhase1(int *);
virtual bool LayoutPhase2(int *); virtual bool LayoutPhase2(int *);
@@ -272,27 +272,29 @@ class WXDLLEXPORT wxRowColSizer: public wxSizer
{ {
DECLARE_DYNAMIC_CLASS(wxRowColSizer) DECLARE_DYNAMIC_CLASS(wxRowColSizer)
private:
protected: protected:
bool rowOrCol; bool rowOrCol;
int rowOrColSize; int rowOrColSize;
int xSpacing; int xSpacing;
int ySpacing; int ySpacing;
public: public:
// rowOrCol = TRUE to be laid out in rows, otherwise in columns. // rowOrCol = TRUE to be laid out in rows, otherwise in columns.
wxRowColSizer(); wxRowColSizer();
wxRowColSizer(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS, int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink); wxRowColSizer(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS,
int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);
~wxRowColSizer(); ~wxRowColSizer();
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 SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
inline virtual void SetRowOrCol(bool rc) { rowOrCol = rc; } virtual void SetRowOrCol(bool rc) { rowOrCol = rc; }
inline virtual bool GetRowOrCol() { return rowOrCol; } virtual bool GetRowOrCol() { return rowOrCol; }
inline virtual void SetRowOrColSize(int n) { rowOrColSize = n; } virtual void SetRowOrColSize(int n) { rowOrColSize = n; }
inline virtual int GetRowOrColSize() { return rowOrColSize; } virtual int GetRowOrColSize() { return rowOrColSize; }
inline virtual void SetSpacing(int x, int y) { xSpacing = x; ySpacing = y; } virtual void SetSpacing(int x, int y) { xSpacing = x; ySpacing = y; }
inline virtual void GetSpacing(int *x, int *y) { *x = xSpacing; *y = ySpacing; } virtual void GetSpacing(int *x, int *y) { *x = xSpacing; *y = ySpacing; }
bool LayoutPhase1(int *); bool LayoutPhase1(int *);
bool LayoutPhase2(int *); bool LayoutPhase2(int *);
@@ -302,8 +304,6 @@ class WXDLLEXPORT wxSpacingSizer: public wxSizer
{ {
DECLARE_DYNAMIC_CLASS(wxSpacingSizer) DECLARE_DYNAMIC_CLASS(wxSpacingSizer)
private:
protected:
public: public:
wxSpacingSizer(); wxSpacingSizer();
wxSpacingSizer(wxWindow *parent, wxRelationship rel, wxWindow *other, int spacing); wxSpacingSizer(wxWindow *parent, wxRelationship rel, wxWindow *other, int spacing);