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

replaced T() makro with wxT() due to namespace probs, _T() exists, too

Browse Source 
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:
Karsten Ballüder
1999-10-08 14:35:56 +00:00
parent b4a2ab728b
commit 223d09f6b5
336 changed files with 3755 additions and 3776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/mdi.cpp
View File

@@ -174,7 +174,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
int width = size.x;
int height = size.y;
m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), T("wxWindowMenu"));
m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), wxT("wxWindowMenu"));
DWORD msflags = WS_OVERLAPPED;
if (style & wxMINIMIZE_BOX)
@@ -505,7 +505,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
{
// this shouldn't happen because it means that our messages are being
// lost (they're not sent to the parent frame nor to the children)
wxFAIL_MSG(T("MDI parent frame is not active, "
wxFAIL_MSG(wxT("MDI parent frame is not active, "
"yet there is no active MDI child?"));
}
@@ -926,7 +926,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
else if ( m_hWnd == hwndDeact )
{
wxASSERT_MSG( parent->m_currentChild == this,
T("can't deactivate MDI child which wasn't active!") );
wxT("can't deactivate MDI child which wasn't active!") );
activated = FALSE;
parent->m_currentChild = NULL;
@@ -1099,7 +1099,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
m_hWnd = (WXHWND)::CreateWindowEx
(
exStyle,
T("MDICLIENT"),
wxT("MDICLIENT"),
NULL,
msStyle,
0, 0, 0, 0,
@@ -1152,7 +1152,7 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
// update menu bar of the parent window
wxWindow *parent = win->GetParent();
wxCHECK_RET( parent, T("MDI client without parent frame? weird...") );
wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
::DrawMenuBar(GetWinHwnd(parent));
}
@@ -1169,23 +1169,23 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
if ( chars == 0 )
{
wxLogLastError(T("GetMenuString"));
wxLogLastError(wxT("GetMenuString"));
continue;
}
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(T("Help")) )
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(wxT("Help")) )
{
success = TRUE;
::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)subMenu, T("&Window"));
(UINT)subMenu, wxT("&Window"));
break;
}
}
if ( !success )
{
::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, T("&Window"));
::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, wxT("&Window"));
}
MDISetMenu(win, hmenu, subMenu);