X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b61c41b71b25ecb2a125ac14c7257a43dc5d254..fa7134b05abb0d8df4b800762aa9d040bfd689a4:/samples/validate/validate.h?ds=inline

diff --git a/samples/validate/validate.h b/samples/validate/validate.h
index 0275883e09..09f7db7bda 100644
--- a/samples/validate/validate.h
+++ b/samples/validate/validate.h
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        validate.h
-// Purpose:     wxWindows validation sample
+// Purpose:     wxWidgets validation sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#   pragma interface
-#endif
-
 #include "wx/app.h"
 #include "wx/combobox.h"
 #include "wx/dialog.h"
@@ -32,7 +28,7 @@ public:
 class MyFrame : public wxFrame
 {
 public:
-    MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h);
+    MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int h);
 
     void OnQuit(wxCommandEvent& event);
     void OnTestDialog(wxCommandEvent& event);
@@ -75,14 +71,15 @@ public:
     int m_radiobox_choice;
 };
 
-#define VALIDATE_DIALOG_ID      200
-
-#define VALIDATE_TEST_DIALOG      2
-#define VALIDATE_TOGGLE_BELL      3
+enum {
+    VALIDATE_DIALOG_ID = wxID_HIGHEST,
 
-#define VALIDATE_TEXT           101
-#define VALIDATE_LIST           102
-#define VALIDATE_CHECK          103
-#define VALIDATE_COMBO          105
-#define VALIDATE_RADIO          106
+    VALIDATE_TEST_DIALOG,
+    VALIDATE_TOGGLE_BELL,
 
+    VALIDATE_TEXT,
+    VALIDATE_LIST,
+    VALIDATE_CHECK,
+    VALIDATE_COMBO,
+    VALIDATE_RADIO
+};