Oops, don't cut and paste between ports, and do test compile both states

[wxWidgets.git] / samples / validate / validate.cpp

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 334150af31db059c632f2e5fc411c072b7c79fc8..32ca7fffc647cb9b0784fa7e7e9f5d37d410fdbc 100644 (file)
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -30,71 +30,87 @@
 #include "validate.h"
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-       EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
-       EVT_MENU(VALIDATE_TEST_DIALOG, MyFrame::OnTestDialog)
+    EVT_MENU(wxID_EXIT, MyFrame::OnQuit)
+    EVT_MENU(VALIDATE_TEST_DIALOG, MyFrame::OnTestDialog)
+    EVT_MENU(VALIDATE_SILENT, MyFrame::OnSilent)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
 
-MyData g_data;
+MyData g_data;
 
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Validation Test", 50, 50, 300, 250);
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("Validation Test"), 50, 50, 300, 250);
 
+  // Show the frame
+  frame->Show(TRUE);
+
+  SetTopWindow(frame);
+
+  return TRUE;
+}
+
+// My frame constructor
+MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
+       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+{
   // Give it an icon
 #ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
+  SetIcon(wxIcon(_T("mondrian")));
 #endif
 #ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
+  SetIcon(wxIcon(_T("aiai.xbm")));
 #endif
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
-  file_menu->Append(VALIDATE_TEST_DIALOG, "&Test dialog");
-  file_menu->Append(wxID_EXIT, "E&xit");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "File");
-  frame->SetMenuBar(menu_bar);
-
-  frame->CreateStatusBar(1);
+  file_menu->Append(VALIDATE_TEST_DIALOG, _T("&Test dialog"), _T("Show example dialog"));
+  file_menu->Append(VALIDATE_SILENT, _T("&Bell on error"), _T("Toggle bell on error"), TRUE);
+  file_menu->AppendSeparator();
+  file_menu->Append(wxID_EXIT, _T("E&xit"));
 
-  // Show the frame
-  frame->Show(TRUE);
+  file_menu->Check(VALIDATE_SILENT, !wxValidator::IsSilent());
 
-  SetTopWindow(frame);
+  wxMenuBar *menu_bar = new wxMenuBar;
+  menu_bar->Append(file_menu, _T("File"));
+  SetMenuBar(menu_bar);
 
-  return TRUE;  
+  CreateStatusBar(1);
 }
 
-// My frame constructor
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
-  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
-{}
-
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-  Close(TRUE);
+    Close(TRUE);
 }
 
 void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event))
 {
-       MyDialog dialog(this, "Validation test dialog", wxPoint(100, 100), wxSize(340, 170));
+    MyDialog dialog(this, _T("Validation test dialog"), wxPoint(100, 100), wxSize(340, 170));
+
+    dialog.ShowModal();
+}
+
+void MyFrame::OnSilent(wxCommandEvent& event)
+{
+    static bool s_silent = FALSE;
+
+    s_silent = !s_silent;
+    wxValidator::SetBellOnError(s_silent);
 
-       dialog.ShowModal();
+    event.Skip();
 }
 
-MyDialog::MyDialog( wxWindow *parent, const wxString& title, 
+MyDialog::MyDialog( wxWindow *parent, const wxString& title,
                     const wxPoint& pos, const wxSize& size, const long WXUNUSED(style) ) :
-       wxDialog(parent, VALIDATE_DIALOG_ID, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+    wxDialog(parent, VALIDATE_DIALOG_ID, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
 {
-  wxButton *but1 = new wxButton(this, wxID_OK, "OK", wxPoint(250, 10), wxSize(80, 30));
-  (void)new wxButton(this, wxID_CANCEL, "Cancel", wxPoint(250, 60), wxSize(80, 30));
+  wxButton *but1 = new wxButton(this, wxID_OK, _T("OK"), wxPoint(250, 10), wxSize(80, 30));
+  (void)new wxButton(this, wxID_CANCEL, _T("Cancel"), wxPoint(250, 60), wxSize(80, 30));
 
-  (void)new wxTextCtrl(this, VALIDATE_TEXT, "",
+  (void)new wxTextCtrl(this, VALIDATE_TEXT, _T(""),
     wxPoint(10, 10), wxSize(120, -1), 0, wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
 
   SetBackgroundColour(wxColour(0,0,255));