Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/samples/validate/validate.h b/samples/validate/validate.h
index dde69217e4888f3c040711e2ab7b87f2aca0d3e6..beb50de15db807cbd8f7c6489962fb1d902bf087 100644 (file)
--- a/samples/validate/validate.h
+++ b/samples/validate/validate.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/app.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/app.h"


@@ -52,6 +52,9 @@ public:
     bool TransferDataToWindow();
     wxTextCtrl *m_text;
     wxComboBox *m_combobox;
     bool TransferDataToWindow();
     wxTextCtrl *m_text;
     wxComboBox *m_combobox;

+
+    wxTextCtrl *m_numericTextInt;
+    wxTextCtrl *m_numericTextDouble;

 };
 
 class MyData
 };
 
 class MyData


@@ -62,7 +65,7 @@ public:
     // These data members are designed for transfer to and from
     // controls, via validators. For instance, a text control's
     // transferred value is a string:
     // 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, m_string2;

 
     // Listboxes may permit multiple selections, so their state
     // is transferred to an integer-array class.
 
     // Listboxes may permit multiple selections, so their state
     // is transferred to an integer-array class.


@@ -72,6 +75,10 @@ public:
     // the string entered in the combobox's text-edit field.
     wxString m_combobox_choice;
 
     // the string entered in the combobox's text-edit field.
     wxString m_combobox_choice;
 

+    // variables handled by wxNumericTextValidator
+    int m_intValue;
+    double m_doubleValue;
+

     bool m_checkbox_state;
     int m_radiobox_choice;
 };
     bool m_checkbox_state;
     int m_radiobox_choice;
 };


@@ -103,6 +110,7 @@ enum
     VALIDATE_TOGGLE_BELL,
 
     VALIDATE_TEXT,
     VALIDATE_TOGGLE_BELL,
 
     VALIDATE_TEXT,

+    VALIDATE_TEXT2,

     VALIDATE_LIST,
     VALIDATE_CHECK,
     VALIDATE_COMBO,
     VALIDATE_LIST,
     VALIDATE_CHECK,
     VALIDATE_COMBO,