X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f18eaf2687ab42c97ccf469a2617306cadc0c6ef..51248412979029d94d11ea5dab9516831be94914:/samples/vscroll/vstest.cpp diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp index f80409a443..47e2822b3c 100644 --- a/samples/vscroll/vstest.cpp +++ b/samples/vscroll/vstest.cpp @@ -40,7 +40,7 @@ // ---------------------------------------------------------------------------- // the application icon (under Windows and OS/2 it is in resources) -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -83,7 +83,7 @@ public: if ( m_frameStatusBar ) { wxSize sz = GetClientSize(); - SetStatusText(wxString::Format(_T("%dx%d"), sz.x, sz.y), 1); + SetStatusText(wxString::Format(wxT("%dx%d"), sz.x, sz.y), 1); } #endif // wxUSE_STATUSBAR @@ -105,7 +105,7 @@ public: { m_frame = frame; - SetLineCount(MAX_LINES); + SetRowCount(MAX_LINES); int i; for ( i = 0; i < MAX_LINES; ++i ) @@ -119,7 +119,7 @@ public: #if wxUSE_STATUSBAR m_frame->SetStatusText(wxString::Format ( - _T("Page size = %d, pos = %d, max = %d"), + wxT("Page size = %d, pos = %d, max = %d"), GetScrollThumb(wxVERTICAL), GetScrollPos(wxVERTICAL), GetScrollRange(wxVERTICAL) @@ -146,8 +146,8 @@ public: { dc.DrawLine(0, y, clientSize.GetWidth(), y); - wxCoord hLine = OnGetLineHeight(line); - dc.DrawText(wxString::Format(_T("Line %lu"), (unsigned long)line), + wxCoord hLine = OnGetRowHeight(line); + dc.DrawText(wxString::Format(wxT("Line %lu"), (unsigned long)line), 2, y + (hLine - hText) / 2); y += hLine; @@ -171,9 +171,9 @@ public: event.Skip(); } - virtual wxCoord OnGetLineHeight(size_t n) const + virtual wxCoord OnGetRowHeight(size_t n) const { - wxASSERT( n < GetLineCount() ); + wxASSERT( n < GetRowCount() ); return m_heights[n]; } @@ -216,7 +216,7 @@ public: #if wxUSE_STATUSBAR m_frame->SetStatusText(wxString::Format ( - _T("Page size = %d, pos = %d, max = %d"), + wxT("Page size = %d, pos = %d, max = %d"), GetScrollThumb(wxVERTICAL), GetScrollPos(wxVERTICAL), GetScrollRange(wxVERTICAL) @@ -244,7 +244,7 @@ public: dc.DrawLine(x, 0, x, clientSize.GetHeight()); wxCoord wLine = OnGetColumnWidth(line); - dc.DrawRotatedText(wxString::Format(_T("Line %lu"), (unsigned long)line), + dc.DrawRotatedText(wxString::Format(wxT("Line %lu"), (unsigned long)line), x + (wLine - hText) / 2, clientSize.GetHeight() - 5, 90); x += wLine; @@ -300,7 +300,7 @@ public: m_frame = frame; SetRowColumnCount(MAX_LINES, MAX_LINES); - + int i; for ( i = 0; i < MAX_LINES; ++i ) { @@ -316,7 +316,7 @@ public: #if wxUSE_STATUSBAR m_frame->SetStatusText(wxString::Format ( - _T("Page size = %d rows %d columns; pos = row: %d, column: %d; max = %d rows, %d columns"), + wxT("Page size = %d rows %d columns; pos = row: %d, column: %d; max = %d rows, %d columns"), GetScrollThumb(wxVERTICAL), GetScrollThumb(wxHORIZONTAL), GetScrollPos(wxVERTICAL), @@ -338,7 +338,7 @@ public: rowLast = GetVisibleRowsEnd(); const size_t columnFirst = GetVisibleColumnsBegin(), columnLast = GetVisibleColumnsEnd(); - + const wxCoord hText = dc.GetCharHeight(); wxSize clientSize = GetClientSize(); @@ -358,16 +358,16 @@ public: if ( row == rowFirst ) dc.DrawLine(x, 0, x, clientSize.GetHeight()); - dc.DrawText(wxString::Format(_T("Row %lu"), (unsigned long)row), + dc.DrawText(wxString::Format(wxT("Row %lu"), (unsigned long)row), x + 2, y + rowHeight / 2 - hText); - dc.DrawText(wxString::Format(_T("Col %lu"), (unsigned long)col), + dc.DrawText(wxString::Format(wxT("Col %lu"), (unsigned long)col), x + 2, y + rowHeight / 2); - + x += colWidth; if ( row == rowFirst) dc.DrawLine(x, 0, x, clientSize.GetHeight()); } - + y += rowHeight; dc.DrawLine(0, y, clientSize.GetWidth(), y); } @@ -497,7 +497,7 @@ bool VarScrollApp::OnInit() VarScrollFrame::VarScrollFrame() : wxFrame(NULL, wxID_ANY, - _T("VScroll wxWidgets Sample"), + wxT("VScroll wxWidgets Sample"), wxDefaultPosition, wxSize(400, 350)), m_scrollWindow(NULL) @@ -513,33 +513,33 @@ VarScrollFrame::VarScrollFrame() // the "About" item should be in the help menu wxMenu *menuHelp = new wxMenu; - menuHelp->Append(VScroll_About, _T("&About...\tF1"), _T("Show about dialog")); + menuHelp->Append(VScroll_About, wxT("&About\tF1"), wxT("Show about dialog")); #ifdef wxHAS_RADIO_MENU_ITEMS - menuMode->AppendRadioItem(VScroll_VScrollMode, _T("&Vertical\tAlt-V"), - _T("Vertical scrolling only")); - menuMode->AppendRadioItem(VScroll_HScrollMode, _T("&Horizontal\tAlt-H"), - _T("Horizontal scrolling only")); + menuMode->AppendRadioItem(VScroll_VScrollMode, wxT("&Vertical\tAlt-V"), + wxT("Vertical scrolling only")); + menuMode->AppendRadioItem(VScroll_HScrollMode, wxT("&Horizontal\tAlt-H"), + wxT("Horizontal scrolling only")); menuMode->AppendRadioItem(VScroll_HVScrollMode, - _T("Hori&zontal/Vertical\tAlt-Z"), - _T("Horizontal and vertical scrolling")); + wxT("Hori&zontal/Vertical\tAlt-Z"), + wxT("Horizontal and vertical scrolling")); menuMode->Check(VScroll_VScrollMode, true); #else - menuMode->Append(VScroll_VScrollMode, _T("&Vertical\tAlt-V"), - _T("Vertical scrolling only")); - menuMode->Append(VScroll_HScrollMode, _T("&Horizontal\tAlt-H"), - _T("Horizontal scrolling only")); - menuMode->Append(VScroll_HVScrollMode, _T("Hori&zontal/Vertical\tAlt-Z"), - _T("Horizontal and vertical scrolling")); + menuMode->Append(VScroll_VScrollMode, wxT("&Vertical\tAlt-V"), + wxT("Vertical scrolling only")); + menuMode->Append(VScroll_HScrollMode, wxT("&Horizontal\tAlt-H"), + wxT("Horizontal scrolling only")); + menuMode->Append(VScroll_HVScrollMode, wxT("Hori&zontal/Vertical\tAlt-Z"), + wxT("Horizontal and vertical scrolling")); #endif - menuFile->Append(VScroll_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); + menuFile->Append(VScroll_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, _T("&File")); - menuBar->Append(menuMode, _T("&Mode")); - menuBar->Append(menuHelp, _T("&Help")); + menuBar->Append(menuFile, wxT("&File")); + menuBar->Append(menuMode, wxT("&Mode")); + menuBar->Append(menuHelp, wxT("&Help")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); @@ -548,7 +548,7 @@ VarScrollFrame::VarScrollFrame() #if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); - SetStatusText(_T("Welcome to wxWidgets!")); + SetStatusText(wxT("Welcome to wxWidgets!")); int widths[2]; widths[0] = -1; widths[1] = 100; @@ -578,7 +578,7 @@ void VarScrollFrame::OnModeVScroll(wxCommandEvent& WXUNUSED(event)) { if ( m_scrollWindow ) m_scrollWindow->Destroy(); - + m_scrollWindow = new VScrollWindow(this); SendSizeEvent(); } @@ -587,7 +587,7 @@ void VarScrollFrame::OnModeHScroll(wxCommandEvent& WXUNUSED(event)) { if ( m_scrollWindow ) m_scrollWindow->Destroy(); - + m_scrollWindow = new HScrollWindow(this); SendSizeEvent(); } @@ -603,10 +603,10 @@ void VarScrollFrame::OnModeHVScroll(wxCommandEvent& WXUNUSED(event)) void VarScrollFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("VScroll shows how to implement scrolling with\n") - _T("variable line widths and heights.\n") - _T("(c) 2003 Vadim Zeitlin"), - _T("About VScroll"), + wxMessageBox(wxT("VScroll shows how to implement scrolling with\n") + wxT("variable line widths and heights.\n") + wxT("(c) 2003 Vadim Zeitlin"), + wxT("About VScroll"), wxOK | wxICON_INFORMATION, this); }