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:
@@ -72,12 +72,12 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
|
||||
if ( wxStyleHasBorder(m_windowStyle) )
|
||||
msStyle |= WS_BORDER;
|
||||
|
||||
m_hWnd = (WXHWND)::CreateWindowEx(MakeExtendedStyle(m_windowStyle), T("STATIC"), (const wxChar *)label,
|
||||
m_hWnd = (WXHWND)::CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("STATIC"), (const wxChar *)label,
|
||||
msStyle,
|
||||
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
|
||||
wxGetInstance(), NULL);
|
||||
|
||||
wxCHECK_MSG( m_hWnd, FALSE, T("Failed to create static ctrl") );
|
||||
wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static ctrl") );
|
||||
|
||||
#if wxUSE_CTL3D
|
||||
/*
|
||||
@@ -103,13 +103,13 @@ wxSize wxStaticText::DoGetBestSize()
|
||||
|
||||
wxString curLine;
|
||||
for ( const wxChar *pc = text; ; pc++ ) {
|
||||
if ( *pc == T('\n') || *pc == T('\0') ) {
|
||||
if ( *pc == wxT('\n') || *pc == wxT('\0') ) {
|
||||
GetTextExtent(curLine, &widthLine, &heightLine);
|
||||
if ( widthLine > widthTextMax )
|
||||
widthTextMax = widthLine;
|
||||
heightTextTotal += heightLine;
|
||||
|
||||
if ( *pc == T('\n') ) {
|
||||
if ( *pc == wxT('\n') ) {
|
||||
curLine.Empty();
|
||||
}
|
||||
else {
|
||||
|
Reference in New Issue
Block a user