Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-05-30 03:13:27 +00:00
parent 09e7316547
commit 7d40f0a500
3 changed files with 28 additions and 23 deletions

View File

@@ -6,6 +6,14 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/**
Frame specific styles
*/
#define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only)
#define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu
#define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent
/**
@class wxFrame

View File

@@ -199,7 +199,7 @@ public:
@param name
Window name.
*/
wxSashLayoutWindow(wxSashLayoutWindow* parent, wxWindowID id,
wxSashLayoutWindow(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxCLIP_CHILDREN | wxSW_3D,
@@ -372,6 +372,8 @@ public:
};
wxEventType wxEVT_QUERY_LAYOUT_INFO;
/**
@class wxCalculateLayoutEvent
@@ -425,3 +427,5 @@ public:
void SetRect(const wxRect& rect);
};
wxEventType wxEVT_CALCULATE_LAYOUT;

View File

@@ -6,6 +6,15 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/**
wxSashWindow flags
*/
#define wxSW_NOBORDER 0x0000
#define wxSW_BORDER 0x0020
#define wxSW_3DSASH 0x0040
#define wxSW_3DBORDER 0x0080
#define wxSW_3D (wxSW_3DSASH | wxSW_3DBORDER)
/**
See wxSashWindow.
@@ -134,17 +143,6 @@ public:
*/
bool GetSashVisible(wxSashEdgePosition edge) const;
/**
Returns @true if the sash has a border, @false otherwise.
This function is obsolete since the sash border property is unused.
@param edge
Edge. One of wxSASH_TOP, wxSASH_RIGHT, wxSASH_BOTTOM, wxSASH_LEFT.
@see SetSashBorder()
*/
bool HasBorder(wxSashEdgePosition edge) const;
/**
Sets the maximum window size in the x direction.
*/
@@ -165,17 +163,6 @@ public:
*/
virtual void SetMinimumSizeY(int min);
/**
Call this function to give the sash a border, or remove the border.
This function is obsolete since the sash border property is unused.
@param edge
Edge to change. One of wxSASH_TOP, wxSASH_RIGHT, wxSASH_BOTTOM, wxSASH_LEFT.
@param hasBorder
@true to give the sash a border visible, @false to remove it.
*/
void SetSashBorder(wxSashEdgePosition edge, bool hasBorder);
/**
Call this function to make a sash visible or invisible on a particular edge.
@@ -252,5 +239,11 @@ public:
The return value is one of wxSASH_TOP, wxSASH_RIGHT, wxSASH_BOTTOM, wxSASH_LEFT.
*/
wxSashEdgePosition GetEdge() const;
void SetEdge(wxSashEdgePosition edge);
void SetDragRect(const wxRect& rect);
void SetDragStatus(wxSashDragStatus status);
};
wxEventType wxEVT_SASH_DRAGGED;