Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

[wxWidgets.git] / include / wx / control.h

diff --git a/include/wx/control.h b/include/wx/control.h
index 9fa7a65c2149caebada574e6ff02f2f203c5c781..8f1a1767c140da61fad3ed57e3af44738bba6a51 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -31,14 +31,19 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[];
 
 enum wxEllipsizeFlags
 {
 
 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

 };
 
 };
 

+// NB: Don't change the order of these values, they're the same as in
+//     PangoEllipsizeMode enum.

 enum wxEllipsizeMode
 {
 enum wxEllipsizeMode
 {

+    wxELLIPSIZE_NONE,

     wxELLIPSIZE_START,
     wxELLIPSIZE_MIDDLE,
     wxELLIPSIZE_END
     wxELLIPSIZE_START,
     wxELLIPSIZE_MIDDLE,
     wxELLIPSIZE_END


@@ -115,7 +120,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,
     // 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);
 
     // get the string without mnemonic characters ('&')
     static wxString GetLabelText(const wxString& label);