X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f84eccdeaf8e3706f7861ce19da3a256814d83e..9696657f22ee2f10017c0bc305ae1843ee8fe768:/samples/caret/caret.cpp diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 538ab8fda1..a9c44ca2f9 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -17,21 +17,22 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all Show(TRUE); + frame->Show(true); // success: wxApp::OnRun() will be called which will enter the main message - // loop and the application will run. If we returned FALSE here, the + // loop and the application will run. If we returned false here, the // application would exit immediately. - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -193,33 +204,36 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // set the frame icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(Caret_SetBlinkTime, _T("&Blink time...\tCtrl-B")); - menuFile->Append(Caret_Move, _T("&Move caret\tCtrl-C")); + menuFile->Append(Caret_SetBlinkTime, wxT("&Blink time...\tCtrl-B")); + menuFile->Append(Caret_SetFontSize, wxT("&Font size...\tCtrl-S")); + menuFile->Append(Caret_Move, wxT("&Move caret\tCtrl-C")); menuFile->AppendSeparator(); - menuFile->Append(Caret_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); + menuFile->Append(Caret_About, wxT("&About\tCtrl-A"), wxT("Show about dialog")); menuFile->AppendSeparator(); - menuFile->Append(Caret_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); + menuFile->Append(Caret_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(menuFile, wxT("&File")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); - + m_canvas = new MyCanvas(this); +#if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); - SetStatusText(_T("Welcome to wxWindows!")); + SetStatusText(wxT("Welcome to wxWidgets!")); +#endif // wxUSE_STATUSBAR } @@ -227,14 +241,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("The caret wxWindows sample.\n© 1999 Vadim Zeitlin"), - _T("About Caret"), wxOK | wxICON_INFORMATION, this); + wxMessageBox(wxT("The caret wxWidgets sample.\n(c) 1999 Vadim Zeitlin"), + wxT("About Caret"), wxOK | wxICON_INFORMATION, this); } void MyFrame::OnCaretMove(wxCommandEvent& WXUNUSED(event)) @@ -246,9 +260,9 @@ void MyFrame::OnSetBlinkTime(wxCommandEvent& WXUNUSED(event)) { long blinkTime = wxGetNumberFromUser ( - _T("The caret blink time is the time between two blinks"), - _T("Time in milliseconds:"), - _T("wxCaret sample"), + wxT("The caret blink time is the time between two blinks"), + wxT("Time in milliseconds:"), + wxT("wxCaret sample"), wxCaret::GetBlinkTime(), 0, 10000, this ); @@ -256,7 +270,24 @@ void MyFrame::OnSetBlinkTime(wxCommandEvent& WXUNUSED(event)) { wxCaret::SetBlinkTime((int)blinkTime); m_canvas->CreateCaret(); - wxLogStatus(this, _T("Blink time set to %ld milliseconds."), blinkTime); + wxLogStatus(this, wxT("Blink time set to %ld milliseconds."), blinkTime); + } +} + +void MyFrame::OnSetFontSize(wxCommandEvent& WXUNUSED(event)) +{ + long fontSize = wxGetNumberFromUser + ( + wxT("The font size also determines the caret size so\nthis demonstrates resizing the caret."), + wxT("Font size (in points):"), + wxT("wxCaret sample"), + 12, 1, 100, + this + ); + + if ( fontSize != -1 ) + { + m_canvas->SetFontSize((int)fontSize); } } @@ -273,7 +304,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) END_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent ) - : wxScrolledWindow( parent, -1, + : wxScrolledWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER ) { @@ -281,8 +312,7 @@ MyCanvas::MyCanvas( wxWindow *parent ) SetBackgroundColour(*wxWHITE); - m_font = wxFont(12, wxFONTFAMILY_TELETYPE, - wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + SetFontSize(12); m_xCaret = m_yCaret = m_xChars = m_yChars = 0; @@ -299,16 +329,30 @@ MyCanvas::~MyCanvas() void MyCanvas::CreateCaret() { + wxCaret *caret = new wxCaret(this, m_widthChar, m_heightChar); + SetCaret(caret); + + caret->Move(m_xMargin, m_yMargin); + caret->Show(); +} + +void MyCanvas::SetFontSize(int fontSize) +{ + m_font = wxFont(fontSize, wxFONTFAMILY_TELETYPE, + wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + wxClientDC dc(this); dc.SetFont(m_font); m_heightChar = dc.GetCharHeight(); m_widthChar = dc.GetCharWidth(); - wxCaret *caret = new wxCaret(this, m_widthChar, m_heightChar); - SetCaret(caret); + wxCaret *caret = GetCaret(); + if ( caret ) + { + caret->SetSize(m_widthChar, m_heightChar); - caret->Move(m_xMargin, m_yMargin); - caret->Show(); + ChangeSize(); + } } void MyCanvas::MoveCaret(int x, int y) @@ -321,16 +365,24 @@ void MyCanvas::MoveCaret(int x, int y) void MyCanvas::DoMoveCaret() { - wxLogStatus(_T("Caret is at (%d, %d)"), m_xCaret, m_yCaret); + wxLogStatus(wxT("Caret is at (%d, %d)"), m_xCaret, m_yCaret); GetCaret()->Move(m_xMargin + m_xCaret * m_widthChar, m_yMargin + m_yCaret * m_heightChar); } -void MyCanvas::OnSize( wxSizeEvent &event ) +void MyCanvas::OnSize(wxSizeEvent& event) +{ + ChangeSize(); + + event.Skip(); +} + +void MyCanvas::ChangeSize() { - m_xChars = (event.GetSize().x - 2*m_xMargin) / m_widthChar; - m_yChars = (event.GetSize().y - 2*m_yMargin) / m_heightChar; + wxSize size = GetClientSize(); + m_xChars = (size.x - 2*m_xMargin) / m_widthChar; + m_yChars = (size.y - 2*m_yMargin) / m_heightChar; if ( !m_xChars ) m_xChars = 1; if ( !m_yChars ) @@ -339,17 +391,16 @@ void MyCanvas::OnSize( wxSizeEvent &event ) free(m_text); m_text = (wxChar *)calloc(m_xChars * m_yChars, sizeof(wxChar)); +#if wxUSE_STATUSBAR wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); if ( frame && frame->GetStatusBar() ) { wxString msg; - msg.Printf(_T("Panel size is (%d, %d)"), m_xChars, m_yChars); - + msg.Printf(wxT("Panel size is (%d, %d)"), m_xChars, m_yChars); frame->SetStatusText(msg, 1); } - - event.Skip(); +#endif // wxUSE_STATUSBAR } // NB: this method is horrible inefficient especially because the caret @@ -373,17 +424,24 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxChar ch = CharAt(x, y); if ( !ch ) - ch = _T(' '); + ch = wxT(' '); +#ifdef __WXOSX__ + dc.DrawText(ch, m_xMargin + x * m_widthChar, + m_yMargin + y * m_heightChar ); +#else line += ch; +#endif } +#ifndef __WXOSX__ dc.DrawText( line, m_xMargin, m_yMargin + y * m_heightChar ); +#endif } } void MyCanvas::OnChar( wxKeyEvent &event ) { - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case WXK_LEFT: PrevChar(); @@ -415,9 +473,9 @@ void MyCanvas::OnChar( wxKeyEvent &event ) break; default: - if ( !event.AltDown() && wxIsprint(event.KeyCode()) ) + if ( !event.AltDown() && wxIsprint(event.GetKeyCode()) ) { - wxChar ch = (wxChar)event.KeyCode(); + wxChar ch = (wxChar)event.GetKeyCode(); CharAt(m_xCaret, m_yCaret) = ch; wxCaretSuspend cs(this);