X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92a19c2e7757ba742846f83e56356de0a607bdc2..6b06903d2611683ab87af501e520dea2ff6e1c86:/samples/caret/caret.cpp diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 7415922ae0..4f811d4838 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -17,20 +17,20 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all - - #include + #include "wx/wx.h" + #include "wx/log.h" #endif #include "wx/caret.h" +#include "wx/numdlg.h" // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) #include "mondrian.xpm" #endif @@ -62,6 +62,7 @@ public: wxChar& CharAt(int x, int y) { return *(m_text + x + m_xChars * y); } // operations + void SetFontSize(int fontSize); void CreateCaret(); void MoveCaret(int x, int y); @@ -84,6 +85,9 @@ private: // move the caret to m_xCaret, m_yCaret void DoMoveCaret(); + // update the geometry + void ChangeSize(); + wxFont m_font; // the margin around the text (looks nicer) @@ -117,12 +121,13 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); void OnSetBlinkTime(wxCommandEvent& event); + void OnSetFontSize(wxCommandEvent& event); void OnCaretMove(wxCommandEvent& event); private: MyCanvas *m_canvas; - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -137,6 +142,7 @@ enum Caret_Quit = 1, Caret_About, Caret_SetBlinkTime, + Caret_SetFontSize, Caret_Move, // controls start here (the numbers are, of course, arbitrary) @@ -144,20 +150,21 @@ enum }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Caret_Quit, MyFrame::OnQuit) EVT_MENU(Caret_About, MyFrame::OnAbout) EVT_MENU(Caret_SetBlinkTime, MyFrame::OnSetBlinkTime) + EVT_MENU(Caret_SetFontSize, MyFrame::OnSetFontSize) EVT_MENU(Caret_Move, MyFrame::OnCaretMove) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -176,15 +183,15 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // create and show the main application window - MyFrame *frame = new MyFrame("Caret wxWindows sample", + MyFrame *frame = new MyFrame(_T("Caret wxWidgets sample"), wxPoint(50, 50), wxSize(450, 340)); - frame->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,7 +200,7 @@ 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)); @@ -201,25 +208,28 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(Caret_SetBlinkTime, "&Blink time...\tCtrl-B"); - menuFile->Append(Caret_Move, "&Move caret\tCtrl-C"); + menuFile->Append(Caret_SetBlinkTime, _T("&Blink time...\tCtrl-B")); + menuFile->Append(Caret_SetFontSize, _T("&Font size...\tCtrl-S")); + menuFile->Append(Caret_Move, _T("&Move caret\tCtrl-C")); menuFile->AppendSeparator(); - menuFile->Append(Caret_About, "&About...\tCtrl-A", "Show about dialog"); + menuFile->Append(Caret_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); menuFile->AppendSeparator(); - menuFile->Append(Caret_Quit, "E&xit\tAlt-X", "Quit this program"); + menuFile->Append(Caret_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, "&File"); + menuBar->Append(menuFile, _T("&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("Welcome to wxWindows!"); + SetStatusText(_T("Welcome to wxWidgets!")); +#endif // wxUSE_STATUSBAR } @@ -227,13 +237,13 @@ 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"), + wxMessageBox(_T("The caret wxWidgets sample.\n(c) 1999 Vadim Zeitlin"), _T("About Caret"), wxOK | wxICON_INFORMATION, this); } @@ -260,6 +270,23 @@ void MyFrame::OnSetBlinkTime(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnSetFontSize(wxCommandEvent& WXUNUSED(event)) +{ + long fontSize = wxGetNumberFromUser + ( + _T("The font size also determines the caret size so\nthis demonstrates resizing the caret."), + _T("Font size (in points):"), + _T("wxCaret sample"), + 12, 1, 100, + this + ); + + if ( fontSize != -1 ) + { + m_canvas->SetFontSize((int)fontSize); + } +} + // ---------------------------------------------------------------------------- // MyCanvas // ---------------------------------------------------------------------------- @@ -273,7 +300,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 +308,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 +325,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) @@ -327,10 +367,18 @@ void MyCanvas::DoMoveCaret() m_yMargin + m_yCaret * m_heightChar); } -void MyCanvas::OnSize( wxSizeEvent &event ) +void MyCanvas::OnSize(wxSizeEvent& event) { - m_xChars = (event.GetSize().x - 2*m_xMargin) / m_widthChar; - m_yChars = (event.GetSize().y - 2*m_yMargin) / m_heightChar; + ChangeSize(); + + event.Skip(); +} + +void MyCanvas::ChangeSize() +{ + 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 +387,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); - frame->SetStatusText(msg, 1); } - - event.Skip(); +#endif // wxUSE_STATUSBAR } // NB: this method is horrible inefficient especially because the caret @@ -383,7 +430,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) void MyCanvas::OnChar( wxKeyEvent &event ) { - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case WXK_LEFT: PrevChar(); @@ -415,9 +462,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);