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

Globally replace _T() with wxT().

Browse Source 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/univ/button.h
View File

@@ -20,10 +20,10 @@ class WXDLLIMPEXP_FWD_CORE wxInputHandler;
// the actions supported by this control
// ----------------------------------------------------------------------------
#define wxACTION_BUTTON_TOGGLE _T("toggle") // press/release the button
#define wxACTION_BUTTON_PRESS _T("press") // press the button
#define wxACTION_BUTTON_RELEASE _T("release") // release the button
#define wxACTION_BUTTON_CLICK _T("click") // generate button click event
#define wxACTION_BUTTON_TOGGLE wxT("toggle") // press/release the button
#define wxACTION_BUTTON_PRESS wxT("press") // press the button
#define wxACTION_BUTTON_RELEASE wxT("release") // release the button
#define wxACTION_BUTTON_CLICK wxT("click") // generate button click event
// ----------------------------------------------------------------------------
// wxButton: a push button

6
include/wx/univ/checkbox.h
View File

@@ -18,9 +18,9 @@
// the actions supported by wxCheckBox
// ----------------------------------------------------------------------------
#define wxACTION_CHECKBOX_CHECK _T("check") // SetValue(true)
#define wxACTION_CHECKBOX_CLEAR _T("clear") // SetValue(false)
#define wxACTION_CHECKBOX_TOGGLE _T("toggle") // toggle the check state
#define wxACTION_CHECKBOX_CHECK wxT("check") // SetValue(true)
#define wxACTION_CHECKBOX_CLEAR wxT("clear") // SetValue(false)
#define wxACTION_CHECKBOX_TOGGLE wxT("toggle") // toggle the check state
// additionally it accepts wxACTION_BUTTON_PRESS and RELEASE

2
include/wx/univ/checklst.h
View File

@@ -16,7 +16,7 @@
// actions
// ----------------------------------------------------------------------------
#define wxACTION_CHECKLISTBOX_TOGGLE _T("toggle")
#define wxACTION_CHECKLISTBOX_TOGGLE wxT("toggle")
// ----------------------------------------------------------------------------
// wxCheckListBox

6
include/wx/univ/combobox.h
View File

@@ -22,9 +22,9 @@ class WXDLLIMPEXP_FWD_CORE wxListBox;
// ----------------------------------------------------------------------------
// choose the next/prev/specified (by numArg) item
#define wxACTION_COMBOBOX_SELECT_NEXT _T("next")
#define wxACTION_COMBOBOX_SELECT_PREV _T("prev")
#define wxACTION_COMBOBOX_SELECT _T("select")
#define wxACTION_COMBOBOX_SELECT_NEXT wxT("next")
#define wxACTION_COMBOBOX_SELECT_PREV wxT("prev")
#define wxACTION_COMBOBOX_SELECT wxT("select")
// ----------------------------------------------------------------------------

4
include/wx/univ/control.h
View File

@@ -32,7 +32,7 @@ typedef wxString wxControlAction;
// the list of actions which apply to all controls (other actions are defined
// in the controls headers)
#define wxACTION_NONE _T("") // no action to perform
#define wxACTION_NONE wxT("") // no action to perform
// ----------------------------------------------------------------------------
// wxControl: the base class for all GUI controls
@@ -77,7 +77,7 @@ public:
// return the accel char itself or 0 if none
wxChar GetAccelChar() const
{
return m_indexAccel == -1 ? _T('\0') : (wxChar)m_label[m_indexAccel];
return m_indexAccel == -1 ? wxT('\0') : (wxChar)m_label[m_indexAccel];
}
virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }

2
include/wx/univ/inpcons.h
View File

@@ -28,7 +28,7 @@ typedef wxString wxControlAction;
// the list of actions which apply to all controls (other actions are defined
// in the controls headers)
#define wxACTION_NONE _T("") // no action to perform
#define wxACTION_NONE wxT("") // no action to perform
// ----------------------------------------------------------------------------
// wxInputConsumer: mix-in class for handling wxControlActions (used by

30
include/wx/univ/inphand.h
View File

@@ -20,21 +20,21 @@
// wxTheme::GetInputHandler()
// ----------------------------------------------------------------------------
#define wxINP_HANDLER_DEFAULT _T("")
#define wxINP_HANDLER_BUTTON _T("button")
#define wxINP_HANDLER_CHECKBOX _T("checkbox")
#define wxINP_HANDLER_CHECKLISTBOX _T("checklistbox")
#define wxINP_HANDLER_COMBOBOX _T("combobox")
#define wxINP_HANDLER_LISTBOX _T("listbox")
#define wxINP_HANDLER_NOTEBOOK _T("notebook")
#define wxINP_HANDLER_RADIOBTN _T("radiobtn")
#define wxINP_HANDLER_SCROLLBAR _T("scrollbar")
#define wxINP_HANDLER_SLIDER _T("slider")
#define wxINP_HANDLER_SPINBTN _T("spinbtn")
#define wxINP_HANDLER_STATUSBAR _T("statusbar")
#define wxINP_HANDLER_TEXTCTRL _T("textctrl")
#define wxINP_HANDLER_TOOLBAR _T("toolbar")
#define wxINP_HANDLER_TOPLEVEL _T("toplevel")
#define wxINP_HANDLER_DEFAULT wxT("")
#define wxINP_HANDLER_BUTTON wxT("button")
#define wxINP_HANDLER_CHECKBOX wxT("checkbox")
#define wxINP_HANDLER_CHECKLISTBOX wxT("checklistbox")
#define wxINP_HANDLER_COMBOBOX wxT("combobox")
#define wxINP_HANDLER_LISTBOX wxT("listbox")
#define wxINP_HANDLER_NOTEBOOK wxT("notebook")
#define wxINP_HANDLER_RADIOBTN wxT("radiobtn")
#define wxINP_HANDLER_SCROLLBAR wxT("scrollbar")
#define wxINP_HANDLER_SLIDER wxT("slider")
#define wxINP_HANDLER_SPINBTN wxT("spinbtn")
#define wxINP_HANDLER_STATUSBAR wxT("statusbar")
#define wxINP_HANDLER_TEXTCTRL wxT("textctrl")
#define wxINP_HANDLER_TOOLBAR wxT("toolbar")
#define wxINP_HANDLER_TOPLEVEL wxT("toplevel")
// ----------------------------------------------------------------------------
// wxInputHandler: maps the events to the actions

36
include/wx/univ/listbox.h
View File

@@ -21,28 +21,28 @@
// ----------------------------------------------------------------------------
// change the current item
#define wxACTION_LISTBOX_SETFOCUS _T("setfocus") // select the item
#define wxACTION_LISTBOX_MOVEDOWN _T("down") // select item below
#define wxACTION_LISTBOX_MOVEUP _T("up") // select item above
#define wxACTION_LISTBOX_PAGEDOWN _T("pagedown") // go page down
#define wxACTION_LISTBOX_PAGEUP _T("pageup") // go page up
#define wxACTION_LISTBOX_START _T("start") // go to first item
#define wxACTION_LISTBOX_END _T("end") // go to last item
#define wxACTION_LISTBOX_FIND _T("find") // find item by 1st letter
#define wxACTION_LISTBOX_SETFOCUS wxT("setfocus") // select the item
#define wxACTION_LISTBOX_MOVEDOWN wxT("down") // select item below
#define wxACTION_LISTBOX_MOVEUP wxT("up") // select item above
#define wxACTION_LISTBOX_PAGEDOWN wxT("pagedown") // go page down
#define wxACTION_LISTBOX_PAGEUP wxT("pageup") // go page up
#define wxACTION_LISTBOX_START wxT("start") // go to first item
#define wxACTION_LISTBOX_END wxT("end") // go to last item
#define wxACTION_LISTBOX_FIND wxT("find") // find item by 1st letter
// do something with the current item
#define wxACTION_LISTBOX_ACTIVATE _T("activate") // activate (choose)
#define wxACTION_LISTBOX_TOGGLE _T("toggle") // togglee selected state
#define wxACTION_LISTBOX_SELECT _T("select") // sel this, unsel others
#define wxACTION_LISTBOX_SELECTADD _T("selectadd") // add to selection
#define wxACTION_LISTBOX_UNSELECT _T("unselect") // unselect
#define wxACTION_LISTBOX_ANCHOR _T("selanchor") // anchor selection
#define wxACTION_LISTBOX_ACTIVATE wxT("activate") // activate (choose)
#define wxACTION_LISTBOX_TOGGLE wxT("toggle") // togglee selected state
#define wxACTION_LISTBOX_SELECT wxT("select") // sel this, unsel others
#define wxACTION_LISTBOX_SELECTADD wxT("selectadd") // add to selection
#define wxACTION_LISTBOX_UNSELECT wxT("unselect") // unselect
#define wxACTION_LISTBOX_ANCHOR wxT("selanchor") // anchor selection
// do something with the selection globally (not for single selection ones)
#define wxACTION_LISTBOX_SELECTALL _T("selectall") // select all items
#define wxACTION_LISTBOX_UNSELECTALL _T("unselectall") // unselect all items
#define wxACTION_LISTBOX_SELTOGGLE _T("togglesel") // invert the selection
#define wxACTION_LISTBOX_EXTENDSEL _T("extend") // extend to item
#define wxACTION_LISTBOX_SELECTALL wxT("selectall") // select all items
#define wxACTION_LISTBOX_UNSELECTALL wxT("unselectall") // unselect all items
#define wxACTION_LISTBOX_SELTOGGLE wxT("togglesel") // invert the selection
#define wxACTION_LISTBOX_EXTENDSEL wxT("extend") // extend to item
// ----------------------------------------------------------------------------
// wxListBox: a list of selectable items

4
include/wx/univ/menuitem.h
View File

@@ -72,14 +72,14 @@ public:
wxCoord GetPosition() const
{
wxASSERT_MSG( m_posY != wxDefaultCoord, _T("must call SetHeight first!") );
wxASSERT_MSG( m_posY != wxDefaultCoord, wxT("must call SetHeight first!") );
return m_posY;
}
wxCoord GetHeight() const
{
wxASSERT_MSG( m_height != wxDefaultCoord, _T("must call SetHeight first!") );
wxASSERT_MSG( m_height != wxDefaultCoord, wxT("must call SetHeight first!") );
return m_height;
}

6
include/wx/univ/notebook.h
View File

@@ -21,9 +21,9 @@ class WXDLLIMPEXP_FWD_CORE wxSpinButton;
// ----------------------------------------------------------------------------
// change the page: to the next/previous/given one
#define wxACTION_NOTEBOOK_NEXT _T("nexttab")
#define wxACTION_NOTEBOOK_PREV _T("prevtab")
#define wxACTION_NOTEBOOK_GOTO _T("gototab")
#define wxACTION_NOTEBOOK_NEXT wxT("nexttab")
#define wxACTION_NOTEBOOK_PREV wxT("prevtab")
#define wxACTION_NOTEBOOK_GOTO wxT("gototab")
// ----------------------------------------------------------------------------
// wxNotebook

18
include/wx/univ/scrolbar.h
View File

@@ -22,17 +22,17 @@ class WXDLLIMPEXP_FWD_CORE wxScrollTimer;
// ----------------------------------------------------------------------------
// scroll the bar
#define wxACTION_SCROLL_START _T("start") // to the beginning
#define wxACTION_SCROLL_END _T("end") // to the end
#define wxACTION_SCROLL_LINE_UP _T("lineup") // one line up/left
#define wxACTION_SCROLL_PAGE_UP _T("pageup") // one page up/left
#define wxACTION_SCROLL_LINE_DOWN _T("linedown") // one line down/right
#define wxACTION_SCROLL_PAGE_DOWN _T("pagedown") // one page down/right
#define wxACTION_SCROLL_START wxT("start") // to the beginning
#define wxACTION_SCROLL_END wxT("end") // to the end
#define wxACTION_SCROLL_LINE_UP wxT("lineup") // one line up/left
#define wxACTION_SCROLL_PAGE_UP wxT("pageup") // one page up/left
#define wxACTION_SCROLL_LINE_DOWN wxT("linedown") // one line down/right
#define wxACTION_SCROLL_PAGE_DOWN wxT("pagedown") // one page down/right
// the scrollbar thumb may be dragged
#define wxACTION_SCROLL_THUMB_DRAG _T("thumbdrag")
#define wxACTION_SCROLL_THUMB_MOVE _T("thumbmove")
#define wxACTION_SCROLL_THUMB_RELEASE _T("thumbrelease")
#define wxACTION_SCROLL_THUMB_DRAG wxT("thumbdrag")
#define wxACTION_SCROLL_THUMB_MOVE wxT("thumbmove")
#define wxACTION_SCROLL_THUMB_RELEASE wxT("thumbrelease")
// ----------------------------------------------------------------------------
// wxScrollBar

20
include/wx/univ/slider.h
View File

@@ -20,17 +20,17 @@
// our actions are the same as scrollbars
#define wxACTION_SLIDER_START _T("start") // to the beginning
#define wxACTION_SLIDER_END _T("end") // to the end
#define wxACTION_SLIDER_LINE_UP _T("lineup") // one line up/left
#define wxACTION_SLIDER_PAGE_UP _T("pageup") // one page up/left
#define wxACTION_SLIDER_LINE_DOWN _T("linedown") // one line down/right
#define wxACTION_SLIDER_PAGE_DOWN _T("pagedown") // one page down/right
#define wxACTION_SLIDER_PAGE_CHANGE _T("pagechange")// change page by numArg
#define wxACTION_SLIDER_START wxT("start") // to the beginning
#define wxACTION_SLIDER_END wxT("end") // to the end
#define wxACTION_SLIDER_LINE_UP wxT("lineup") // one line up/left
#define wxACTION_SLIDER_PAGE_UP wxT("pageup") // one page up/left
#define wxACTION_SLIDER_LINE_DOWN wxT("linedown") // one line down/right
#define wxACTION_SLIDER_PAGE_DOWN wxT("pagedown") // one page down/right
#define wxACTION_SLIDER_PAGE_CHANGE wxT("pagechange")// change page by numArg
#define wxACTION_SLIDER_THUMB_DRAG _T("thumbdrag")
#define wxACTION_SLIDER_THUMB_MOVE _T("thumbmove")
#define wxACTION_SLIDER_THUMB_RELEASE _T("thumbrelease")
#define wxACTION_SLIDER_THUMB_DRAG wxT("thumbdrag")
#define wxACTION_SLIDER_THUMB_MOVE wxT("thumbmove")
#define wxACTION_SLIDER_THUMB_RELEASE wxT("thumbrelease")
// ----------------------------------------------------------------------------
// wxSlider

4
include/wx/univ/spinbutt.h
View File

@@ -19,8 +19,8 @@
// ----------------------------------------------------------------------------
// actions supported by this control
#define wxACTION_SPIN_INC _T("inc")
#define wxACTION_SPIN_DEC _T("dec")
#define wxACTION_SPIN_INC wxT("inc")
#define wxACTION_SPIN_DEC wxT("dec")
class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase,
public wxControlWithArrows

52
include/wx/univ/textctrl.h
View File

@@ -24,43 +24,43 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrlCommandProcessor;
// ----------------------------------------------------------------------------
// cursor movement and also selection and delete operations
#define wxACTION_TEXT_GOTO _T("goto") // to pos in numArg
#define wxACTION_TEXT_FIRST _T("first") // go to pos 0
#define wxACTION_TEXT_LAST _T("last") // go to last pos
#define wxACTION_TEXT_HOME _T("home")
#define wxACTION_TEXT_END _T("end")
#define wxACTION_TEXT_LEFT _T("left")
#define wxACTION_TEXT_RIGHT _T("right")
#define wxACTION_TEXT_UP _T("up")
#define wxACTION_TEXT_DOWN _T("down")
#define wxACTION_TEXT_WORD_LEFT _T("wordleft")
#define wxACTION_TEXT_WORD_RIGHT _T("wordright")
#define wxACTION_TEXT_PAGE_UP _T("pageup")
#define wxACTION_TEXT_PAGE_DOWN _T("pagedown")
#define wxACTION_TEXT_GOTO wxT("goto") // to pos in numArg
#define wxACTION_TEXT_FIRST wxT("first") // go to pos 0
#define wxACTION_TEXT_LAST wxT("last") // go to last pos
#define wxACTION_TEXT_HOME wxT("home")
#define wxACTION_TEXT_END wxT("end")
#define wxACTION_TEXT_LEFT wxT("left")
#define wxACTION_TEXT_RIGHT wxT("right")
#define wxACTION_TEXT_UP wxT("up")
#define wxACTION_TEXT_DOWN wxT("down")
#define wxACTION_TEXT_WORD_LEFT wxT("wordleft")
#define wxACTION_TEXT_WORD_RIGHT wxT("wordright")
#define wxACTION_TEXT_PAGE_UP wxT("pageup")
#define wxACTION_TEXT_PAGE_DOWN wxT("pagedown")
// clipboard operations
#define wxACTION_TEXT_COPY _T("copy")
#define wxACTION_TEXT_CUT _T("cut")
#define wxACTION_TEXT_PASTE _T("paste")
#define wxACTION_TEXT_COPY wxT("copy")
#define wxACTION_TEXT_CUT wxT("cut")
#define wxACTION_TEXT_PASTE wxT("paste")
// insert text at the cursor position: the text is in strArg of PerformAction
#define wxACTION_TEXT_INSERT _T("insert")
#define wxACTION_TEXT_INSERT wxT("insert")
// if the action starts with either of these prefixes and the rest of the
// string is one of the movement commands, it means to select/delete text from
// the current cursor position to the new one
#define wxACTION_TEXT_PREFIX_SEL _T("sel")
#define wxACTION_TEXT_PREFIX_DEL _T("del")
#define wxACTION_TEXT_PREFIX_SEL wxT("sel")
#define wxACTION_TEXT_PREFIX_DEL wxT("del")
// mouse selection
#define wxACTION_TEXT_ANCHOR_SEL _T("anchorsel")
#define wxACTION_TEXT_EXTEND_SEL _T("extendsel")
#define wxACTION_TEXT_SEL_WORD _T("wordsel")
#define wxACTION_TEXT_SEL_LINE _T("linesel")
#define wxACTION_TEXT_ANCHOR_SEL wxT("anchorsel")
#define wxACTION_TEXT_EXTEND_SEL wxT("extendsel")
#define wxACTION_TEXT_SEL_WORD wxT("wordsel")
#define wxACTION_TEXT_SEL_LINE wxT("linesel")
// undo or redo
#define wxACTION_TEXT_UNDO _T("undo")
#define wxACTION_TEXT_REDO _T("redo")
#define wxACTION_TEXT_UNDO wxT("undo")
#define wxACTION_TEXT_REDO wxT("redo")
// ----------------------------------------------------------------------------
// wxTextCtrl
@@ -408,7 +408,7 @@ protected:
wxCoord GetLineHeight() const
{
// this one should be already precalculated
wxASSERT_MSG( m_heightLine != -1, _T("should have line height") );
wxASSERT_MSG( m_heightLine != -1, wxT("should have line height") );
return m_heightLine;
}

4
include/wx/univ/toolbar.h
View File

@@ -24,8 +24,8 @@ class WXDLLIMPEXP_FWD_CORE wxToolBarTool;
#define wxACTION_TOOLBAR_PRESS wxACTION_BUTTON_PRESS
#define wxACTION_TOOLBAR_RELEASE wxACTION_BUTTON_RELEASE
#define wxACTION_TOOLBAR_CLICK wxACTION_BUTTON_CLICK
#define wxACTION_TOOLBAR_ENTER _T("enter") // highlight the tool
#define wxACTION_TOOLBAR_LEAVE _T("leave") // unhighlight the tool
#define wxACTION_TOOLBAR_ENTER wxT("enter") // highlight the tool
#define wxACTION_TOOLBAR_LEAVE wxT("leave") // unhighlight the tool
// ----------------------------------------------------------------------------
// wxToolBar

12
include/wx/univ/toplevel.h
View File

@@ -77,12 +77,12 @@ enum
// the actions supported by this control
// ----------------------------------------------------------------------------
#define wxACTION_TOPLEVEL_ACTIVATE _T("activate") // (de)activate the frame
#define wxACTION_TOPLEVEL_BUTTON_PRESS _T("pressbtn") // press titlebar btn
#define wxACTION_TOPLEVEL_BUTTON_RELEASE _T("releasebtn") // press titlebar btn
#define wxACTION_TOPLEVEL_BUTTON_CLICK _T("clickbtn") // press titlebar btn
#define wxACTION_TOPLEVEL_MOVE _T("move") // move the frame
#define wxACTION_TOPLEVEL_RESIZE _T("resize") // resize the frame
#define wxACTION_TOPLEVEL_ACTIVATE wxT("activate") // (de)activate the frame
#define wxACTION_TOPLEVEL_BUTTON_PRESS wxT("pressbtn") // press titlebar btn
#define wxACTION_TOPLEVEL_BUTTON_RELEASE wxT("releasebtn") // press titlebar btn
#define wxACTION_TOPLEVEL_BUTTON_CLICK wxT("clickbtn") // press titlebar btn
#define wxACTION_TOPLEVEL_MOVE wxT("move") // move the frame
#define wxACTION_TOPLEVEL_RESIZE wxT("resize") // resize the frame
//-----------------------------------------------------------------------------
// wxTopLevelWindow