fix the definition of many static functions marked as 'const' or functions which...

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

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 992e7af2f0d94455daf5d40dc241294a706b7cfa..d4e26425089db2da57201541c44b4c592adc0193 100644 (file)
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        validate.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        validate.cpp

-// Purpose:     wxWindows validator sample
+// Purpose:     wxWidgets validator sample

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98


@@ -15,19 +15,15 @@
 // from a text control. All validators transfer data, but not
 // all test validity, so don't be confused by the name.
 
 // from a text control. All validators transfer data, but not
 // all test validity, so don't be confused by the name.
 

-#ifdef __GNUG__
-#   pragma implementation
-#endif // __GNUG__
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#   pragma hdrstop
+    #pragma hdrstop

 #endif // __BORLANDC__
 
 #ifndef WX_PRECOMP
 #endif // __BORLANDC__
 
 #ifndef WX_PRECOMP

-#   include "wx/wx.h"
+    #include "wx/wx.h"

 #endif // WX_PRECOMP
 
 #include "validate.h"
 #endif // WX_PRECOMP
 
 #include "validate.h"


@@ -36,6 +32,10 @@
 #include "wx/valgen.h"
 #include "wx/valtext.h"
 
 #include "wx/valgen.h"
 #include "wx/valtext.h"
 

+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // Global data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Global data
 // ----------------------------------------------------------------------------


@@ -43,13 +43,13 @@
 MyData g_data;
 
 wxString g_listbox_choices[] =
 MyData g_data;
 
 wxString g_listbox_choices[] =

-    {"one",  "two",  "three"};
+    {wxT("one"),  wxT("two"),  wxT("three")};

 
 wxString g_combobox_choices[] =
 
 wxString g_combobox_choices[] =

-    {"yes", "no", "maybe"};
+    {wxT("yes"), wxT("no"), wxT("maybe")};

 
 wxString g_radiobox_choices[] =
 
 wxString g_radiobox_choices[] =

-    {"green", "yellow", "red"};
+    {wxT("green"), wxT("yellow"), wxT("red")};

 
 // ----------------------------------------------------------------------------
 // MyData
 
 // ----------------------------------------------------------------------------
 // MyData


@@ -62,7 +62,7 @@ MyData::MyData()
     // is performed only when 'OK' is pressed. It would be nice to
     // enhance this so that validation would occur when the text
     // control loses focus.
     // is performed only when 'OK' is pressed. It would be nice to
     // enhance this so that validation would occur when the text
     // control loses focus.

-    m_string = "Spaces are invalid here";
+    m_string = wxT("Spaces are invalid here");

     m_listbox_choices.Add(0);
 }
 
     m_listbox_choices.Add(0);
 }
 


@@ -74,8 +74,12 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create and display the main frame window.
     // Create and display the main frame window.

-    MyFrame *frame = new MyFrame((wxFrame *) NULL, "Validator Test", 50, 50, 300, 250);
+    MyFrame *frame = new MyFrame((wxFrame *) NULL, wxT("Validator Test"),
+                                 50, 50, 300, 250);

     frame->Show(true);
     SetTopWindow(frame);
     return true;
     frame->Show(true);
     SetTopWindow(frame);
     return true;


@@ -91,27 +95,25 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(VALIDATE_TOGGLE_BELL, MyFrame::OnToggleBell)
 END_EVENT_TABLE()
 
     EVT_MENU(VALIDATE_TOGGLE_BELL, MyFrame::OnToggleBell)
 END_EVENT_TABLE()
 

-MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h)
-       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)),
+MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int h)
+       : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)),

          m_silent(true)
 {
          m_silent(true)
 {

-#ifdef __WXMSW__
-    SetIcon(wxIcon(_T("mondrian")));
-#endif // __WXMSW__
+    SetIcon(wxICON(sample));

 
     // Create a listbox to display the validated data.
 
     // Create a listbox to display the validated data.

-    m_listbox = new wxListBox(this, -1);
+    m_listbox = new wxListBox(this, wxID_ANY);

     m_listbox->Append(wxString(_T("Try 'File|Test' to see how validators work.")));
 
     wxMenu *file_menu = new wxMenu;
 
     m_listbox->Append(wxString(_T("Try 'File|Test' to see how validators work.")));
 
     wxMenu *file_menu = new wxMenu;
 

-    file_menu->Append(VALIDATE_TEST_DIALOG, "&Test", "Demonstrate validators");
-    file_menu->Append(VALIDATE_TOGGLE_BELL, "&Bell on error", "Toggle bell on error", true);
+    file_menu->Append(VALIDATE_TEST_DIALOG, wxT("&Test"), wxT("Demonstrate validators"));
+    file_menu->AppendCheckItem(VALIDATE_TOGGLE_BELL, wxT("&Bell on error"), wxT("Toggle bell on error"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(wxID_EXIT, "E&xit");
+    file_menu->Append(wxID_EXIT, wxT("E&xit"));

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
     wxMenuBar *menu_bar = new wxMenuBar;

-    menu_bar->Append(file_menu, "File");
+    menu_bar->Append(file_menu, wxT("File"));

     SetMenuBar(menu_bar);
 
     // All validators share a common (static) flag that controls
     SetMenuBar(menu_bar);
 
     // All validators share a common (static) flag that controls


@@ -119,7 +121,9 @@ MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h)
     wxValidator::SetBellOnError(m_silent);
     file_menu->Check(VALIDATE_TOGGLE_BELL, !wxValidator::IsSilent());
 
     wxValidator::SetBellOnError(m_silent);
     file_menu->Check(VALIDATE_TOGGLE_BELL, !wxValidator::IsSilent());
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))


@@ -133,7 +137,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event))
     // and variables together. Values are transferred between them behind
     // the scenes, so here we don't have to query the controls for their
     // values.
     // and variables together. Values are transferred between them behind
     // the scenes, so here we don't have to query the controls for their
     // values.

-    MyDialog dialog(this, "Validator demonstration");
+    MyDialog dialog(this, wxT("Validator demonstration"));

 
     // When the dialog is displayed, validators automatically transfer
     // data from variables to their corresponding controls.
 
     // When the dialog is displayed, validators automatically transfer
     // data from variables to their corresponding controls.


@@ -170,10 +174,11 @@ void MyFrame::OnToggleBell(wxCommandEvent& event)
 
 MyDialog::MyDialog( wxWindow *parent, const wxString& title,
                     const wxPoint& pos, const wxSize& size, const long WXUNUSED(style) ) :
 
 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|wxRESIZE_BORDER)
+    wxDialog(parent, VALIDATE_DIALOG_ID, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)

 {
 {

-    // Sizers automatically ensure a workable layout.
-    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
+    // setup the flex grid sizer
+    // -------------------------
+

     wxFlexGridSizer *flexgridsizer = new wxFlexGridSizer(2, 2, 5, 5);
 
     // Create and add controls to sizers. Note that a member variable
     wxFlexGridSizer *flexgridsizer = new wxFlexGridSizer(2, 2, 5, 5);
 
     // Create and add controls to sizers. Note that a member variable


@@ -183,46 +188,54 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
 
     // Pointers to some of these controls are saved in member variables
     // so that we can use them elsewhere, like this one.
 
     // Pointers to some of these controls are saved in member variables
     // so that we can use them elsewhere, like this one.

-    text = new wxTextCtrl(this, VALIDATE_TEXT, "",
-        wxPoint(10, 10), wxSize(120, -1), 0,
-        wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
+    text = new wxTextCtrl(this, VALIDATE_TEXT, wxEmptyString,
+                          wxPoint(10, 10), wxSize(120, wxDefaultCoord), 0,
+                          wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));

     flexgridsizer->Add(text);
 
     // This wxCheckBox* doesn't need to be assigned to any pointer
     // because we don't use it elsewhere--it can be anonymous.
     // We don't need any such pointer to query its state, which
     // can be gotten directly from g_data.
     flexgridsizer->Add(text);
 
     // This wxCheckBox* doesn't need to be assigned to any pointer
     // because we don't use it elsewhere--it can be anonymous.
     // We don't need any such pointer to query its state, which
     // can be gotten directly from g_data.

-    flexgridsizer->Add(new wxCheckBox(this, VALIDATE_CHECK, "Sample checkbox",
-        wxPoint(130, 10), wxSize(120, -1), 0,
-        wxGenericValidator(&g_data.m_checkbox_state)));
+    flexgridsizer->Add(new wxCheckBox(this, VALIDATE_CHECK, wxT("Sample checkbox"),
+                        wxPoint(130, 10), wxSize(120, wxDefaultCoord), 0,
+                        wxGenericValidator(&g_data.m_checkbox_state)));

 
     flexgridsizer->Add(new wxListBox((wxWindow*)this, VALIDATE_LIST,
 
     flexgridsizer->Add(new wxListBox((wxWindow*)this, VALIDATE_LIST,

-        wxPoint(10, 30), wxSize(120, -1),
-        3, g_listbox_choices, wxLB_MULTIPLE,
-        wxGenericValidator(&g_data.m_listbox_choices)));
-
-    combobox = new wxComboBox((wxWindow*)this, VALIDATE_COMBO, "",
-        wxPoint(130, 30), wxSize(120, -1),
-        3, g_combobox_choices, 0L,
-        wxGenericValidator(&g_data.m_combobox_choice));
+                        wxPoint(10, 30), wxSize(120, wxDefaultCoord),
+                        3, g_listbox_choices, wxLB_MULTIPLE,
+                        wxGenericValidator(&g_data.m_listbox_choices)));
+
+    combobox = new wxComboBox((wxWindow*)this, VALIDATE_COMBO, wxEmptyString,
+                                wxPoint(130, 30), wxSize(120, wxDefaultCoord),
+                                3, g_combobox_choices, 0L,
+                                wxGenericValidator(&g_data.m_combobox_choice));

     flexgridsizer->Add(combobox);
 
     flexgridsizer->Add(combobox);
 

-    mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);

 
 

-    mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, "Pick a color",
-        wxPoint(10, 100), wxSize(-1, -1),
-        3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
-        wxGenericValidator(&g_data.m_radiobox_choice)),
-        0, wxGROW | wxALL, 10);
+    // setup the button sizer
+    // ----------------------
+    
+    wxStdDialogButtonSizer *btn = new wxStdDialogButtonSizer();
+    btn->AddButton(new wxButton(this, wxID_OK));
+    btn->AddButton(new wxButton(this, wxID_CANCEL));
+    btn->Realize();
+

 
 

-    wxGridSizer *gridsizer = new wxGridSizer(2, 2, 5, 5);
+    // setup the main sizer
+    // --------------------
+    
+    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
+
+    mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);

 
 

-    wxButton *ok_button = new wxButton(this, wxID_OK, "OK", wxPoint(250, 70), wxSize(80, 30));
-    ok_button->SetDefault();
-    gridsizer->Add(ok_button);
-    gridsizer->Add(new wxButton(this, wxID_CANCEL, "Cancel", wxPoint(250, 100), wxSize(80, 30)));
+    mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, wxT("Pick a color"),
+                                    wxPoint(10, 100), wxDefaultSize,
+                                    3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
+                                    wxGenericValidator(&g_data.m_radiobox_choice)),
+                                    0, wxGROW | wxALL, 10);

 
 

-    mainsizer->Add(gridsizer, 0, wxGROW | wxALL, 10);
+    mainsizer->Add(btn, 0, wxGROW | wxALL, 10);

 
     SetSizer(mainsizer);
     mainsizer->SetSizeHints(this);
 
     SetSizer(mainsizer);
     mainsizer->SetSizeHints(this);