fix sizing of extra control

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

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 98126e603d1f82a096410bab24f2ac0f52b587a6..45da6770672fe6d4ce1377676d6817f54879b000 100644 (file)
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -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.
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#   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
 // ----------------------------------------------------------------------------


@@ -74,6 +74,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

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

     // Create and display the main frame window.
     MyFrame *frame = new MyFrame((wxFrame *) NULL, wxT("Validator Test"),
                                  50, 50, 300, 250);
     // Create and display the main frame window.
     MyFrame *frame = new MyFrame((wxFrame *) NULL, wxT("Validator Test"),
                                  50, 50, 300, 250);


@@ -93,21 +96,19 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int h)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int h)

-       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, 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;
 
     file_menu->Append(VALIDATE_TEST_DIALOG, wxT("&Test"), wxT("Demonstrate validators"));
     m_listbox->Append(wxString(_T("Try 'File|Test' to see how validators work.")));
 
     wxMenu *file_menu = new wxMenu;
 
     file_menu->Append(VALIDATE_TEST_DIALOG, wxT("&Test"), wxT("Demonstrate validators"));

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

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


@@ -120,7 +121,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int
     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))


@@ -171,7 +174,7 @@ 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 );
 {
     // Sizers automatically ensure a workable layout.
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );


@@ -184,8 +187,8 @@ 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, wxT(""),
-        wxPoint(10, 10), wxSize(120, -1), 0,
+    text = new wxTextCtrl(this, VALIDATE_TEXT, wxEmptyString,
+        wxPoint(10, 10), wxSize(120, wxDefaultCoord), 0,

         wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
     flexgridsizer->Add(text);
 
         wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
     flexgridsizer->Add(text);
 


@@ -194,16 +197,16 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
     // 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, wxT("Sample checkbox"),
     // 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, wxT("Sample checkbox"),

-        wxPoint(130, 10), wxSize(120, -1), 0,
+        wxPoint(130, 10), wxSize(120, wxDefaultCoord), 0,

         wxGenericValidator(&g_data.m_checkbox_state)));
 
     flexgridsizer->Add(new wxListBox((wxWindow*)this, VALIDATE_LIST,
         wxGenericValidator(&g_data.m_checkbox_state)));
 
     flexgridsizer->Add(new wxListBox((wxWindow*)this, VALIDATE_LIST,

-        wxPoint(10, 30), wxSize(120, -1),
+        wxPoint(10, 30), wxSize(120, wxDefaultCoord),

         3, g_listbox_choices, wxLB_MULTIPLE,
         wxGenericValidator(&g_data.m_listbox_choices)));
 
         3, g_listbox_choices, wxLB_MULTIPLE,
         wxGenericValidator(&g_data.m_listbox_choices)));
 

-    combobox = new wxComboBox((wxWindow*)this, VALIDATE_COMBO, wxT(""),
-        wxPoint(130, 30), wxSize(120, -1),
+    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);
         3, g_combobox_choices, 0L,
         wxGenericValidator(&g_data.m_combobox_choice));
     flexgridsizer->Add(combobox);


@@ -211,7 +214,7 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
     mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);
 
     mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, wxT("Pick a color"),
     mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);
 
     mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, wxT("Pick a color"),

-        wxPoint(10, 100), wxSize(-1, -1),
+        wxPoint(10, 100), wxDefaultSize,

         3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
         wxGenericValidator(&g_data.m_radiobox_choice)),
         0, wxGROW | wxALL, 10);
         3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
         wxGenericValidator(&g_data.m_radiobox_choice)),
         0, wxGROW | wxALL, 10);