Interface fixes and tweaks for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-12-30 06:14:17 +00:00
parent e4aadc2f1d
commit 50e55c13ea
11 changed files with 114 additions and 35 deletions

View File

@@ -14,6 +14,7 @@
#define wxBU_EXACTFIT 0x0001
#define wxBU_NOTEXT 0x0002
#define wxBU_AUTODRAW 0x0004
/**

View File

@@ -6,6 +6,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#define wxDD_DEFAULT_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
/**
@class wxDirDialog

View File

@@ -1560,6 +1560,23 @@ public:
enum
{
wxJOYSTICK1,
wxJOYSTICK2
};
// Which button is down?
enum
{
wxJOY_BUTTON_ANY = -1,
wxJOY_BUTTON1 = 1,
wxJOY_BUTTON2 = 2,
wxJOY_BUTTON3 = 4,
wxJOY_BUTTON4 = 8
};
/**
@class wxJoystickEvent

View File

@@ -17,6 +17,8 @@ enum
wxFD_PREVIEW = 0x0100
};
#define wxFD_DEFAULT_STYLE wxFD_OPEN
/**
@class wxFileDialog

View File

@@ -350,6 +350,9 @@ const unsigned char wxIMAGE_ALPHA_TRANSPARENT = 0;
*/
const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff;
const unsigned char wxIMAGE_ALPHA_THRESHOLD = 0x80;
/**
@class wxImage

View File

@@ -6,41 +6,6 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/**
Signal constants used by wxProcess.
*/
enum wxSignal
{
wxSIGNONE = 0, //!< verify if the process exists under Unix
wxSIGHUP,
wxSIGINT,
wxSIGQUIT,
wxSIGILL,
wxSIGTRAP,
wxSIGABRT,
wxSIGEMT,
wxSIGFPE,
wxSIGKILL, //!< forcefully kill, dangerous!
wxSIGBUS,
wxSIGSEGV,
wxSIGSYS,
wxSIGPIPE,
wxSIGALRM,
wxSIGTERM //!< terminate the process gently
};
/**
Return values for wxProcess::Kill.
*/
enum wxKillError
{
wxKILL_OK, //!< no error
wxKILL_BAD_SIGNAL, //!< no such signal
wxKILL_ACCESS_DENIED, //!< permission denied
wxKILL_NO_PROCESS, //!< no such process
wxKILL_ERROR //!< another, unspecified error
};
/**
@class wxProcess

View File

@@ -240,5 +240,10 @@ public:
@see GetThumbPosition()
*/
virtual void SetThumbPosition(int viewStart);
/**
Returns @true for scrollbars that have the vertical style set.
*/
bool IsVertical() const;
};

View File

@@ -52,6 +52,8 @@
#define wxTE_RICH2 0x8000
#define wxTEXT_TYPE_ANY 0
/**
wxTextCoord is a line or row number

View File

@@ -34,6 +34,14 @@ enum
wxFULLSCREEN_NOCAPTION
};
#define wxDEFAULT_FRAME_STYLE (wxSYSTEM_MENU | \
wxRESIZE_BORDER | \
wxMINIMIZE_BOX | \
wxMAXIMIZE_BOX | \
wxCLOSE_BOX | \
wxCAPTION | \
wxCLIP_CHILDREN)
/**
@class wxTopLevelWindow

View File

@@ -6,6 +6,56 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/**
Signal constants used by wxProcess.
*/
enum wxSignal
{
wxSIGNONE = 0, //!< verify if the process exists under Unix
wxSIGHUP,
wxSIGINT,
wxSIGQUIT,
wxSIGILL,
wxSIGTRAP,
wxSIGABRT,
wxSIGEMT,
wxSIGFPE,
wxSIGKILL, //!< forcefully kill, dangerous!
wxSIGBUS,
wxSIGSEGV,
wxSIGSYS,
wxSIGPIPE,
wxSIGALRM,
wxSIGTERM //!< terminate the process gently
};
/**
Return values for wxProcess::Kill.
*/
enum wxKillError
{
wxKILL_OK, //!< no error
wxKILL_BAD_SIGNAL, //!< no such signal
wxKILL_ACCESS_DENIED, //!< permission denied
wxKILL_NO_PROCESS, //!< no such process
wxKILL_ERROR //!< another, unspecified error
};
enum wxKillFlags
{
wxKILL_NOCHILDREN = 0, //!< don't kill children
wxKILL_CHILDREN = 1 //!< kill children
};
enum wxShutdownFlags
{
wxSHUTDOWN_FORCE = 1, //!< can be combined with other flags (MSW-only)
wxSHUTDOWN_POWEROFF = 2, //!< power off the computer
wxSHUTDOWN_REBOOT = 4, //!< shutdown and reboot
wxSHUTDOWN_LOGOFF = 8 //!< close session (currently MSW-only)
};
/**
@class wxWindowDisabler
@@ -523,6 +573,22 @@ void wxQsort(void* pbase, size_t total_elems,
*/
void wxSetDisplayName(const wxString& displayName);
/**
flags for wxStripMenuCodes
*/
enum
{
// strip '&' characters
wxStrip_Mnemonics = 1,
// strip everything after '\t'
wxStrip_Accel = 2,
// strip everything (this is the default)
wxStrip_All = wxStrip_Mnemonics | wxStrip_Accel
};
/**
Strips any menu codes from @a str and returns the result.

View File

@@ -6,6 +6,14 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// flags for wxWrapSizer
enum
{
wxEXTEND_LAST_ON_EACH_LINE,
wxREMOVE_LEADING_SPACES,
wxWRAPSIZER_DEFAULT_FLAGS
};
/**
@class wxWrapSizer