removed src/gtk/eggtrayicon.h

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

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 2348ebf269febbc2e97971410b9666a755a05d4c..3e3e1130e84f8285e5516f5cded943514e2bd305 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,7 +15,7 @@
 // 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__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #   pragma implementation
 #endif // __GNUG__
 
 #   pragma implementation
 #endif // __GNUG__
 


@@ -107,7 +107,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int
     wxMenu *file_menu = new wxMenu;
 
     file_menu->Append(VALIDATE_TEST_DIALOG, wxT("&Test"), wxT("Demonstrate validators"));
     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 +120,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 +173,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 );