X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c40691a0644cb0e08ec2c0cb7cda1c10b5a84e1b..1a2df6a75b3d96b35e29b1cf392758cbeeef93e0:/samples/stc/stctest.cpp

diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 35b8a01121..8e4093a93e 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// File:        stctest.cpp
+// File:        contrib/samples/stc/stctest.cpp
 // Purpose:     STC test application
 // Maintainer:  Otto Wyss
 // Created:     2003-09-01
@@ -12,7 +12,7 @@
 // headers
 //----------------------------------------------------------------------------
 
-// For compilers that support precompilation, includes <wx/wx.h>.
+// For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -39,6 +39,9 @@
 #include "edit.h"        // Edit module
 #include "prefs.h"       // Prefs
 
+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
 
 //----------------------------------------------------------------------------
 // resources
@@ -53,19 +56,19 @@
 // declarations
 //============================================================================
 
-#define APP_NAME _T("STC-Test")
+#define APP_NAME wxT("STC-Test")
 #define APP_DESCR _("See http://wxguide.sourceforge.net/")
 
-#define APP_MAINT _T("Otto Wyss")
-#define APP_VENDOR _T("wxWidgets")
-#define APP_COPYRIGTH _T("(C) 2003 Otto Wyss")
-#define APP_LICENCE _T("wxWidgets")
+#define APP_MAINT wxT("Otto Wyss")
+#define APP_VENDOR wxT("wxWidgets")
+#define APP_COPYRIGTH wxT("(C) 2003 Otto Wyss")
+#define APP_LICENCE wxT("wxWidgets")
 
-#define APP_VERSION _T("0.1.alpha")
+#define APP_VERSION wxT("0.1.alpha")
 #define APP_BUILD __DATE__
 
-#define APP_WEBSITE _T("http://www.wxWidgets.org")
-#define APP_MAIL _T("mailto://???")
+#define APP_WEBSITE wxT("http://www.wxWidgets.org")
+#define APP_MAIL wxT("mailto://???")
 
 #define NONAME _("<untitled>")
 
@@ -85,6 +88,8 @@ wxPageSetupData *g_pageSetupData = (wxPageSetupData*) NULL;
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 
+class AppFrame;
+
 //----------------------------------------------------------------------------
 //! application APP_VENDOR-APP_NAME.
 class App: public wxApp {
@@ -201,7 +206,7 @@ bool App::OnInit () {
     SetVendorName (APP_VENDOR);
     g_appname = new wxString ();
     g_appname->Append (APP_VENDOR);
-    g_appname->Append (_T("-"));
+    g_appname->Append (wxT("-"));
     g_appname->Append (APP_NAME);
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -298,7 +303,9 @@ END_EVENT_TABLE ()
 
 AppFrame::AppFrame (const wxString &title)
         : wxFrame ((wxFrame *)NULL, wxID_ANY, title, wxDefaultPosition, wxSize(750,550),
-                    wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) {
+                    wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
+{
+    SetIcon(wxICON(sample));
 
     // intitialize important variables
     m_edit = NULL;
@@ -306,7 +313,7 @@ AppFrame::AppFrame (const wxString &title)
     // set icon and background
     SetTitle (*g_appname);
     SetIcon (wxICON (mondrian));
-    SetBackgroundColour (_T("WHITE"));
+    SetBackgroundColour (wxT("WHITE"));
 
     // about box shown for 1 seconds
     AppAbout dlg(this, 1000);
@@ -319,7 +326,7 @@ AppFrame::AppFrame (const wxString &title)
     m_edit = new Edit (this, wxID_ANY);
     m_edit->SetFocus();
 
-    FileOpen (_T("stctest.cpp"));
+    FileOpen (wxT("stctest.cpp"));
 }
 
 AppFrame::~AppFrame () {
@@ -349,8 +356,8 @@ void AppFrame::OnFileOpen (wxCommandEvent &WXUNUSED(event)) {
     if (!m_edit) return;
 #if wxUSE_FILEDLG
     wxString fname;
-    wxFileDialog dlg (this, _T("Open file"), wxEmptyString, wxEmptyString, _T("Any file (*)|*"),
-                      wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR);
+    wxFileDialog dlg (this, wxT("Open file"), wxEmptyString, wxEmptyString, wxT("Any file (*)|*"),
+                      wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR);
     if (dlg.ShowModal() != wxID_OK) return;
     fname = dlg.GetPath ();
     FileOpen (fname);
@@ -371,7 +378,7 @@ void AppFrame::OnFileSaveAs (wxCommandEvent &WXUNUSED(event)) {
     if (!m_edit) return;
 #if wxUSE_FILEDLG
     wxString filename = wxEmptyString;
-    wxFileDialog dlg (this, _T("Save file"), wxEmptyString, wxEmptyString, _T("Any file (*)|*"), wxSAVE|wxOVERWRITE_PROMPT);
+    wxFileDialog dlg (this, wxT("Save file"), wxEmptyString, wxEmptyString, wxT("Any file (*)|*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
     if (dlg.ShowModal() != wxID_OK) return;
     filename = dlg.GetPath();
     m_edit->SaveFile (filename);
@@ -455,7 +462,7 @@ void AppFrame::OnPrint (wxCommandEvent &WXUNUSED(event)) {
 
 // edit events
 void AppFrame::OnEdit (wxCommandEvent &event) {
-    if (m_edit) m_edit->ProcessEvent (event);
+    if (m_edit) m_edit->GetEventHandler()->ProcessEvent (event);
 }
 
 // private functions
@@ -500,7 +507,7 @@ void AppFrame::CreateMenu ()
     menuEdit->Enable (myID_GOTO, false);
     menuEdit->AppendSeparator();
     menuEdit->Append (myID_INDENTINC, _("&Indent increase\tTab"));
-    menuEdit->Append (myID_INDENTRED, _("I&ndent reduce\tBksp"));
+    menuEdit->Append (myID_INDENTRED, _("I&ndent reduce\tShift+Tab"));
     menuEdit->AppendSeparator();
     menuEdit->Append (wxID_SELECTALL, _("&Select all\tCtrl+A"));
     menuEdit->Append (myID_SELECTLINE, _("Select &line\tCtrl+L"));