replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code compiles and links fine on Solaris, runs with samples and Mahogany git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,59 +61,59 @@ END_EVENT_TABLE()
|
||||
*/
|
||||
|
||||
#define NUM_COLS 48
|
||||
static wxString wxColourDialogNames[NUM_COLS]={T("ORANGE"),
|
||||
T("GOLDENROD"),
|
||||
T("WHEAT"),
|
||||
T("SPRING GREEN"),
|
||||
T("SKY BLUE"),
|
||||
T("SLATE BLUE"),
|
||||
T("MEDIUM VIOLET RED"),
|
||||
T("PURPLE"),
|
||||
static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
|
||||
wxT("GOLDENROD"),
|
||||
wxT("WHEAT"),
|
||||
wxT("SPRING GREEN"),
|
||||
wxT("SKY BLUE"),
|
||||
wxT("SLATE BLUE"),
|
||||
wxT("MEDIUM VIOLET RED"),
|
||||
wxT("PURPLE"),
|
||||
|
||||
T("RED"),
|
||||
T("YELLOW"),
|
||||
T("MEDIUM SPRING GREEN"),
|
||||
T("PALE GREEN"),
|
||||
T("CYAN"),
|
||||
T("LIGHT STEEL BLUE"),
|
||||
T("ORCHID"),
|
||||
T("LIGHT MAGENTA"),
|
||||
wxT("RED"),
|
||||
wxT("YELLOW"),
|
||||
wxT("MEDIUM SPRING GREEN"),
|
||||
wxT("PALE GREEN"),
|
||||
wxT("CYAN"),
|
||||
wxT("LIGHT STEEL BLUE"),
|
||||
wxT("ORCHID"),
|
||||
wxT("LIGHT MAGENTA"),
|
||||
|
||||
T("BROWN"),
|
||||
T("YELLOW"),
|
||||
T("GREEN"),
|
||||
T("CADET BLUE"),
|
||||
T("MEDIUM BLUE"),
|
||||
T("MAGENTA"),
|
||||
T("MAROON"),
|
||||
T("ORANGE RED"),
|
||||
wxT("BROWN"),
|
||||
wxT("YELLOW"),
|
||||
wxT("GREEN"),
|
||||
wxT("CADET BLUE"),
|
||||
wxT("MEDIUM BLUE"),
|
||||
wxT("MAGENTA"),
|
||||
wxT("MAROON"),
|
||||
wxT("ORANGE RED"),
|
||||
|
||||
T("FIREBRICK"),
|
||||
T("CORAL"),
|
||||
T("FOREST GREEN"),
|
||||
T("AQUAMARINE"),
|
||||
T("BLUE"),
|
||||
T("NAVY"),
|
||||
T("THISTLE"),
|
||||
T("MEDIUM VIOLET RED"),
|
||||
wxT("FIREBRICK"),
|
||||
wxT("CORAL"),
|
||||
wxT("FOREST GREEN"),
|
||||
wxT("AQUAMARINE"),
|
||||
wxT("BLUE"),
|
||||
wxT("NAVY"),
|
||||
wxT("THISTLE"),
|
||||
wxT("MEDIUM VIOLET RED"),
|
||||
|
||||
T("INDIAN RED"),
|
||||
T("GOLD"),
|
||||
T("MEDIUM SEA GREEN"),
|
||||
T("MEDIUM BLUE"),
|
||||
T("MIDNIGHT BLUE"),
|
||||
T("GREY"),
|
||||
T("PURPLE"),
|
||||
T("KHAKI"),
|
||||
wxT("INDIAN RED"),
|
||||
wxT("GOLD"),
|
||||
wxT("MEDIUM SEA GREEN"),
|
||||
wxT("MEDIUM BLUE"),
|
||||
wxT("MIDNIGHT BLUE"),
|
||||
wxT("GREY"),
|
||||
wxT("PURPLE"),
|
||||
wxT("KHAKI"),
|
||||
|
||||
T("BLACK"),
|
||||
T("MEDIUM FOREST GREEN"),
|
||||
T("KHAKI"),
|
||||
T("DARK GREY"),
|
||||
T("SEA GREEN"),
|
||||
T("LIGHT GREY"),
|
||||
T("MEDIUM SLATE BLUE"),
|
||||
T("WHITE")
|
||||
wxT("BLACK"),
|
||||
wxT("MEDIUM FOREST GREEN"),
|
||||
wxT("KHAKI"),
|
||||
wxT("DARK GREY"),
|
||||
wxT("SEA GREEN"),
|
||||
wxT("LIGHT GREY"),
|
||||
wxT("MEDIUM SLATE BLUE"),
|
||||
wxT("WHITE")
|
||||
};
|
||||
|
||||
wxGenericColourDialog::wxGenericColourDialog()
|
||||
|
Reference in New Issue
Block a user