use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

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

diff --git a/samples/validate/validate.h b/samples/validate/validate.h
index 864a926b2f57947b749778c8e6b627ca720e44f3..e8b8a60182e62be04495158a8099746e9b0fa63b 100644 (file)
--- a/samples/validate/validate.h
+++ b/samples/validate/validate.h
@@ -1,18 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        validate.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        validate.h

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

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#   pragma interface

 #endif
 
 #endif
 

+#include "wx/app.h"
+#include "wx/combobox.h"
+#include "wx/dialog.h"
+#include "wx/dynarray.h"
+#include "wx/frame.h"
+#include "wx/listbox.h"
+#include "wx/string.h"
+

 // Define a new application type
 class MyApp : public wxApp
 {
 // Define a new application type
 class MyApp : public wxApp
 {


@@ -24,11 +32,15 @@ public:
 class MyFrame : public wxFrame
 {
 public:
 class MyFrame : public wxFrame
 {
 public:

-    MyFrame(wxFrame *frame, const wxChar *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);
 
     void OnQuit(wxCommandEvent& event);
     void OnTestDialog(wxCommandEvent& event);

-    void OnSilent(wxCommandEvent& event);
+    void OnToggleBell(wxCommandEvent& event);
+
+private:
+    wxListBox *m_listbox;
+    bool m_silent;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -36,21 +48,41 @@ public:
 class MyDialog : public wxDialog
 {
 public:
 class MyDialog : public wxDialog
 {
 public:

-    MyDialog(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size,
+    MyDialog(wxWindow *parent, const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,

             const long style = wxDEFAULT_DIALOG_STYLE);
             const long style = wxDEFAULT_DIALOG_STYLE);

+    bool TransferDataToWindow();
+    wxTextCtrl *text;
+    wxComboBox *combobox;

 };
 
 class MyData
 {
 public:
 };
 
 class MyData
 {
 public:

+    MyData();
+    // These data members are designed for transfer to and from
+    // controls, via validators. For instance, a text control's
+    // transferred value is a string:

     wxString m_string;
     wxString m_string;

-
-    MyData() { m_string = _T("My string"); }
+    // Listboxes may permit multiple selections, so their state
+    // is transferred to an integer-array class.
+    wxArrayInt m_listbox_choices;
+    bool m_checkbox_state;
+    // Comboboxes differ from listboxes--validators transfer
+    // the string entered in the combobox's text-edit field.
+    wxString m_combobox_choice;
+    int m_radiobox_choice;

 };
 
 #define VALIDATE_DIALOG_ID      200
 
 };
 
 #define VALIDATE_DIALOG_ID      200
 

-#define VALIDATE_TEST_DIALOG    2
-#define VALIDATE_SILENT         3
+#define VALIDATE_TEST_DIALOG      2
+#define VALIDATE_TOGGLE_BELL      3
+

 #define VALIDATE_TEXT           101
 #define VALIDATE_TEXT           101

+#define VALIDATE_LIST           102
+#define VALIDATE_CHECK          103
+#define VALIDATE_COMBO          105
+#define VALIDATE_RADIO          106