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

Rename wxEllipsizeFlags elements to avoid confusion with wxEllipsizeMode.

Browse Source 
We shouldn't use the same "wxELLIPSIZE_" prefix for two different enums, so
use wxELLIPSIZE_FLAGS one for wxEllipsizeFlags (they should be used less often
than wxEllipsizeMode so it's better to keep the short prefix for the latter).

Also add wxELLIPSIZE_FLAGS_NONE flag.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-16 21:32:51 +00:00
parent 73b1b99623
commit 355ce7adea
5 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/control.h
View File

@@ -31,10 +31,12 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[];
enum wxEllipsizeFlags
{
wxELLIPSIZE_PROCESS_MNEMONICS = 1,
wxELLIPSIZE_EXPAND_TAB = 2,
wxELLIPSIZE_FLAGS_NONE = 0,
wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS = 1,
wxELLIPSIZE_FLAGS_EXPAND_TABS = 2,
wxELLIPSIZE_DEFAULT_FLAGS = wxELLIPSIZE_PROCESS_MNEMONICS|wxELLIPSIZE_EXPAND_TAB
wxELLIPSIZE_FLAGS_DEFAULT = wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS |
wxELLIPSIZE_FLAGS_EXPAND_TABS
};
enum wxEllipsizeMode
@@ -115,7 +117,7 @@ public:
// replaces parts of the (multiline) string with ellipsis if needed
static wxString Ellipsize(const wxString& label, const wxDC& dc,
wxEllipsizeMode mode, int maxWidth,
int flags = wxELLIPSIZE_DEFAULT_FLAGS);
int flags = wxELLIPSIZE_FLAGS_DEFAULT);
// get the string without mnemonic characters ('&')
static wxString GetLabelText(const wxString& label);