X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4f3eb42f2cad4f69b2543c1d6985d9c028f9dc0..34326da778583ca8eab95f2e41738da2852a5a16:/samples/caret/caret.cpp

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 9180908c65..a9c44ca2f9 100644
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -17,7 +17,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all <standard< wxWindows headers
+// need because it includes almost all <standard< wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
     #include "wx/log.h"
@@ -27,11 +27,12 @@
 #include "wx/numdlg.h"
 
 // ----------------------------------------------------------------------------
-// ressources
+// resources
 // ----------------------------------------------------------------------------
+
 // the application icon
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
-    #include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -127,7 +128,7 @@ public:
 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()
 };
 
@@ -150,10 +151,10 @@ 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)
@@ -164,7 +165,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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
@@ -182,16 +183,19 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // create and show the main application window
-    MyFrame *frame = new MyFrame(_T("Caret wxWindows sample"),
+    MyFrame *frame = new MyFrame(wxT("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;
 }
 
 // ----------------------------------------------------------------------------
@@ -200,34 +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_SetFontSize, _T("&Font size...\tCtrl-S"));
-    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
 }
 
 
@@ -235,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))
@@ -254,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
                      );
@@ -264,7 +270,7 @@ 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);
     }
 }
 
@@ -272,9 +278,9 @@ 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"),
+                        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
                     );
@@ -298,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 )
 {
@@ -359,7 +365,7 @@ 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);
@@ -385,15 +391,16 @@ void MyCanvas::ChangeSize()
     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);
     }
+#endif // wxUSE_STATUSBAR
 }
 
 // NB: this method is horrible inefficient especially because the caret
@@ -417,11 +424,18 @@ 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
     }
 }