From 9add303f76ec567ea054f8c8319865ca37a84aae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 28 Sep 2015 15:05:20 +0200 Subject: [PATCH] Move wxEllipsize{Flags,Mode} to wx/gdicmn.h This will allow using these constants from other headers without having to include wx/control.h. See https://github.com/wxWidgets/wxWidgets/pull/97 --- include/wx/control.h | 25 +------------------ include/wx/gdicmn.h | 24 +++++++++++++++++++ interface/wx/control.h | 54 ------------------------------------------ interface/wx/gdicmn.h | 54 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 78 deletions(-) diff --git a/include/wx/control.h b/include/wx/control.h index a90a799dda..86563645e0 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -20,34 +20,11 @@ #if wxUSE_CONTROLS #include "wx/window.h" // base class +#include "wx/gdicmn.h" // wxEllipsize... extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[]; -// ---------------------------------------------------------------------------- -// Ellipsize() constants -// ---------------------------------------------------------------------------- - -enum wxEllipsizeFlags -{ - wxELLIPSIZE_FLAGS_NONE = 0, - wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS = 1, - wxELLIPSIZE_FLAGS_EXPAND_TABS = 2, - - wxELLIPSIZE_FLAGS_DEFAULT = wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS | - wxELLIPSIZE_FLAGS_EXPAND_TABS -}; - -// NB: Don't change the order of these values, they're the same as in -// PangoEllipsizeMode enum. -enum wxEllipsizeMode -{ - wxELLIPSIZE_NONE, - wxELLIPSIZE_START, - wxELLIPSIZE_MIDDLE, - wxELLIPSIZE_END -}; - // ---------------------------------------------------------------------------- // wxControl is the base class for all controls // ---------------------------------------------------------------------------- diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index bf4dbbbb76..bef06b11ff 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -155,6 +155,30 @@ enum wxStockCursor #define wxCURSOR_CLOSED_HAND wxCURSOR_HAND #endif +// ---------------------------------------------------------------------------- +// Ellipsize() constants +// ---------------------------------------------------------------------------- + +enum wxEllipsizeFlags +{ + wxELLIPSIZE_FLAGS_NONE = 0, + wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS = 1, + wxELLIPSIZE_FLAGS_EXPAND_TABS = 2, + + wxELLIPSIZE_FLAGS_DEFAULT = wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS | + wxELLIPSIZE_FLAGS_EXPAND_TABS +}; + +// NB: Don't change the order of these values, they're the same as in +// PangoEllipsizeMode enum. +enum wxEllipsizeMode +{ + wxELLIPSIZE_NONE, + wxELLIPSIZE_START, + wxELLIPSIZE_MIDDLE, + wxELLIPSIZE_END +}; + // --------------------------------------------------------------------------- // macros // --------------------------------------------------------------------------- diff --git a/interface/wx/control.h b/interface/wx/control.h index 2c0f8f74e7..785cbbf8bd 100644 --- a/interface/wx/control.h +++ b/interface/wx/control.h @@ -5,60 +5,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -/** - Flags used by wxControl::Ellipsize function. -*/ -enum wxEllipsizeFlags -{ - /// No special flags. - wxELLIPSIZE_FLAGS_NONE = 0, - - /** - Take mnemonics into account when calculating the text width. - - With this flag when calculating the size of the passed string, - mnemonics characters (see wxControl::SetLabel) will be automatically - reduced to a single character. This leads to correct calculations only - if the string passed to Ellipsize() will be used with - wxControl::SetLabel. If you don't want ampersand to be interpreted as - mnemonics (e.g. because you use wxControl::SetLabelText) then don't use - this flag. - */ - wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS = 1, - - /** - Expand tabs in spaces when calculating the text width. - - This flag tells wxControl::Ellipsize() to calculate the width of tab - characters @c '\\t' as 6 spaces. - */ - wxELLIPSIZE_FLAGS_EXPAND_TABS = 2, - - /// The default flags for wxControl::Ellipsize. - wxELLIPSIZE_FLAGS_DEFAULT = wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS| - wxELLIPSIZE_FLAGS_EXPAND_TABS -}; - - -/** - The different ellipsization modes supported by the - wxControl::Ellipsize function. -*/ -enum wxEllipsizeMode -{ - /// Don't ellipsize the text at all. @since 2.9.1 - wxELLIPSIZE_NONE, - - /// Put the ellipsis at the start of the string, if the string needs ellipsization. - wxELLIPSIZE_START, - - /// Put the ellipsis in the middle of the string, if the string needs ellipsization. - wxELLIPSIZE_MIDDLE, - - /// Put the ellipsis at the end of the string, if the string needs ellipsization. - wxELLIPSIZE_END -}; - /** @class wxControl diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h index ca3ad06685..5ade936862 100644 --- a/interface/wx/gdicmn.h +++ b/interface/wx/gdicmn.h @@ -107,6 +107,60 @@ enum wxStockCursor wxCURSOR_MAX }; +/** + Flags used by wxControl::Ellipsize function. +*/ +enum wxEllipsizeFlags +{ + /// No special flags. + wxELLIPSIZE_FLAGS_NONE = 0, + + /** + Take mnemonics into account when calculating the text width. + + With this flag when calculating the size of the passed string, + mnemonics characters (see wxControl::SetLabel) will be automatically + reduced to a single character. This leads to correct calculations only + if the string passed to Ellipsize() will be used with + wxControl::SetLabel. If you don't want ampersand to be interpreted as + mnemonics (e.g. because you use wxControl::SetLabelText) then don't use + this flag. + */ + wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS = 1, + + /** + Expand tabs in spaces when calculating the text width. + + This flag tells wxControl::Ellipsize() to calculate the width of tab + characters @c '\\t' as 6 spaces. + */ + wxELLIPSIZE_FLAGS_EXPAND_TABS = 2, + + /// The default flags for wxControl::Ellipsize. + wxELLIPSIZE_FLAGS_DEFAULT = wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS| + wxELLIPSIZE_FLAGS_EXPAND_TABS +}; + + +/** + The different ellipsization modes supported by the + wxControl::Ellipsize and wxRendererNative::DrawItemText() functions. +*/ +enum wxEllipsizeMode +{ + /// Don't ellipsize the text at all. @since 2.9.1 + wxELLIPSIZE_NONE, + + /// Put the ellipsis at the start of the string, if the string needs ellipsization. + wxELLIPSIZE_START, + + /// Put the ellipsis in the middle of the string, if the string needs ellipsization. + wxELLIPSIZE_MIDDLE, + + /// Put the ellipsis at the end of the string, if the string needs ellipsization. + wxELLIPSIZE_END +}; + /**